Hello community, here is the log from the commit of package cvs2svn for openSUSE:Factory checked in at Fri Mar 19 10:34:20 CET 2010. -------- --- cvs2svn/cvs2svn.changes 2009-07-17 15:54:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/cvs2svn/cvs2svn.changes 2010-03-13 02:53:10.000000000 +0100 @@ -1,0 +2,18 @@ +Sat Mar 13 01:45:47 UTC 2010 - pascal.bleser@opensuse.org + +- update to 2.3.0: + * add a "cvs2git" script for starting conversions to git (or Mercurial) + * add a "cvs2bzr" script for starting conversions to Bazaar + * generate manual pages automatically via new --man option + * allow --mime-types and --auto-props options to be specified more than once + * support author transforms when converting to Subversion + * allow unlabeled branches to be renamed using SymbolTransforms + * fix cvs2git with non-inline blobs: a revision after a delete could be empty + * do path comparisions platform-independently in symbol transform classes + * fix https://bugs.launchpad.net/pld-linux/+bug/385920 + * output error message if a revision's deltatext is missing + * improve contrib/verify-cvs2svn.py (used for testing conversion accuracy) + * add an IgnoreSymbolTransform class, for ignoring symbols matching a regexp + * remove some DeprecationWarnings when running under newer Python versions + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- cvs2svn-2.2.0.tar.bz2 New: ---- cvs2svn-2.3.0.tar.bz2 cvs2svn-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cvs2svn.spec ++++++ --- /var/tmp/diff_new_pack.Oz3YXn/_old 2010-03-19 10:31:09.000000000 +0100 +++ /var/tmp/diff_new_pack.Oz3YXn/_new 2010-03-19 10:31:09.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cvs2svn (Version 2.2.0) +# spec file for package cvs2svn (Version 2.3.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,21 +17,24 @@ # norootforbuild +%{!?python_sitelib: %global python_sitelib %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python_sitearch: %global python_sitearch %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%{!?py_ver: %global pyver %(%__python -c 'import sys; print sys.version[:3]')} Name: cvs2svn +%if 0%{?sles_version} >= 9 && 0%{?sles_version} < 10 +BuildRequires: python25-devel +Requires: python25 +%else BuildRequires: python-devel >= 2.4 -Version: 2.2.0 +Requires: python >= %{py_ver}, python < %{py_ver}.99 +%endif +Version: 2.3.0 Release: 1 -# -%define site_python %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()") -# -%define cvs2svn_dir cvs2svn-%{version} -%define pyver %(python -c 'import sys; print sys.version[:3]') -Requires: python >= %pyver, python < %{pyver}.99 Requires: rcs Requires: subversion -Provides: subversion-cvs2svn -Obsoletes: subversion-cvs2svn +Provides: subversion-cvs2svn = %{version} +Obsoletes: subversion-cvs2svn < %{version} Group: Development/Tools/Version Control Url: http://cvs2svn.tigris.org/ # @@ -39,11 +42,15 @@ # Summary: Converts CVS repositories to Subversion repositories BuildRoot: %{_tmppath}/%{name}-%{version}-build -License: ASLv.. +License: ASLv2 Group: Development/Tools/Version Control -# http://cvs2svn.tigris.org/files/documents/1462/44372/cvs2svn-%{version}.tar.gz +# http://cvs2svn.tigris.org/files/documents/1462/46528/cvs2svn-%{version}.tar.gz Source0: cvs2svn-%{version}.tar.bz2 +Source99: cvs2svn-rpmlintrc Patch0: cvs2svn.install-prefix.patch +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %py_requires # @@ -55,20 +62,24 @@ %prep -%setup -q -n %{cvs2svn_dir} +%setup -q # -%patch0 -p1 +%patch0 +# replace shebang for python with %__python +%__perl -ni -e 'if (1..1 && m/^#!(.+python)(\s+.+)?$/) {print "#!%__python".$2."\n";} else {print}' cvs2{svn,bzr,git} %build %install -make install DESTDIR=$RPM_BUILD_ROOT +%__make install DESTDIR="$RPM_BUILD_ROOT" %files %defattr(-,root,root) %doc {BUGS,COMMITTERS,COPYING,README,www/{faq,cvs2svn}.html} -%attr(755,root,root) /usr/bin/cvs2svn -%dir %{site_python}/cvs2svn_rcsparse -%{site_python}/cvs2svn* +%attr(755,root,root) %{_bindir}/cvs2svn +%attr(755,root,root) %{_bindir}/cvs2bzr +%attr(755,root,root) %{_bindir}/cvs2git +%dir %{python_sitelib}/cvs2svn_rcsparse +%{python_sitelib}/cvs2svn* %changelog ++++++ cvs2svn-2.2.0.tar.bz2 -> cvs2svn-2.3.0.tar.bz2 ++++++ ++++ 20142 lines of diff (skipped) ++++++ cvs2svn.install-prefix.patch ++++++ --- /var/tmp/diff_new_pack.Oz3YXn/_old 2010-03-19 10:31:10.000000000 +0100 +++ /var/tmp/diff_new_pack.Oz3YXn/_new 2010-03-19 10:31:10.000000000 +0100 @@ -1,14 +1,6 @@ -According to bug #149809, prefix must be /usr/local - ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: cvs2svn-1.5.x/Makefile -=================================================================== ---- cvs2svn-1.5.x.orig/Makefile -+++ cvs2svn-1.5.x/Makefile -@@ -18,8 +18,8 @@ install: +--- Makefile.orig 2009-08-23 00:01:10.000000000 +0200 ++++ Makefile 2010-03-13 02:45:09.000000000 +0100 +@@ -35,8 +35,8 @@ ${PYTHON} ./setup.py install ; \ ;; \ *) \ ++++++ cvs2svn-rpmlintrc ++++++ addFilter("W: non-executable-script /usr/lib.*/python.*/site-packages/cvs2svn.*") addFilter("W: python-naming-policy-not-applied .*") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org