rpms/deluge/F-9 .cvsignore, 1.35, 1.36 deluge.spec, 1.57, 1.58 sources, 1.35, 1.36

[Peter Gordon]

Author: pgordon

Update of /cvs/pkgs/rpms/deluge/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30638/F-9

Modified Files:
	.cvsignore deluge.spec sources 
Log Message:
Update to 1.0.5 (0.5.x series no longer actively supported upstream; but it does require recreation of much of user configuration, so will stay in updates-testing for the forseeable future to minimize potential breakage).


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/F-9/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	25 Jun 2008 03:11:51 -0000	1.35
+++ .cvsignore	21 Nov 2008 06:22:26 -0000	1.36
@@ -1 +1 @@
-deluge-0.5.9.3.tar.gz
+deluge-1.0.5.tar.bz2


Index: deluge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/F-9/deluge.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- deluge.spec	25 Jun 2008 03:11:51 -0000	1.57
+++ deluge.spec	21 Nov 2008 06:22:27 -0000	1.58
@@ -2,14 +2,14 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		deluge
-Version:	0.5.9.3
+Version:	1.0.5
 Release:	1%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://deluge-torrent.org/           
 
-Source0:	http://download.deluge-torrent.org/tarball/%{version}/%{name}-%{version}.tar.gz
+Source0:	http://download.deluge-torrent.org/source/%{version}/%{name}-%{version}.tar.bz2
 ## Not used for now: Deluge builds against its own internal copy of
 ## rb_libtorrent. See below for more details. 
 # Source1:	%{name}-fixed-setup.py
@@ -21,6 +21,7 @@
 BuildRequires:	libtool
 BuildRequires:	openssl-devel
 BuildRequires:	python-devel
+BuildRequires:	python-setuptools
 ## Not used for now: Deluge builds against its own internal copy of
 ## rb_libtorrent. See below for more details. 
 # BuildRequires:	rb_libtorrent-devel
@@ -32,6 +33,7 @@
 Requires:	hicolor-icon-theme
 Requires:	pygtk2-libglade
 Requires:	pyOpenSSL
+Requires:	python-setuptools
 Requires:	pyxdg
 ## Deluge is now using its own internal copy of rb_libtorrent, which they have
 ## heavily modified. Patches were sent to the upstream rb_libtorrent devs,
@@ -61,7 +63,7 @@
 
 
 %prep
-%setup -qn "deluge-torrent-%{version}"
+%setup -q
 ## Not building against system rb_libtorrent - see above.
 # install -m 0755 %{SOURCE1} ./setup.py
 
@@ -76,8 +78,6 @@
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-## Fix the Icon name in the .desktop file: it shouldn't contain an extension.
-sed -i -e 's/Icon=deluge.png/Icon=deluge/' %{buildroot}%{_datadir}/applications/%{name}.desktop
 desktop-file-install --vendor fedora			\
 	--dir %{buildroot}%{_datadir}/applications	\
 	--copy-name-to-generic-name			\
@@ -85,23 +85,23 @@
 	--delete-original				\
 	--remove-category=Application			\
 	%{buildroot}%{_datadir}/applications/%{name}.desktop
-%find_lang %{name}
 
 
 %clean
 rm -rf %{buildroot}
 
 
-%files -f %{name}.lang
+%files
 %defattr(-,root,root,-)
-%doc LICENSE 
+%doc deluge/ui/webui/LICENSE deluge/ui/webui/TODO
 %{python_sitearch}/%{name}/
 %{python_sitearch}/%{name}-%{version}-py2.5.egg-info
 %{_bindir}/%{name}
-%{_datadir}/%{name}/
+%{_bindir}/%{name}d
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/icons/scalable/apps/%{name}.svg
 
 
 %post
@@ -121,6 +121,12 @@
 
 
 %changelog
+* Thu Nov 13 2008 Peter Gordon <peter at thecodergeek.com> - 1.0.5-1
+- Update to new upstream release (1.0.5)
+- Drop desktop file icon name hack (fixed upstream).
+- Add setuptools runtime dependency, to fix "No module named pkg_resources"
+  error messages.
+
 * Tue Jun 24 2008 Peter Gordon <peter at thecodergeek.com> - 0.5.9.3-1
 - Update to new upstream release (0.5.9.3)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/F-9/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	25 Jun 2008 03:11:51 -0000	1.35
+++ sources	21 Nov 2008 06:22:27 -0000	1.36
@@ -1 +1 @@
-57ee1e0353cdc90884bfd3d240e7c425  deluge-0.5.9.3.tar.gz
+0b232b62d9b07e12a1443c4c5c92d800  deluge-1.0.5.tar.bz2