rpms/deluge/F-11 .cvsignore, 1.58, 1.59 deluge.spec, 1.90, 1.91 sources, 1.58, 1.59
Peter Gordon
pgordon at fedoraproject.org
Thu Jun 18 06:28:13 UTC 2009
Author: pgordon
Update of /cvs/pkgs/rpms/deluge/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17332
Modified Files:
.cvsignore deluge.spec sources
Log Message:
Update to 1.1.9, sync other changes from devel branch (flags subpackage, python-chardet dep, and updated %doc listing).
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/F-11/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore 3 May 2009 03:47:01 -0000 1.58
+++ .cvsignore 18 Jun 2009 06:27:42 -0000 1.59
@@ -1 +1 @@
-deluge-1.1.7.tar.bz2
+deluge-1.1.9.tar.bz2
Index: deluge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/F-11/deluge.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- deluge.spec 3 May 2009 03:47:01 -0000 1.90
+++ deluge.spec 18 Jun 2009 06:27:42 -0000 1.91
@@ -1,13 +1,9 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-## Since we're using a system copy of rb_libtorrent, we need to ensure that it
-## is a very recent version for proper API matching.
-%define min_rblibtorrent_ver 0.14.1
-
Name: deluge
-Version: 1.1.7
-Release: 1%{?dist}.1
+Version: 1.1.9
+Release: 1%{?dist}
Summary: A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
Group: Applications/Internet
License: GPLv3 with exceptions
@@ -35,6 +31,7 @@ Requires: dbus-x11
Requires: hicolor-icon-theme
Requires: pygtk2-libglade
Requires: pyOpenSSL
+Requires: python-chardet
Requires: python-setuptools
Requires: pyxdg
Requires: rb_libtorrent-python >= %{min_rblibtorrent_ver}
@@ -48,6 +45,17 @@ 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 -qn "%{name}-%{version}"
%patch0 -p0 -b .fix-scalable-icon-dir
@@ -67,16 +75,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_sitelib}/%{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
@@ -95,14 +93,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_sitelib}/deluge -not -iname '%{name}.mo' -type f \
- | sed 's:^\./::' >> %{name}.filelist
- find ./%{python_sitelib}/deluge -not -iname '%{name}.mo' -type d \
- | sed 's:^\./:%%dir :' >> %{name}.filelist
+ find ./%{python_sitelib}/%{name} -not -iname '%{name}.mo' -type f \
+ | grep -v 'pixmaps/flags' | sed 's:^\./::' >> %{name}.filelist
+ find ./%{python_sitelib}/%{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 .
@@ -114,7 +114,7 @@ rm -rf %{buildroot}
%files -f %{name}.filelist
%defattr(-,root,root,-)
-%doc ChangeLog
+%doc ChangeLog LICENSE README
%{python_sitelib}/%{name}-%{version}-py?.?.egg-info/
%{_bindir}/%{name}
%{_bindir}/%{name}d
@@ -123,6 +123,11 @@ rm -rf %{buildroot}
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_mandir}/man?/%{name}*
+%files flags
+%defattr(-,root,root,-)
+%doc LICENSE
+%{python_sitelib}/%{name}/data/pixmaps/flags/
+
%post
update-desktop-database &>/dev/null ||:
@@ -141,6 +146,17 @@ 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).
+- Do not hard-code minimum rb_libtorrent version. (We're only building against
+ the system rb_libtorrent for Fedora 11+, which already has the necessary
+ version.)
+- 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.
+
* Sat May 02 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.7-1.1
- Update to new upstream bug-fix release (1.1.7).
- Slight release bump to fix CVS tag.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/F-11/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources 3 May 2009 03:47:01 -0000 1.58
+++ sources 18 Jun 2009 06:27:42 -0000 1.59
@@ -1 +1 @@
-fd824abc3d8d2701f676176d7210c4c8 deluge-1.1.7.tar.bz2
+38b9dbf255ed9620760d546dbb757882 deluge-1.1.9.tar.bz2
More information about the fedora-extras-commits
mailing list