rpms/bittorrent/devel bittorrent-4.24.2-appdir.patch, NONE, 1.1 bittorrent-4.24.2-no-version-check.patch, NONE, 1.1 bittorrent-4.24.2-pkidir.patch, NONE, 1.1 bittorrent-5.0.1-shellbang.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 bittorrent.desktop, 1.2, 1.3 bittorrent.spec, 1.37, 1.38 sources, 1.17, 1.18 bittorrent-4.2.2-no-version-check.patch, 1.1, NONE
Paul Howarth (pghmcfc)
fedora-extras-commits at redhat.com
Thu Jan 18 16:37:22 UTC 2007
- Previous message: rpms/claws-mail-plugins/FC-5 .cvsignore, 1.2, 1.3 claws-mail-plugins.spec, 1.2, 1.3 sources, 1.2, 1.3
- Next message: rpms/rekall/FC-6 rekall-2.4.5-gcc4.patch, NONE, 1.1 rekall-2.4.5-lib64.patch, NONE, 1.1 rekall-2.4.5-qt3-kdedocdir.patch, NONE, 1.1 rekall.spec, 1.17, 1.18 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pghmcfc
Update of /cvs/extras/rpms/bittorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29293
Modified Files:
.cvsignore bittorrent.desktop bittorrent.spec sources
Added Files:
bittorrent-4.24.2-appdir.patch
bittorrent-4.24.2-no-version-check.patch
bittorrent-4.24.2-pkidir.patch
bittorrent-5.0.1-shellbang.patch
Removed Files:
bittorrent-4.2.2-no-version-check.patch
Log Message:
Update to 5.0.4
StartupNotify=true in desktop file
Source is now on download.bittorrent.com, not www.bittorrent.com
Update no-version-check patch
Use patches rather than scripted edits to detect changes more easily
Strip out support for all distributions that don't have python >= 2.4, i.e.
Fedora < 4 and RHEL4
New python package BTL
Add new deps python-twisted-{core,web} for main package, and wxPython for GUI
Include Zeroconf python code
Include GUI_wx in GUI subpackage
pygtk2 no longer needed for GUI subpackage
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
Separate credits file for translators no longer included
bittorrent-4.24.2-appdir.patch:
--- NEW FILE bittorrent-4.24.2-appdir.patch ---
--- BitTorrent-4.24.2/BitTorrent/platform.py.orig 2006-10-10 00:10:58.000000000 +0100
+++ BitTorrent-4.24.2/BitTorrent/platform.py 2006-10-11 08:24:33.000000000 +0100
@@ -281,7 +281,7 @@
osx = True
def calc_unix_dirs():
- appdir = '%s-%s' % (app_name, version)
+ appdir = '%s-%s'%('bittorrent', version)
ip = os.path.join(efs2(u'share'), efs2(u'pixmaps'), appdir)
dp = os.path.join(efs2(u'share'), efs2(u'doc'), appdir)
lp = os.path.join(efs2(u'share'), efs2(u'locale'))
bittorrent-4.24.2-no-version-check.patch:
--- NEW FILE bittorrent-4.24.2-no-version-check.patch ---
--- BitTorrent-4.24.2/BitTorrent/AutoUpdateButler.py.orig 2006-10-11 10:37:42.000000000 +0100
+++ BitTorrent-4.24.2/BitTorrent/AutoUpdateButler.py 2006-10-11 10:40:30.000000000 +0100
@@ -342,6 +342,9 @@
debug_prefix = '_check_version() run#%d: '%self.runs
self.debug(debug_prefix + 'starting')
+ self.debug('Version check skipped for RPM package')
+ return
+
url = self.version_site + self.current_version.name()
df = ThreadedDeferred(_wrap_task(self.rawserver.external_add_task),
bittorrent-4.24.2-pkidir.patch:
--- NEW FILE bittorrent-4.24.2-pkidir.patch ---
--- BitTorrent-4.24.2/BitTorrent/AutoUpdateButler.py.orig 2006-10-10 00:10:18.000000000 +0100
+++ BitTorrent-4.24.2/BitTorrent/AutoUpdateButler.py 2006-10-11 08:28:54.000000000 +0100
@@ -299,7 +299,7 @@
def _check_signature(self, torrentfile, signature):
"""Check the torrent file's signature using the public key."""
- public_key_file = open(os.path.join(doc_root, 'public.key'), 'rb')
+ public_key_file = open('@@PKIDIR@@/bittorrent/public.key', 'rb')
public_key = pickle.load(public_key_file)
public_key_file.close()
h = sha(torrentfile).digest()
bittorrent-5.0.1-shellbang.patch:
--- NEW FILE bittorrent-5.0.1-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
--- BitTorrent-5.0.1/BitTorrent/GUI_wx/MakeTorrent.py 2006-11-16 04:29:36.000000000 +0000
+++ BitTorrent-5.0.1/BitTorrent/GUI_wx/MakeTorrent.py 2006-11-16 11:37:53.000000000 +0000
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
# The contents of this file are subject to the BitTorrent Open Source License
# Version 1.0 (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/BTL/md5crypt.py 2006-11-16 04:57:45.000000000 +0000
+++ BitTorrent-5.0.1/BTL/md5crypt.py 2006-11-16 11:45:56.000000000 +0000
@@ -1,4 +1,3 @@
-#!/usr/local/bin/python
# Based on FreeBSD src/lib/libcrypt/crypt.c 1.2
# http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/src/lib/libcrypt/crypt.c?rev=1.2&content-type=text/plain
--- BitTorrent-5.0.1/BTL/CMap.py 2006-11-16 04:57:45.000000000 +0000
+++ BitTorrent-5.0.1/BTL/CMap.py 2006-11-16 12:01:38.000000000 +0000
@@ -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/BTL/routes.py 2006-11-16 04:57:45.000000000 +0000
+++ BitTorrent-5.0.1/BTL/routes.py 2006-11-16 12:01:58.000000000 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
"""
--- BitTorrent-5.0.1/BTL/PMap.py 2006-11-16 04:57:45.000000000 +0000
+++ BitTorrent-5.0.1/BTL/PMap.py 2006-11-16 12:02:19.000000000 +0000
@@ -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/BTL/ifaddrs.py 2006-11-16 04:57:45.000000000 +0000
+++ BitTorrent-5.0.1/BTL/ifaddrs.py 2006-11-16 12:02:34.000000000 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
"""
--- BitTorrent-5.0.1/BTL/CMultiMap.py 2006-11-16 04:57:45.000000000 +0000
+++ BitTorrent-5.0.1/BTL/CMultiMap.py 2006-11-16 12:04:50.000000000 +0000
@@ -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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 2 Feb 2006 13:55:22 -0000 1.17
+++ .cvsignore 18 Jan 2007 16:36:52 -0000 1.18
@@ -1 +1 @@
-BitTorrent-4.4.0.tar.gz
+BitTorrent-5.0.4.tar.gz
Index: bittorrent.desktop
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/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 18 Jan 2007 16:36:52 -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/devel/bittorrent.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- bittorrent.spec 9 Dec 2006 16:49:10 -0000 1.37
+++ bittorrent.spec 18 Jan 2007 16:36:52 -0000 1.38
@@ -1,34 +1,38 @@
+# A few useful macros
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define pythonver %(%{__python} -c "import sys ; print sys.version[:3]" || echo none)
-%define desktopvendor fedora
-
-Name: bittorrent
-Version: 4.4.0
-Release: 3%{?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
+%define desktopvendor fedora
+%define bt_dir /srv/bittorrent/data
+%define bt_statedir /srv/bittorrent/state
+%define pkidir %{_sysconfdir}/pki
+
+Name: bittorrent
+Version: 5.0.4
+Release: 1%{?dist}
+Summary: BitTorrent swarming network file transfer tool
+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.2.2-no-version-check.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
-# python-devel needed for python >= 2.5
-BuildRequires: desktop-file-utils gettext python-devel
-Requires: python-crypto
-# python 2.3-based distros need explicit python-abi dependency
-%if "%{pythonver}" == "2.3"
-Requires: python-abi = %{pythonver}
-%endif
+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
+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
+Provides: python-BTL = %{version}-%{release}
+Obsoletes: python-BTL < %{version}-%{release}
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
@@ -43,52 +47,36 @@
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 tool
+Group: Applications/Internet
+Requires: wxPython >= 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
-
-# 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
+%description gui
+This package contains the graphical versions of the BitTorrent tools.
%prep
%setup -q -n BitTorrent-%{version}
+%{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} .
# 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
# Create options files for initscripts
%{__cat} <<EOF >bittorrent.sysconfig
@@ -127,19 +115,19 @@
%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
-
-/usr/bin/desktop-file-install --vendor %{desktopvendor} \
+%{__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
+/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
# pidof doesn't find scripts with hyphenated names, so make some convenience links for initscripts
@@ -186,7 +174,7 @@
%files -f bittorrent.lang
%defattr(-,root,root,-)
-%doc README.txt credits.txt credits-l10n.txt LICENSE.txt TRACKERLESS.txt
+%doc README.txt credits.txt LICENSE.txt TRACKERLESS.txt
%{_bindir}/bittorrent-console
%{_bindir}/bittorrent-curses
%{_bindir}/bittorrent-tracker
@@ -199,10 +187,13 @@
%{_bindir}/btseed
%{pkidir}/bittorrent
%{python_sitelib}/BitTorrent/
+%{python_sitelib}/BTL/
%{python_sitelib}/khashmir/
-%attr(-,torrent,torrent) %dir %{bt_dir}
-%attr(-,torrent,torrent) %dir %{bt_statedir}
-%attr(-,torrent,torrent) %dir %{_localstatedir}/log/bittorrent
+%{python_sitelib}/Zeroconf.py*
+%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
@@ -216,8 +207,28 @@
%{_datadir}/pixmaps/bittorrent-%{version}
%{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
%{_datadir}/applications/%{desktopvendor}-bittorrent.desktop
+%{python_sitelib}/BitTorrent/GUI_wx/
%changelog
+* Thu Jan 18 2007 Paul Howarth <paul at city-fan.org> 5.0.4-1
+- Update to 5.0.4
+- StartupNotify=true in desktop file
+- Source is now on download.bittorrent.com, not www.bittorrent.com
+- Update no-version-check patch
+- Use patches rather than scripted edits to detect changes more easily
+- Strip out support for all distributions that don't have python >= 2.4, i.e.
+ Fedora < 4 and RHEL4
+- New python package BTL
+- Add new deps python-twisted-{core,web} for main package, and wxPython for GUI
+- Include Zeroconf python code
+- Include GUI_wx in GUI subpackage
+- pygtk2 no longer needed for GUI subpackage
+- 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
+- Separate credits file for translators no longer included
+
* Sat Dec 9 2006 Paul Howarth <paul at city-fan.org> 4.4.0-3
- Fixups for build with python 2.5 on Rawhide
@@ -282,8 +293,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
@@ -311,7 +322,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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 2 Feb 2006 13:55:22 -0000 1.17
+++ sources 18 Jan 2007 16:36:52 -0000 1.18
@@ -1 +1 @@
-74d4b48202c28f0b27e989b6d5f5b214 BitTorrent-4.4.0.tar.gz
+3f6a1093102541e88a16d6c1c62e8bcc BitTorrent-5.0.4.tar.gz
--- bittorrent-4.2.2-no-version-check.patch DELETED ---
- Previous message: rpms/claws-mail-plugins/FC-5 .cvsignore, 1.2, 1.3 claws-mail-plugins.spec, 1.2, 1.3 sources, 1.2, 1.3
- Next message: rpms/rekall/FC-6 rekall-2.4.5-gcc4.patch, NONE, 1.1 rekall-2.4.5-lib64.patch, NONE, 1.1 rekall-2.4.5-qt3-kdedocdir.patch, NONE, 1.1 rekall.spec, 1.17, 1.18 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list