rpms/deluge/F-7 .cvsignore, 1.8, 1.9 deluge.spec, 1.17, 1.18 sources, 1.8, 1.9 deluge-fix-persistence-upgrade-rhbz_247927.patch, 1.1, NONE

[Peter Gordon (pgordon)]

Author: pgordon

Update of /cvs/extras/rpms/deluge/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24007

Modified Files:
	.cvsignore deluge.spec sources 
Removed Files:
	deluge-fix-persistence-upgrade-rhbz_247927.patch 
Log Message:
Update to 0.5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Jul 2007 07:26:06 -0000	1.8
+++ .cvsignore	26 Jul 2007 02:45:37 -0000	1.9
@@ -1 +1 @@
-deluge-0.5.2.tar.gz
+deluge-0.5.3.tar.gz


Index: deluge.spec
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/deluge.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- deluge.spec	14 Jul 2007 19:08:08 -0000	1.17
+++ deluge.spec	26 Jul 2007 02:45:37 -0000	1.18
@@ -2,9 +2,9 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		deluge
-Version:	0.5.2
-Release:	2%{?dist}
-Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX.
+Version:	0.5.3
+Release:	1%{?dist}
+Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
 License:	GPL
 URL:		http://deluge-torrent.org/           
@@ -13,7 +13,6 @@
 ## Not used for now: Deluge builds against its own internal copy of
 ## rb_libtorrent. See below for more details. 
 # Source1:	%{name}-fixed-setup.py
-Patch0:		%{name}-fix-persistence-upgrade-rhbz_247927.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -61,25 +60,24 @@
 %setup -q
 ## Not building against system rb_libtorrent - see above.
 # install -m 0755 %{SOURCE1} ./setup.py
-%patch0 -p0 -b .fix-persistence-upgrade-rhbz_247927
 
 
 %build
-%ifarch x86_64 ppc64 sparc64
-	CFLAGS="%{optflags} -DAMD64" %{__python} setup.py build
-%else
-	CFLAGS="%{optflags}" %{__python} setup.py build
-%endif
+## FIXME: This should really use %%{?_smp_mflags} or similar for parallel
+## compilations; but the build system on this doesn't support such flags at
+## this time.
+CFLAGS="%{optflags}" %{__python} setup.py build
 
 
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-desktop-file-install --vendor fedora	\
+desktop-file-install --vendor fedora			\
 	--dir %{buildroot}%{_datadir}/applications	\
-	--copy-name-to-generic-name	\
+	--copy-name-to-generic-name			\
 	--add-mime-type=application/x-bittorrent	\
-	--delete-original	\
+	--delete-original				\
+	--remove-category=Application			\
 	%{buildroot}%{_datadir}/applications/%{name}.desktop
 %find_lang %{name}
 
@@ -93,7 +91,7 @@
 %doc LICENSE 
 %{python_sitearch}/%{name}/
 %{_datadir}/%{name}/
-%{_datadir}/pixmaps/%{name}.xpm
+%{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_bindir}/%{name}
 
@@ -107,11 +105,18 @@
 
 
 %changelog
+* Fri Jul 20 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.3-1
+- Update to new upstream release candidate (0.5.3)
+- Drop %%ifarch invocations for 64-bit builds. The internal setup script now
+  properly determines this and adds the AMD64 compiler definition if necessary.
+- Drop stale persistence fix patch (applied upstream):
+  - fix-persistence-upgrade-rhbz_247927.patch
+
 * Wed Jul 11 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.2-2
 - Add patch to fix the existence of stale persistence files by automatically
   updating the deluge.deluge module name to deluge.core, or removing them if
   empty (bug 247927):
-    + fix-persistence-upgrade-rhbz_247927.patch
+  + fix-persistence-upgrade-rhbz_247927.patch
 
 * Sun Jul 08 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.2-1
 - Update to new upstream release (0.5.2)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Jul 2007 07:26:06 -0000	1.8
+++ sources	26 Jul 2007 02:45:37 -0000	1.9
@@ -1 +1 @@
-9a33f6b3d7cec3b27cd3044064c10d31  deluge-0.5.2.tar.gz
+382141fdf1c55dc75a183da02d2239fb  deluge-0.5.3.tar.gz


--- deluge-fix-persistence-upgrade-rhbz_247927.patch DELETED ---