rpms/bittorrent/devel bittorrent.spec,1.18,1.19

[Paul Howarth (pghmcfc)]

Author: pghmcfc

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

Modified Files:
	bittorrent.spec 
Log Message:
* Mon Jul 04 2005 Paul Howarth <paul at city-fan.org> 4.1.2-2
- add Provides/Obsoletes for python-khashmir for clean upgrades from split
  bittorrent packages



Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bittorrent.spec	13 Jun 2005 13:01:12 -0000	1.18
+++ bittorrent.spec	4 Jul 2005 10:58:32 -0000	1.19
@@ -23,6 +23,9 @@
 Requires:       python
 Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
+Provides:	python-khashmir
+Obsoletes:	python-khashmir < %{version}
+
 Requires(pre):  %{_sbindir}/useradd
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
@@ -202,15 +205,19 @@
 %{_datadir}/pixmaps/bittorrent.png
 
 %changelog
-* Mon Jun 13 2005 Paul Howarth <paul at city-fan.org> 4.1.2-1%{?dist}
+* Mon Jul  4 2005 Paul Howarth <paul at city-fan.org> 4.1.2-2
+- add Provides/Obsoletes for python-khashmir for clean upgrades from split
+  bittorrent packages
+
+* Mon Jun 13 2005 Paul Howarth <paul at city-fan.org> 4.1.2-1
 - update to 4.1.2
 - add gettext build requirement for translations
 
-* Mon Jun  6 2005 Paul Howarth <paul at city-fan.org> 4.1.1-3%{?dist}
+* Mon Jun  6 2005 Paul Howarth <paul at city-fan.org> 4.1.1-3
 - don't delete user/group torrent on uninstall
   (see https://www.redhat.com/archives/fedora-extras-commits/2005-June/msg00271.html)
 
-* Thu Jun  2 2005 Paul Howarth <paul at city-fan.org> 4.1.1-2%{?dist}
+* Thu Jun  2 2005 Paul Howarth <paul at city-fan.org> 4.1.1-2
 - tidy up description text
 - improved initscripts (#158273)
 - for versions on Fedora Core >= 4 or RHEL, put server data under /srv rather
@@ -221,23 +228,23 @@
   using python's dist tools and hence doesn't include all dependencies,
   provide initscripts etc.; this provides a clean upgrade path to Extras
 
-* Tue May 31 2005 Paul Howarth <paul at city-fan.org> 4.1.1-1%{?dist}
+* Tue May 31 2005 Paul Howarth <paul at city-fan.org> 4.1.1-1
 - update to 4.1.1
 - add "khashmir" python library
 - add TRACKERLESS.txt as %%doc
 - add translations
 
-* Tue May 24 2005 Paul Howarth <paul at city-fan.org> 4.0.2-1%{?dist}
+* Tue May 24 2005 Paul Howarth <paul at city-fan.org> 4.0.2-1
 - update to 4.0.2
 
-* Mon May 23 2005 Paul Howarth <paul at city-fan.org> 4.0.1-2%{?dist}
+* Mon May 23 2005 Paul Howarth <paul at city-fan.org> 4.0.1-2
 - use macros consistently throughout
 - add initscripts so users can easily set up trackers and seeders
   on their own (#158273)
 - add user torrent for tracker/seeder
 - add logrotate script for tracker
 
-* Wed May 18 2005 Paul Howarth <paul at city-fan.org> 4.0.1-1%{?dist}
+* Wed May 18 2005 Paul Howarth <paul at city-fan.org> 4.0.1-1
 - new upstream release 4.0.1 (#157632)
 - add dist tag
 - source now found on sourceforge.net