rpms/rdiff-backup/devel sources,1.2,1.3 rdiff-backup.spec,1.4,1.5

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/rdiff-backup/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv22429

Modified Files:
	sources rdiff-backup.spec 
Log Message:
Update to 0.12.7 in reply to bug #144419.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:17:55 -0000	1.2
+++ sources	22 Jan 2005 20:27:02 -0000	1.3
@@ -1 +1 @@
-49d7baedd303fb278a65682064ec8c64  rdiff-backup-0.12.6.tar.gz
+12fb0085861483eab379cb578fa9c849  rdiff-backup-0.12.7.tar.gz


Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/rdiff-backup.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rdiff-backup.spec	10 Dec 2004 22:03:10 -0000	1.4
+++ rdiff-backup.spec	22 Jan 2005 20:27:02 -0000	1.5
@@ -1,19 +1,19 @@
-%define PYTHON_VERSION %(python -c 'import sys; print sys.version[:3],')
-%define NEXT_PYTHON_VERSION %(python -c 'import sys; print "%d.%d" % (sys.version_info[0], sys.version_info[1]+1),')
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Version: 0.12.6
+Version: 0.12.7
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
 Release: 1
 Epoch: 0
-URL: http://rdiff-backup.stanford.edu/
-Source: http://rdiff-backup.stanford.edu/OLD/%{version}/%{name}-%{version}.tar.gz
+URL: http://www.nongnu.org/rdiff-backup/
+Source: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/Archiving
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: python >= 0:%{PYTHON_VERSION}, python < 0:%{NEXT_PYTHON_VERSION}
 BuildRequires: python-devel >= 0:2.2, librsync-devel >= 0:0.9.6
 
+Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+
 %description
 rdiff-backup is a script, written in Python, that backs up one
 directory to another and is intended to be run periodically (nightly
@@ -33,9 +33,10 @@
 python setup.py build
 
 %install
+rm -rf $RPM_BUILD_ROOT
 python setup.py install --root $RPM_BUILD_ROOT
 # Produce .pyo files for %ghost directive later
-python -Oc 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT/%{_libdir}/python%{PYTHON_VERSION}/site-packages/rdiff_backup'")'
+python -Oc 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT/%{python_sitearch}/rdiff_backup'")'
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -44,17 +45,24 @@
 %defattr(-,root,root)
 %{_bindir}/rdiff-backup
 %{_mandir}/man1/rdiff-backup*
-%dir %{_libdir}/python%{PYTHON_VERSION}/site-packages/rdiff_backup
-%{_libdir}/python%{PYTHON_VERSION}/site-packages/rdiff_backup/*.py
-%{_libdir}/python%{PYTHON_VERSION}/site-packages/rdiff_backup/*.pyc
-%{_libdir}/python%{PYTHON_VERSION}/site-packages/rdiff_backup/*.so
-%ghost %{_libdir}/python%{PYTHON_VERSION}/site-packages/rdiff_backup/*.pyo
+%dir %{python_sitearch}/rdiff_backup
+%{python_sitearch}/rdiff_backup/*.py
+%{python_sitearch}/rdiff_backup/*.pyc
+%{python_sitearch}/rdiff_backup/*.so
+%ghost %{python_sitearch}/rdiff_backup/*.pyo
 %doc CHANGELOG COPYING FAQ.html README
 
 %changelog
+* Sat Jan 22 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:0.12.7-1
+- Update to 0.12.7 which was released May 31st, 2004.
+- Enhance spec with python-abi and arch-dependent sitelib paths.
+- Update URL and Source.
+
 * Sun Oct 05 2003 Ben Escoto <bescoto at stanford.edu> - 0:0.12.5-0.fdr.1
 - Added epochs to python versions, more concise %%defines, %%ghost files
+
 * Thu Aug 16 2003 Ben Escoto <bescoto at stanford.edu> - 0:0.12.3-0.fdr.4
 - Implemented various suggestions of Fedora QA
+
 * Sun Nov 4 2001 Ben Escoto <bescoto at stanford.edu>
 - Initial RPM