rpms/bittorrent/FC-6 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.desktop, 1.2, 1.3 bittorrent.spec, 1.36, 1.37

Mon Mar 12 14:12:10 UTC 2007

Author: pghmcfc

Update of /cvs/extras/rpms/bittorrent/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv980

Modified Files:
	bittorrent.desktop bittorrent.spec 
Added Files:
	bittorrent-4.4.0-appdir.patch bittorrent-4.4.0-pkidir.patch 
	bittorrent-4.4.0-shellbang.patch 
Log Message:
Resync (mostly) with devel

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: bittorrent.desktop
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-6/bittorrent.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bittorrent.desktop	18 Aug 2005 11:39:13 -0000	1.2
+++ bittorrent.desktop	12 Mar 2007 14:11:38 -0000	1.3
@@ -6,6 +6,6 @@
 Icon=bittorrent.png
 Terminal=false
 Type=Application
-StartupNotify=false
-Categories=Application;Network;
+StartupNotify=true
+Categories=Network;
 MimeType=application/x-bittorrent;


Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-6/bittorrent.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- bittorrent.spec	29 Aug 2006 09:32:44 -0000	1.36
+++ bittorrent.spec	12 Mar 2007 14:11:38 -0000	1.37
@@ -1,35 +1,45 @@
-%define desktopvendor fedora
-
+# A few useful macros
+%{!?python_version: %define python_version %(%{__python} -c "import sys; print sys.version[:3]")}
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%define desktopvendor	fedora
+%define bt_dir		/srv/bittorrent/data
+%define bt_statedir	/srv/bittorrent/state
+# Fedora >= 4 and RHEL > 4 have /etc/pki
+%if %{!?fedora:0}%{?fedora} >= 4 || %{!?rhel:0}%{?rhel} > 4
+%define pkidir		%{_sysconfdir}/pki
+%else
+%define pkidir		%{_datadir}
+%endif
 
-Name:           bittorrent
-Version:        4.4.0
-Release:        2%{?dist}
-Summary:        BitTorrent swarming network file transfer tool
-
-Group:          Applications/Internet
-License:        BitTorrent Open Source License
-URL:            http://www.bittorrent.com/
-Source0:        http://www.bittorrent.com/dl/BitTorrent-%{version}.tar.gz
-Source1:        bittorrent.desktop
-Source2:        bittorrent.png
+Summary:	BitTorrent swarming network file transfer tool
+Name:		bittorrent
+Version:	4.4.0
+Release:	4%{?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
 Source3:	btseed.init
 Source4:	bttrack.init
+Source5:	bittorrent.png
 Patch0:		bittorrent-4.2.2-no-version-check.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
-
-BuildRequires:  desktop-file-utils gettext
-Requires:       python-crypto
-# FC4 and later auto-generate python version dependency
-%if %{!?fedora:0}%{?fedora} < 4 || %{!?rhel:0}%{?rhel}
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+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, desktop-file-utils, gettext
+Requires:	python-crypto
+# Python version deps auto-generated in distros with python > 2.3
+%if "%{python_version}" == "2.3"
+Requires:	python-abi = %{python_version}
 %endif
 
 Provides:	python-khashmir = %{version}-%{release}
 Obsoletes:	python-khashmir < %{version}-%{release}
 
-Requires(pre):  /usr/sbin/useradd
+Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -44,52 +54,47 @@
 downloads, the upload burden on the central server remains quite small, since
 each new downloader introduces new upload capacity.
 
-%package        gui
-Summary:        GUI versions of the BitTorrent file transfer tool
-Group:          Applications/Internet
-Requires:       pygtk2 >= 2.6.0
-Requires:       %{name} = %{version}-%{release}
+%package gui
+Summary:	GUI versions of the BitTorrent file transfer tools
+Group:		Applications/Internet
+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}
+
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
-Obsoletes:	BitTorrent <= %{version}
-Provides:	BitTorrent = %{version}-%{release}
 
