rpms/bittorrent/devel bittorrent.spec, 1.25, 1.26 bittorrent.desktop, 1.1, 1.2 btseed.init, 1.3, 1.4 bttrack.init, 1.3, 1.4 sources, 1.9, 1.10 .cvsignore, 1.9, 1.10
Paul Howarth (pghmcfc)
fedora-extras-commits at redhat.com
Thu Aug 18 11:39:15 UTC 2005
Author: pghmcfc
Update of /cvs/extras/rpms/bittorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9459
Modified Files:
bittorrent.spec bittorrent.desktop btseed.init bttrack.init
sources .cvsignore
Log Message:
* Thu Aug 18 2005 Paul Howarth <paul at city-fan.org> 4.1.4-1
- update to 4.1.4
- all "binaries" renamed; initscripts & desktop entry changed accordingly
- don't need to edit out "env python2"... stuff
- appdir now set in platform.py instead of __init__.py
- add credits-l10n.txt as %doc
- add python-crypto dependency
- add public.key in appropriate place
- tweak Fedora/RHEL conditional build selection
Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- bittorrent.spec 15 Jul 2005 12:12:58 -0000 1.25
+++ bittorrent.spec 18 Aug 2005 11:39:13 -0000 1.26
@@ -3,7 +3,7 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: bittorrent
-Version: 4.1.3
+Version: 4.1.4
Release: 1%{?dist}
Summary: BitTorrent swarming network file transfer tool
@@ -19,9 +19,9 @@
BuildArch: noarch
BuildRequires: python-devel desktop-file-utils gettext
-Requires: python
+Requires: python-crypto
# FC4 and later auto-generate python version dependency
-%if "%{fedora}" < "4" || 0%{?rhel}
+%if %{!?fedora:0}%{?fedora} < 4 || %{!?rhel:0}%{?rhel}
Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
%endif
@@ -56,9 +56,8 @@
This package contains the GUI versions of the BitTorrent file transfer
tool.
-# Fedora >= 4 has /srv, as does RHEL4
-# Older versions of RHEL don't provide other dependencies needed for this package, so don't cater for them
-%if "%{fedora}" >= "4" || 0%{?rhel}
+# 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
@@ -66,9 +65,19 @@
%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
+
%prep
%setup -q -n BitTorrent-%{version}
-%{__sed} -i "s/appdir = .*/appdir = '%{name}-%{version}'/" BitTorrent/__init__.py
+%{__sed} -i "s#appdir = .*#appdir = '%{name}-%{version}'#" \
+ BitTorrent/platform.py
+%{__sed} -i "s#public_key_file = .*#public_key_file = open('%{pkidir}/bittorrent/public.key', 'rb')#" \
+ BitTorrent/NewVersion.py
%{__cat} <<EOF >btseed.sysconfig
DIR=%{bt_dir}
@@ -110,7 +119,6 @@
%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-%{__sed} -i -e 's/env python2/env python/' $RPM_BUILD_ROOT%{_bindir}/*
%{_bindir}/desktop-file-install --vendor %{desktopvendor} \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -119,6 +127,8 @@
%{__install} -d $RPM_BUILD_ROOT%{bt_dir}
%{__install} -d $RPM_BUILD_ROOT%{bt_statedir}
%{__install} -d $RPM_BUILD_ROOT%{_localstatedir}/log/bittorrent
+%{__install} -d -m 755 $RPM_BUILD_ROOT%{pkidir}/bittorrent
+%{__install} -m 0644 public.key $RPM_BUILD_ROOT%{pkidir}/bittorrent
%{__install} -m 0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
%{__install} -m 0755 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/btseed
%{__install} -m 0755 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/bttrack
@@ -126,6 +136,9 @@
%{__install} -m 0644 -D bttrack.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/bttrack
%{__install} -m 0644 -D btseed.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/btseed
%{__install} -m 0644 -D bttrack.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/bttrack
+# pidof doesn't find scripts with hyphenated names, so make some convenience links for initscripts
+%{__ln_s} bittorrent-tracker $RPM_BUILD_ROOT%{_bindir}/bttrack
+%{__ln_s} launchmany-console $RPM_BUILD_ROOT%{_bindir}/btseed
%{find_lang} bittorrent
%clean
@@ -165,16 +178,18 @@
%files -f bittorrent.lang
%defattr(-,root,root,-)
-%doc README.txt credits.txt LICENSE.txt TRACKERLESS.txt
-%{_bindir}/btdownloadcurses.py
-%{_bindir}/btdownloadheadless.py
-%{_bindir}/btlaunchmany.py
-%{_bindir}/btlaunchmanycurses.py
-%{_bindir}/btmaketorrent.py
-%{_bindir}/btreannounce.py
-%{_bindir}/btrename.py
-%{_bindir}/btshowmetainfo.py
-%{_bindir}/bttrack.py
+%doc README.txt credits.txt credits-l10n.txt LICENSE.txt TRACKERLESS.txt
+%{_bindir}/bittorrent-console
+%{_bindir}/bittorrent-curses
+%{_bindir}/bittorrent-tracker
+%{_bindir}/changetracker-console
+%{_bindir}/launchmany-console
+%{_bindir}/launchmany-curses
+%{_bindir}/maketorrent-console
+%{_bindir}/torrentinfo-console
+%{_bindir}/bttrack
+%{_bindir}/btseed
+%{pkidir}/bittorrent
%dir %{python_sitelib}/BitTorrent
%{python_sitelib}/BitTorrent/*.py
%{python_sitelib}/BitTorrent/*.pyc
@@ -195,13 +210,23 @@
%files gui
%defattr(-,root,root,-)
-%{_bindir}/btdownloadgui.py
-%{_bindir}/btmaketorrentgui.py
+%{_bindir}/bittorrent
+%{_bindir}/maketorrent
%{_datadir}/applications/%{desktopvendor}-bittorrent.desktop
%{_datadir}/pixmaps/%{name}-%{version}
%{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
%changelog
+* Thu Aug 18 2005 Paul Howarth <paul at city-fan.org> 4.1.4-1
+- update to 4.1.4
+- all "binaries" renamed; initscripts & desktop entry changed accordingly
+- don't need to edit out "env python2"... stuff
+- appdir now set in platform.py instead of __init__.py
+- add credits-l10n.txt as %%doc
+- add python-crypto dependency
+- add public.key in appropriate place
+- tweak Fedora/RHEL conditional build selection
+
* Fri Jul 15 2005 Paul Howarth <paul at city-fan.org> 4.1.3-1
- update to 4.1.3
Index: bittorrent.desktop
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bittorrent.desktop 15 Mar 2005 05:50:46 -0000 1.1
+++ bittorrent.desktop 18 Aug 2005 11:39:13 -0000 1.2
@@ -2,7 +2,7 @@
Encoding=UTF-8
Name=BitTorrent File Transfer
Comment=Distributed download of files from the Internet
-Exec=btdownloadgui.py
+Exec=bittorrent
Icon=bittorrent.png
Terminal=false
Type=Application
Index: btseed.init
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/btseed.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- btseed.init 2 Jun 2005 14:26:47 -0000 1.3
+++ btseed.init 18 Aug 2005 11:39:13 -0000 1.4
@@ -3,7 +3,7 @@
# chkconfig: - 16 84
# description: Start up seed clients for BitTorrennt
#
-# processname: btlaunchmany.py
+# processname: btseed
# config: /etc/sysconfig/btseed
# source function library
@@ -25,7 +25,7 @@
. /etc/sysconfig/btseed
RETVAL=0
-prog="/usr/bin/btlaunchmany.py"
+prog="/usr/bin/btseed"
btuser="torrent"
case "$1" in
@@ -34,9 +34,9 @@
runuser -s /bin/sh -c "$prog $OPTIONS $DIR" $btuser &> $SEEDLOG &
disown -ar
usleep 500000
- status btlaunchmany.py &> /dev/null && echo_success || echo_failure
+ status btseed &> /dev/null && echo_success || echo_failure
RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/btlaunchmany.py
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/btseed
echo
;;
stop)
@@ -44,7 +44,7 @@
killproc $prog
#killproc "/usr/bin/python $prog"
RETVAL=$?
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/btlaunchmany.py
+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/btseed
echo
;;
restart|reload)
@@ -53,14 +53,14 @@
RETVAL=$?
;;
condrestart)
- if [ -f /var/lock/subsys/btlaunchmany.py ]; then
+ if [ -f /var/lock/subsys/btseed ]; then
$0 stop
$0 start
fi
RETVAL=$?
;;
status)
- status btlaunchmany.py
+ status btseed
RETVAL=$?
;;
*)
Index: bttrack.init
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/bttrack.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bttrack.init 2 Jun 2005 14:28:24 -0000 1.3
+++ bttrack.init 18 Aug 2005 11:39:13 -0000 1.4
@@ -3,7 +3,7 @@
# chkconfig: - 16 84
# description: Start up tracker for BitTorrennt
#
-# processname: bttrack.py
+# processname: bttrack
# config: /etc/sysconfig/bttrack
# source function library
@@ -12,7 +12,6 @@
# Check that networking is up.
[ "${NETWORKING}" = "no" ] && exit 0
-
# defaults
PORT=6969
STATEFILE=/srv/bittorrent/state/bttrack
@@ -25,7 +24,7 @@
. /etc/sysconfig/bttrack
RETVAL=0
-prog="/usr/bin/bttrack.py"
+prog="/usr/bin/bttrack"
btuser="torrent"
case "$1" in
@@ -35,9 +34,9 @@
$OPTIONS --allowed_dir $DIR" $btuser &> /dev/null &
disown -ar
usleep 500000
- status bttrack.py &> /dev/null && echo_success || echo_failure
+ status bttrack &> /dev/null && echo_success || echo_failure
RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bttrack.py
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bttrack
echo
;;
stop)
@@ -45,7 +44,7 @@
killproc $prog
#killproc "/usr/bin/python $prog"
RETVAL=$?
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bttrack.py
+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bttrack
echo
;;
restart|reload)
@@ -54,14 +53,14 @@
RETVAL=$?
;;
condrestart)
- if [ -f /var/lock/subsys/bttrack.py ]; then
+ if [ -f /var/lock/subsys/bttrack ]; then
$0 stop
$0 start
fi
RETVAL=$?
;;
status)
- status bttrack.py
+ status bttrack
RETVAL=$?
;;
*)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 15 Jul 2005 12:12:58 -0000 1.9
+++ sources 18 Aug 2005 11:39:13 -0000 1.10
@@ -1 +1 @@
-cd4dff145b5dea3789fa384bb94a4de9 BitTorrent-4.1.3.tar.gz
+1d0f85eb5cd4ac219853e2e6709f5847 BitTorrent-4.1.4.tar.gz
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 15 Jul 2005 12:12:58 -0000 1.9
+++ .cvsignore 18 Aug 2005 11:39:13 -0000 1.10
@@ -1 +1 @@
-BitTorrent-4.1.3.tar.gz
+BitTorrent-4.1.4.tar.gz
More information about the fedora-extras-commits
mailing list