rpms/bittorrent/devel bittorrent.spec,1.41,1.42

[Paul Howarth (pghmcfc)]

Author: pghmcfc

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

Modified Files:
	bittorrent.spec 
Log Message:
Own directory /srv/bittorrent (#233824)


Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- bittorrent.spec	27 Feb 2007 16:02:36 -0000	1.41
+++ bittorrent.spec	25 Mar 2007 13:44:05 -0000	1.42
@@ -1,14 +1,15 @@
 # A few useful macros
 %{!?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
+%define bt_dir		/srv/bittorrent
+%define bt_datadir	%{bt_dir}/data
+%define bt_statedir	%{bt_dir}/state
 %define pkidir		%{_sysconfdir}/pki
 
 Summary:	BitTorrent swarming network file transfer tool
 Name:		bittorrent
 Version:	4.4.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Group:		Applications/Internet
 License:	BitTorrent Open Source License
 URL:		http://www.bittorrent.com/
@@ -88,11 +89,11 @@
 
 # Create options files for initscripts
 %{__cat} <<EOF >bittorrent.sysconfig
-SEEDDIR=%{bt_dir}
+SEEDDIR=%{bt_datadir}
 SEEDOPTS="--max_upload_rate 350 --display_interval 300"
 SEEDLOG=%{_localstatedir}/log/bittorrent/btseed.log
 TRACKPORT=6969
-TRACKDIR=%{bt_dir}
+TRACKDIR=%{bt_datadir}
 TRACKSTATEFILE=%{bt_statedir}/bttrack
 TRACKLOG=%{_localstatedir}/log/bittorrent/bttrack.log
 TRACKOPTS="--min_time_between_log_flushes 4.0 --show_names 1 --hupmonitor 1"
@@ -131,6 +132,7 @@
 	--dir %{buildroot}%{_datadir}/applications \
 	bittorrent.desktop
 %{__install} -d %{buildroot}%{bt_dir}
+%{__install} -d %{buildroot}%{bt_datadir}
 %{__install} -d %{buildroot}%{bt_statedir}
 %{__install} -d %{buildroot}%{_localstatedir}/{run,log/bittorrent,spool/bittorrent}
 %{__install} -m 0755 -D btseed.init %{buildroot}%{_sysconfdir}/rc.d/init.d/btseed
@@ -195,6 +197,7 @@
 %{python_sitelib}/BitTorrent/*.py*
 %{python_sitelib}/khashmir/
 %attr(-,torrent,torrent) %dir %{bt_dir}/
+%attr(-,torrent,torrent) %dir %{bt_datadir}/
 %attr(-,torrent,torrent) %dir %{bt_statedir}/
 %attr(-,torrent,torrent) %dir %{_localstatedir}/log/bittorrent/
 %attr(-,torrent,torrent) %dir %{_localstatedir}/spool/bittorrent/
@@ -212,6 +215,9 @@
 %{_datadir}/applications/%{desktopvendor}-bittorrent.desktop
 
 %changelog
+* Sun Mar 25 2007 Paul Howarth <paul at city-fan.org> 4.4.0-5
+- Own directory /srv/bittorrent (#233824)
+
 * 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