-%description    gui
-This package contains the GUI versions of the BitTorrent file transfer
-tool.
-
-# Fedora >= 4 has /srv, as does RHEL >= 4
-%if %{!?fedora:0}%{?fedora} >= 4 || %{!?rhel:0}%{?rhel} >= 4
-%define bt_dir      /srv/bittorrent/data
-%define bt_statedir /srv/bittorrent/state
-%else
-%define bt_dir      %{_localstatedir}/spool/bittorrent
-%define bt_statedir %{_localstatedir}/lib/bittorrent
-%endif
+%description gui
+BitTorrent is a tool for distributing files. It's extremely easy to use -
+downloads are started by clicking on hyperlinks. Whenever more than one person
+is downloading at once they send pieces of the file(s) to each other, thus
+relieving the central server's bandwidth burden. Even with many simultaneous
+downloads, the upload burden on the central server remains quite small, since
+each new downloader introduces new upload capacity.
 
-# Fedora >= 4 and RHEL > 4 have /etc/pki
-%if %{!?fedora:0}%{?fedora} >= 4 || %{!?rhel:0}%{?rhel} > 4
-%define pkidir %{_sysconfdir}/pki
-%else
-%define pkidir %{_datadir}
-%endif
+This package contains the graphical versions of the BitTorrent tools.
 
 %prep
 %setup -q -n BitTorrent-%{version}
+%{__cp} -p %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
 
 # Prevent phone-home new version check
-%patch0 -p1
+%patch0 -p1 -b .versioncheck
 
 # Our package is "bittorrent", not "BitTorrent"
-%{__sed} -i "s#appdir = .*#appdir = '%{name}-%{version}'#" \
-	BitTorrent/platform.py
+%patch1 -p1 -b .packagename
 
 # Put public key in standard place
-%{__sed} -i "s#public_key_file = .*#public_key_file = open('%{pkidir}/bittorrent/public.key', 'rb')#" \
-	BitTorrent/NewVersion.py
+%patch2 -p1 -b .keydir
+%{__sed} -i -e 's,@@PKIDIR@@,%{pkidir},' BitTorrent/NewVersion.py
 
 # Remove useless shellbangs
-%{__sed} -i -e '/^#! *\/usr\/bin\/env python/d' BitTorrent/launchmanycore.py BitTorrent/makemetafile.py
+%patch3 -p1 -b .shellbang
+
+# Update icon
+%{__sed} -i -e 's,bittorrent\.png,%{_datadir}/pixmaps/bittorrent-%{version}/logo/bittorrent_48.png,' \
+	bittorrent.desktop
 
 # Create options files for initscripts
 %{__cat} <<EOF >bittorrent.sysconfig
@@ -128,21 +133,22 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-
-/usr/bin/desktop-file-install --vendor %{desktopvendor} \
+%{__install} -d -m 755 %{buildroot}%{_datadir}/applications
+%{__install} -d -m 755 %{buildroot}%{pkidir}/bittorrent
+%{__install} -m 0644 public.key %{buildroot}%{pkidir}/bittorrent
+/usr/bin/desktop-file-install \
+	--vendor %{desktopvendor} \
 	--dir %{buildroot}%{_datadir}/applications \
-	--add-category X-Fedora \
-	%{SOURCE1}
+	bittorrent.desktop
 %{__install} -d %{buildroot}%{bt_dir}
 %{__install} -d %{buildroot}%{bt_statedir}
-%{__install} -d %{buildroot}%{_localstatedir}/{run,log/bittorrent}
-%{__install} -d %{buildroot}%{pkidir}/bittorrent
-%{__install} -m 0644 public.key              %{buildroot}%{pkidir}/bittorrent
-%{__install} -m 0644 -D %{SOURCE2}           %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
-%{__install} -m 0755 -D %{SOURCE3}           %{buildroot}%{_sysconfdir}/rc.d/init.d/btseed
-%{__install} -m 0755 -D %{SOURCE4}           %{buildroot}%{_sysconfdir}/rc.d/init.d/bttrack
+%{__install} -d %{buildroot}%{_localstatedir}/{run,log/bittorrent,spool/bittorrent}
+%{__install} -m 0755 -D btseed.init %{buildroot}%{_sysconfdir}/rc.d/init.d/btseed
+%{__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
@@ -177,16 +183,12 @@
 
 %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,0755)
