rpms/bittorrent/devel bittorrent-4.2.2-no-version-check.patch, 1.2, 1.3 bittorrent-4.4.0-appdir.patch, NONE, 1.1 bittorrent-4.4.0-pkidir.patch, NONE, 1.1 bittorrent-4.4.0-shellbang.patch, NONE, 1.1 bittorrent.png, 1.2, 1.3 .cvsignore, 1.19, 1.20 bittorrent.spec, 1.40, 1.41 sources, 1.19, 1.20

[Paul Howarth (pghmcfc)]

Author: pghmcfc

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

Modified Files:
	.cvsignore bittorrent.spec sources 
Added Files:
	bittorrent-4.2.2-no-version-check.patch 
	bittorrent-4.4.0-appdir.patch bittorrent-4.4.0-pkidir.patch 
	bittorrent-4.4.0-shellbang.patch bittorrent.png 
Log Message:
Downgrade to 4.4.0 due to incompatibility between the GUI & wx 2.8 (#223623)

bittorrent-4.2.2-no-version-check.patch:

Index: bittorrent-4.2.2-no-version-check.patch
===================================================================
RCS file: bittorrent-4.2.2-no-version-check.patch
diff -N bittorrent-4.2.2-no-version-check.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ bittorrent-4.2.2-no-version-check.patch	27 Feb 2007 16:02:36 -0000	1.3
@@ -0,0 +1,12 @@
+--- BitTorrent-4.2.2/BitTorrent/NewVersion.py	2005-12-20 11:44:41.737788953 +0000
++++ BitTorrent-4.2.2/BitTorrent/NewVersion.py	2005-12-20 11:49:49.318965734 +0000
+@@ -101,6 +101,9 @@
+ 
+ 
+     def get(self):
++        self.debug('Version check skipped for RPM package')
++        return
++
+         try:
+             self.get_available()
+         except BTFailure, e:

bittorrent-4.4.0-appdir.patch:

--- NEW FILE bittorrent-4.4.0-appdir.patch ---
--- BitTorrent-4.4.0/BitTorrent/platform.py	2006-01-31 20:16:36.000000000 +0000
+++ BitTorrent-4.4.0/BitTorrent/platform.py	2007-02-27 14:36:42.000000000 +0000
@@ -92,7 +92,7 @@
 
 
 def calc_unix_dirs():
-    appdir = '%s-%s'%(app_name, version)
+    appdir = '%s-%s'%('bittorrent', version)
     ip = os.path.join('share', 'pixmaps', appdir)
     dp = os.path.join('share', 'doc'    , appdir)
     lp = os.path.join('share', 'locale')

bittorrent-4.4.0-pkidir.patch:

--- NEW FILE bittorrent-4.4.0-pkidir.patch ---
--- BitTorrent-4.4.0/BitTorrent/NewVersion.py	2006-01-31 20:16:30.000000000 +0000
+++ BitTorrent-4.4.0/BitTorrent/NewVersion.py	2007-02-27 14:43:25.000000000 +0000
@@ -163,7 +166,7 @@
             self.threadwrap(self.errorfunc, WARNING, '\n'.join(terrors))
 
         if torrentfile and signature:
-            public_key_file = open(os.path.join(doc_root, 'public.key'), 'rb')
+            public_key_file = open('/etc/pki/bittorrent/public.key', 'rb')
             public_key = pickle.load(public_key_file)
             h = sha(torrentfile).digest()
             if public_key.verify(h, signature):

bittorrent-4.4.0-shellbang.patch:

--- NEW FILE bittorrent-4.4.0-shellbang.patch ---
--- BitTorrent-5.0.1/BitTorrent/launchmanycore.py	2006-05-17 12:44:04.000000000 +0100
+++ BitTorrent-5.0.1/BitTorrent/launchmanycore.py	2006-05-17 12:44:18.000000000 +0100
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 # The contents of this file are subject to the BitTorrent Open Source License
 # Version 1.1 (the License).  You may not copy or use this file, in either
 # source code or executable form, except in compliance with the License.  You
--- BitTorrent-5.0.1/BitTorrent/makemetafile.py		2006-05-17 12:44:35.000000000 +0100
+++ BitTorrent-5.0.1/BitTorrent/makemetafile.py		2006-05-17 12:44:49.000000000 +0100
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 # The contents of this file are subject to the BitTorrent Open Source License
 # Version 1.1 (the License).  You may not copy or use this file, in either
 # source code or executable form, except in compliance with the License.  You


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	19 Jan 2007 13:02:08 -0000	1.19
+++ .cvsignore	27 Feb 2007 16:02:36 -0000	1.20
@@ -1 +1 @@
-BitTorrent-5.0.5.tar.gz
+BitTorrent-4.4.0.tar.gz


Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- bittorrent.spec	26 Jan 2007 16:01:32 -0000	1.40
+++ bittorrent.spec	27 Feb 2007 16:02:36 -0000	1.41
@@ -7,8 +7,8 @@
 
 Summary:	BitTorrent swarming network file transfer tool
 Name:		bittorrent
-Version:	5.0.5
-Release:	2%{?dist}
+Version:	4.4.0
+Release:	4%{?dist}
 Group:		Applications/Internet
 License:	BitTorrent Open Source License
 URL:		http://www.bittorrent.com/
@@ -16,18 +16,16 @@
 Source1:	bittorrent.desktop
 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
+Source5:	bittorrent.png
+Patch0:		bittorrent-4.2.2-no-version-check.patch
+Patch1:		bittorrent-4.4.0-appdir.patch
+Patch2:		bittorrent-4.4.0-pkidir.patch
+Patch3:		bittorrent-4.4.0-shellbang.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
-Requires:	python-crypto, python-twisted-core >= 2.0, python-twisted-web
+BuildRequires:	python-devel >= 2.4.0, desktop-file-utils, gettext
+Requires:	python-crypto
 
-Provides:	python-BTL = %{version}-%{release}
-Obsoletes:	python-BTL < %{version}-%{release}
 Provides:	python-khashmir = %{version}-%{release}
 Obsoletes:	python-khashmir < %{version}-%{release}
 
@@ -49,7 +47,7 @@
 %package gui
 Summary:	GUI versions of the BitTorrent file transfer tools
 Group:		Applications/Internet
-Requires:	wxPython >= 2.6.0
+Requires:	pygtk2 >= 2.6.0
 Requires:	%{name} = %{version}-%{release}
 Obsoletes:	BitTorrent < %{version}-%{release}, BitTorrent-gui < %{version}-%{release}
 Provides:	BitTorrent = %{version}-%{release}, BitTorrent-gui = %{version}-%{release}
@@ -69,7 +67,7 @@
 
 %prep
 %setup -q -n BitTorrent-%{version}
-%{__cp} -p %{SOURCE1} %{SOURCE3} %{SOURCE4} .
+%{__cp} -p %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
 
 # Prevent phone-home new version check
 %patch0 -p1 -b .versioncheck
@@ -84,11 +82,8 @@
 # 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,' \
+%{__sed} -i -e 's,bittorrent\.png,%{_datadir}/pixmaps/bittorrent-%{version}/logo/bittorrent_48.png,' \
 	bittorrent.desktop
 
 # Create options files for initscripts
@@ -142,6 +137,8 @@
 %{__install} -m 0755 -D bttrack.init %{buildroot}%{_sysconfdir}/rc.d/init.d/bttrack
 %{__install} -m 0644 -D bittorrent.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/bittorrent
 %{__install} -m 0644 -D bittorrent.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/bittorrent
+%{__install} -m 0644 -D bittorrent.png \
+	%{buildroot}%{_datadir}/pixmaps/bittorrent-%{version}/logo/bittorrent_48.png
 # pidof doesn't find scripts with hyphenated names, so make some convenience links for initscripts
 %{__ln_s} bittorrent-tracker %{buildroot}%{_bindir}/bttrack
 %{__ln_s} launchmany-console %{buildroot}%{_bindir}/btseed
@@ -196,9 +193,7 @@
 %{pkidir}/bittorrent
 %dir %{python_sitelib}/BitTorrent/
 %{python_sitelib}/BitTorrent/*.py*
-%{python_sitelib}/BTL/
 %{python_sitelib}/khashmir/
-%{python_sitelib}/Zeroconf.py*
 %attr(-,torrent,torrent) %dir %{bt_dir}/
 %attr(-,torrent,torrent) %dir %{bt_statedir}/
 %attr(-,torrent,torrent) %dir %{_localstatedir}/log/bittorrent/
@@ -215,9 +210,20 @@
 %{_bindir}/maketorrent
 %{_datadir}/pixmaps/bittorrent-%{version}/
 %{_datadir}/applications/%{desktopvendor}-bittorrent.desktop
-%{python_sitelib}/BitTorrent/GUI_wx/
 
 %changelog
+* Tue Feb 27 2007 Paul Howarth <paul at city-fan.org> 4.4.0-4
+- Downgrade to 4.4.0 due to incompatibility between the GUI & wx 2.8 (#223623)
+- Revert no-version-check patch to 4.2.2 version
+- Rework appdir, pkidir, and shellbang patches to apply against 4.4.0
+- Remove wxversion patch
+- Remove BTL, Zeroconf, and GUI_wx modules from files list
+- Don't provide/obsolete python-BTL
+- Use unbundled 48x48 icon
+- Reinstate pygtk2 dependency for GUI subpackage
+- Drop python-twisted-{core,web} deps for main package, and wxPython for GUI
+- Drop python-twisted-core buildreq
+
 * 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	19 Jan 2007 13:02:08 -0000	1.19
+++ sources	27 Feb 2007 16:02:36 -0000	1.20
@@ -1 +1 @@
-100e1ccb68074245398820b33d805762  BitTorrent-5.0.5.tar.gz
+74d4b48202c28f0b27e989b6d5f5b214  BitTorrent-4.4.0.tar.gz