rpms/bittorrent/devel bittorrent-5.0.5-wxversion.patch, NONE, 1.1 bittorrent.spec, 1.39, 1.40 bittorrent.png, 1.1, NONE

[Paul Howarth (pghmcfc)]

Author: pghmcfc

Update of /cvs/extras/rpms/bittorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31565

Modified Files:
	bittorrent.spec 
Added Files:
	bittorrent-5.0.5-wxversion.patch 
Removed Files:
	bittorrent.png 
Log Message:
* Use new icon for menu; icon cache scriptlets no longer needed
* Prefer wx version 2.6.x but try to use later versions if necessary
* Don't package GUI python code in main package was well as gui subpackage

The GUI is still going to be broken in Rawhide but this update will help
with debugging and also includes a couple of other small tweaks that were
coming anyway.


bittorrent-5.0.5-wxversion.patch:

--- NEW FILE bittorrent-5.0.5-wxversion.patch ---
--- BitTorrent-5.0.5/BitTorrent/GUI_wx/__init__.py	2007-01-11 00:18:24.000000000 +0000
+++ BitTorrent-5.0.5/BitTorrent/GUI_wx/__init__.py	2007-01-26 13:20:04.000000000 +0000
@@ -22,13 +22,14 @@
 else:
     # doesn't work in py2exe
     try:
-        wxversion.select('2.6')
+        # Prefer wxPython 2.6 if available
+        if wxversion.checkInstalled('2.6'):
+            wxversion.select('2.6')
     except:
         pass
     
 import wx
 import wx.grid
-import wxPython
 from BTL.translation import _
 
 from BitTorrent.platform import image_root
@@ -36,9 +37,6 @@
 from BTL.defer import ThreadedDeferred
 import bisect
 
-vs = wxPython.__version__
-min_wxpython = "2.6"
-assert vs >= min_wxpython, _("wxPython version %s or newer required") % min_wxpython
 assert 'unicode' in wx.PlatformInfo, _("The Unicode versions of wx and wxPython are required")
 
 text_wrappable = wx.__version__[4] >= '2'


Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- bittorrent.spec	19 Jan 2007 13:02:08 -0000	1.39
+++ bittorrent.spec	26 Jan 2007 16:01:32 -0000	1.40
@@ -8,19 +8,19 @@
 Summary:	BitTorrent swarming network file transfer tool
 Name:		bittorrent
 Version:	5.0.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Group:		Applications/Internet
 License:	BitTorrent Open Source License
 URL:		http://www.bittorrent.com/
 Source0:	http://download.bittorrent.com/dl/BitTorrent-%{version}.tar.gz
 Source1:	bittorrent.desktop
-Source2:	bittorrent.png
 Source3:	btseed.init
 Source4:	bttrack.init
 Patch0:		bittorrent-4.24.2-no-version-check.patch
 Patch1:		bittorrent-4.24.2-appdir.patch
 Patch2:		bittorrent-4.24.2-pkidir.patch
 Patch3:		bittorrent-5.0.1-shellbang.patch
+Patch4:		bittorrent-5.0.5-wxversion.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python-devel >= 2.4.0, desktop-file-utils, gettext, python-twisted-core >= 2.0
@@ -69,7 +69,7 @@
 
 %prep
 %setup -q -n BitTorrent-%{version}
-%{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} .
+%{__cp} -p %{SOURCE1} %{SOURCE3} %{SOURCE4} .
 
 # Prevent phone-home new version check
 %patch0 -p1 -b .versioncheck
@@ -84,6 +84,13 @@
 # Remove useless shellbangs
 %patch3 -p1 -b .shellbang
 
+# Don't specifically require wxPython 2.6.x, but prefer it if possible
+%patch4 -p1 -b .wxversion
+
+# Update icon
+%{__sed} -i -e 's,bittorrent\.png,%{_datadir}/pixmaps/bittorrent-%{version}/logo/bittorrent_icon_48.png,' \
+	bittorrent.desktop
+
 # Create options files for initscripts
 %{__cat} <<EOF >bittorrent.sysconfig
 SEEDDIR=%{bt_dir}
@@ -121,7 +128,6 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-%{__install} -D -m 644 bittorrent.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
 %{__install} -d -m 755 %{buildroot}%{_datadir}/applications
 %{__install} -d -m 755 %{buildroot}%{pkidir}/bittorrent
 %{__install} -m 0644 public.key %{buildroot}%{pkidir}/bittorrent
@@ -170,13 +176,9 @@
 
 %post gui
 /usr/bin/update-desktop-database %{_datadir}/applications &>/dev/null || :
-/bin/touch --no-create %{_datadir}/icons/hicolor || :
-[ -x /usr/bin/gtk-update-icon-cache ] && /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor || :
 
 %postun gui
 /usr/bin/update-desktop-database %{_datadir}/applications &>/dev/null || :
-/bin/touch --no-create %{_datadir}/icons/hicolor || :
-[ -x /usr/bin/gtk-update-icon-cache ] && /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor || :
 
 %files -f bittorrent.lang
 %defattr(-,root,root,-)
@@ -192,7 +194,8 @@
 %{_bindir}/bttrack
 %{_bindir}/btseed
 %{pkidir}/bittorrent
-%{python_sitelib}/BitTorrent/
+%dir %{python_sitelib}/BitTorrent/
+%{python_sitelib}/BitTorrent/*.py*
 %{python_sitelib}/BTL/
 %{python_sitelib}/khashmir/
 %{python_sitelib}/Zeroconf.py*
@@ -211,11 +214,15 @@
 %{_bindir}/bittorrent
 %{_bindir}/maketorrent
 %{_datadir}/pixmaps/bittorrent-%{version}/
-%{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
 %{_datadir}/applications/%{desktopvendor}-bittorrent.desktop
 %{python_sitelib}/BitTorrent/GUI_wx/
 
 %changelog
+* Fri Jan 25 2007 Paul Howarth <paul at city-fan.org> 5.0.5-2
+- Use new icon for menu; icon cache scriptlets no longer needed
+- Prefer wx version 2.6.x but try to use later versions if necessary
+- Don't package GUI python code in main package was well as gui subpackage
+
 * Fri Jan 19 2007 Paul Howarth <paul at city-fan.org> 5.0.5-1
 - Update to 5.0.5
 - Cosmetic spec file tweaks