+%defattr(-,root,root,-)
 %doc README.txt credits.txt credits-l10n.txt LICENSE.txt TRACKERLESS.txt
 %{_bindir}/bittorrent-console
 %{_bindir}/bittorrent-curses
@@ -199,11 +201,13 @@
 %{_bindir}/bttrack
 %{_bindir}/btseed
 %{pkidir}/bittorrent
-%{python_sitelib}/BitTorrent/
+%dir %{python_sitelib}/BitTorrent/
+%{python_sitelib}/BitTorrent/*.py*
 %{python_sitelib}/khashmir/
-%attr(-,torrent,torrent) %dir %{bt_dir}
-%attr(-,torrent,torrent) %dir %{bt_statedir}
-%attr(-,torrent,torrent) %dir %{_localstatedir}/log/bittorrent
+%attr(-,torrent,torrent) %dir %{bt_dir}/
+%attr(-,torrent,torrent) %dir %{bt_statedir}/
+%attr(-,torrent,torrent) %dir %{_localstatedir}/log/bittorrent/
+%attr(-,torrent,torrent) %dir %{_localstatedir}/spool/bittorrent/
 %ghost %{_localstatedir}/run/bittorrent-tracker.pid
 %{_sysconfdir}/rc.d/init.d/btseed
 %{_sysconfdir}/rc.d/init.d/bttrack
@@ -211,14 +215,27 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/bittorrent
 
 %files gui
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
 %{_bindir}/bittorrent
 %{_bindir}/maketorrent
-%{_datadir}/pixmaps/bittorrent-%{version}
-%{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
+%{_datadir}/pixmaps/bittorrent-%{version}/
 %{_datadir}/applications/%{desktopvendor}-bittorrent.desktop
 
 %changelog
+* Mon Mar 12 2007 Paul Howarth <paul at city-fan.org> 4.4.0-4
+- Cosmetic spec file reorganization to bring it largely in line with devel
+- Drop support for Fedora < 4 and RHEL < 4
+- StartupNotify=true in desktop file
+- Source is now on download.bittorrent.com, not www.bittorrent.com
+- Use patches rather than scripted edits to detect changes more easily
+- Reinstate python-devel buildreq
+- GUI subpackage provides BitTorrent-gui as well as obsoleting it
+- Don't use categories X-Fedora or Application in the desktop file
+- %%{_localstatedir}/spool/bittorrent must exist and be writable by user
+  torrent to store config settings (#231697)
+- Icon moved back out of %%{_datadir}/icons/hicolor; scriptlets simplified
+- Not everything in %%{python_sitelib}/BitTorrent/ belongs in main package
+
 * Tue Aug 29 2006 Paul Howarth <paul at city-fan.org> 4.4.0-2
 - Don't need python-devel buildreq
 - Don't %%ghost .pyo files
@@ -280,8 +297,8 @@
 - provides should be version-release tagged too
 
 * Tue Jul 11 2005 Paul Howarth <paul at city-fan.org> 4.1.2-5
-- move icon to %{_datadir}/icons/hicolor/48x48/apps instead of
-  %{_datadir}/pixmaps and update icon cache on installation if
+- move icon to %%{_datadir}/icons/hicolor/48x48/apps instead of
+  %%{_datadir}/pixmaps and update icon cache on installation if
   necessary (#162465)
 - no need to set CFLAGS in %%build for noarch package
 - don't offer build option not to delete usr/group on uninstall
@@ -309,7 +326,7 @@
 - tidy up description text
 - improved initscripts (#158273)
 - for versions on Fedora Core >= 4 or RHEL, put server data under /srv rather
-  than %{_localstatedir}
+  than %%{_localstatedir}
 - separate logs/logrotate scripts for tracker and seeder
 - have the gui subpackage obsolete the official BitTorrent RPM package, which
   is called BitTorrent, includes the GUI in the same package and is built


