rpms/deluge/F-10 .cvsignore, 1.54, 1.55 deluge.spec, 1.80, 1.81 sources, 1.54, 1.55

[Peter Gordon]

Author: pgordon

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

Modified Files:
	.cvsignore deluge.spec sources 
Log Message:
Update to 1.1.9, sync other changes from devel and F-11 branches (flags subpackage, python-chardet dep, and updated %doc listing). Updates internal rb_libtorrent copy to fix CVE-2009-1760 (#505523)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/F-10/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- .cvsignore	8 Apr 2009 01:36:12 -0000	1.54
+++ .cvsignore	18 Jun 2009 07:33:29 -0000	1.55
@@ -1 +1 @@
-deluge-1.1.6.tar.bz2
+deluge-1.1.9.tar.bz2


Index: deluge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/F-10/deluge.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- deluge.spec	8 Apr 2009 01:36:12 -0000	1.80
+++ deluge.spec	18 Jun 2009 07:33:30 -0000	1.81
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		deluge
-Version:	1.1.6
+Version:	1.1.9
 Release:	1%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
@@ -36,6 +36,7 @@ Requires:	dbus-x11
 Requires:	hicolor-icon-theme
 Requires:	pygtk2-libglade
 Requires:	pyOpenSSL
+Requires:	python-chardet
 Requires:	python-setuptools
 Requires:	pyxdg
 ## Deluge is now using its own internal copy of rb_libtorrent, which they have
@@ -58,8 +59,19 @@ environments such as GNOME and XFCE. It 
 even from behind a router with virtually zero configuration of port-forwarding.
 
 
+%package	flags
+Summary:	Country flags for peer location display in Deluge
+Group:		Applications/Internet
+License:	GPLv3
+Requires:	%{name} = %{version}-%{release}
+
+%description	flags
+The %{name}-flags package contains optional country flags which are used to
+display the location of peers in the "Peers" information tab.
+
+
 %prep
-%setup -q
+%setup -qn "%{name}-%{version}"
 %patch0 -p0 -b .fix-scalable-icon-dir
 ## Not building against system rb_libtorrent - see above.
 # install -m 0755 %{SOURCE1} ./setup.py
@@ -82,16 +94,6 @@ desktop-file-install --vendor fedora			\
 	--delete-original				\
 	--remove-category=Application			\
 	%{buildroot}%{_datadir}/applications/%{name}.desktop
-## Remove the country flags. This is a FEDORA-SPECIFIC change.
-## TODO: Perhaps instead of removing the flags entirely, we can replace that
-##       single column of pixbuf renderers with text renderers that show the
-##       country/locale code of the peer.
-## Fedora bug: https://bugzilla.redhat.com/show_bug.cgi?id=479265
-pushd %{buildroot}%{python_sitearch}/%{name}
-	## FIXME: Now that we're not showing the flags and whatnot, do we
-	##        still need the GeoIP data (GeoIP.dat) too?
-	rm -rf data/pixmaps/flags/
-popd 
 
 ## NOTE: The lang files should REEEAALLLY be in a standard place such as
 ##       /usr/share/locale or similar. It'd make things so much nicer for
@@ -110,14 +112,16 @@ pushd %{buildroot}
 			s:%lang(C) ::
 			/^$/d' \
 	> %{name}.filelist
+
 ## We've got the .mo files now; but we need the rest of the files in those
 ## dirs. We can't just glob in the %%files, as that would add duplicate
 ## entries for the .mo files which we've already marked with appropriate
 ## %%lang-fu. 
-	find ./%{python_sitearch}/deluge -not -iname '%{name}.mo' -type f \
-		| sed 's:^\./::' >> %{name}.filelist
-	find ./%{python_sitearch}/deluge -not -iname '%{name}.mo' -type d \
-		| sed 's:^\./:%%dir :' >> %{name}.filelist	
+	find ./%{python_sitearch}/%{name} -not -iname '%{name}.mo' -type f \
+		| grep -v 'pixmaps/flags' | sed 's:^\./::' >> %{name}.filelist
+	find ./%{python_sitearch}/%{name} -type d  | grep -v 'pixmaps/flags' \
+		| sed 's:^\./:%%dir :' >> %{name}.filelist
+
 ## Now we move that list back to our sources, so that '%%files -f' can find it
 ## properly.
 popd && mv %{buildroot}/%{name}.filelist .
@@ -129,7 +133,7 @@ rm -rf %{buildroot}
 
 %files -f %{name}.filelist
 %defattr(-,root,root,-)
-%doc ChangeLog
+%doc ChangeLog LICENSE README
 %{python_sitearch}/%{name}-%{version}-py?.?.egg-info/
 %{_bindir}/%{name}
 %{_bindir}/%{name}d
@@ -138,6 +142,11 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_mandir}/man?/%{name}*
 
+%files	flags
+%defattr(-,root,root,-)
+%doc LICENSE
+%{python_sitearch}/%{name}/data/pixmaps/flags/
+
 
 %post
 update-desktop-database &>/dev/null ||:
@@ -156,6 +165,15 @@ fi
 
 
 %changelog
+* Wed Jun 17 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.9-1
+- Update to new upstream bug-fix release (1.1.9), updates internal libtorrent
+  copy to fix CVE-2009-1760 (#505523).
+- Adds dependency on chardet for fixing lots of bugs with torrents
+  which are not encoded as UTF-8.
+- Add back the flags, in an optional -flags subpackage as per the new Flags
+  policy (Package_Maintainers_Flags_Policy on the wiki).
+- Add LICENSE and README to installed documentation.
+
 * Tue Apr 07 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.6-1
 - Update to new upstream bug-fix release (1.1.6)
 - Fix GPL version, add OpenSSL exception to License.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/F-10/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	8 Apr 2009 01:36:12 -0000	1.54
+++ sources	18 Jun 2009 07:33:30 -0000	1.55
@@ -1 +1 @@
-78ef75153bbd5ef6a06ed876d66a9fb9  deluge-1.1.6.tar.bz2
+38b9dbf255ed9620760d546dbb757882  deluge-1.1.9.tar.bz2