diff options
| author | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2003-11-18 05:33:49 +0000 |
|---|---|---|
| committer | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2003-11-18 05:33:49 +0000 |
| commit | a326e28f5c73d5334abc4759dad12249cbcb7cf0 (patch) | |
| tree | e11ef421b2b5ecd1023cf16d54439c52d5d899f3 /rdiff-backup | |
| parent | 395257b553a1b5e22906de299d774c1db91df8ba (diff) | |
| download | rdiff-backup-a326e28f5c73d5334abc4759dad12249cbcb7cf0.tar.gz | |
Incorporated changes from local spec file
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@496 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup')
| -rw-r--r-- | rdiff-backup/dist/rdiff-backup.spec.template | 4 | ||||
| -rw-r--r-- | rdiff-backup/dist/rdiff-backup.spec.template-fedora | 21 |
2 files changed, 17 insertions, 8 deletions
diff --git a/rdiff-backup/dist/rdiff-backup.spec.template b/rdiff-backup/dist/rdiff-backup.spec.template index db785f3..8144fe2 100644 --- a/rdiff-backup/dist/rdiff-backup.spec.template +++ b/rdiff-backup/dist/rdiff-backup.spec.template @@ -1,7 +1,7 @@ %define PYTHON_NAME %((rpm -q --quiet python2 && echo python2) || echo python) %define PYTHON_SEP %(rpm -q --quiet python2 && echo -) -%define PYTHON_VERSION %(%{PYTHON_NAME} -c 'import sys; sys.stdout.write(".".join(map(str,sys.version_info[:2])))') -%define NEXT_PYTHON_VERSION %(%{PYTHON_NAME} -c 'import sys; sys.stdout.write(str(sys.version_info[0])); sys.stdout.write("."); sys.stdout.write(str(sys.version_info[1]+1))') +%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),') Version: $version Summary: Convenient and transparent local/remote incremental mirror/backup diff --git a/rdiff-backup/dist/rdiff-backup.spec.template-fedora b/rdiff-backup/dist/rdiff-backup.spec.template-fedora index aca26ce..b788797 100644 --- a/rdiff-backup/dist/rdiff-backup.spec.template-fedora +++ b/rdiff-backup/dist/rdiff-backup.spec.template-fedora @@ -1,5 +1,5 @@ -%define PYTHON_VERSION %(python -c 'import sys; sys.stdout.write(".".join(map(str,sys.version_info[:2])))') -%define NEXT_PYTHON_VERSION %(python -c 'import sys; sys.stdout.write(str(sys.version_info[0])); sys.stdout.write("."); sys.stdout.write(str(sys.version_info[1]+1))') +%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),') Version: $version Summary: Convenient and transparent local/remote incremental mirror/backup @@ -11,8 +11,8 @@ Source: http://rdiff-backup.stanford.edu/OLD/$version/rdiff-backup-$version.tar. License: GPL Group: Applications/Archiving BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: python >= %{PYTHON_VERSION}, python < %{NEXT_PYTHON_VERSION} -BuildRequires: python-devel >= 0:2.2, librsync-devel +Requires: python >= 0:%{PYTHON_VERSION}, python < 0:%{NEXT_PYTHON_VERSION} +BuildRequires: python-devel >= 0:2.2, librsync-devel >= 0:0.9.6 %description rdiff-backup is a script, written in Python, that backs up one @@ -34,6 +34,8 @@ python setup.py build %install 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'")' %clean rm -rf $RPM_BUILD_ROOT @@ -42,10 +44,17 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_bindir}/rdiff-backup %{_mandir}/man1/rdiff-backup* -%{_libdir}/python%{PYTHON_VERSION}/site-packages/rdiff_backup -%doc CHANGELOG COPYING FAQ.html examples.html README +%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 +%doc CHANGELOG COPYING FAQ.html README %changelog +* Sun Oct 05 2003 Ben Escoto <bescoto@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@stanford.edu> - 0:0.12.3-0.fdr.4 - Implemented various suggestions of Fedora QA |