Hello community, here is the log from the commit of package cvs2svn for openSUSE:Factory checked in at 2015-03-16 09:42:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cvs2svn (Old) and /work/SRC/openSUSE:Factory/.cvs2svn.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cvs2svn" Changes: -------- --- /work/SRC/openSUSE:Factory/cvs2svn/cvs2svn.changes 2013-09-04 13:21:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cvs2svn.new/cvs2svn.changes 2015-03-16 09:42:16.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 13 18:16:49 UTC 2015 - [email protected] + +- fix SLE 12 build - remove gpg-offline + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cvs2svn.spec ++++++ --- /var/tmp/diff_new_pack.GTGA3g/_old 2015-03-16 09:42:17.000000000 +0100 +++ /var/tmp/diff_new_pack.GTGA3g/_new 2015-03-16 09:42:17.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package cvs2svn # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,61 +15,56 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%{!?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]')} +%{!?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 -BuildRequires: python-devel >= 2.4 -Requires: python >= %{py_ver}, python < %{py_ver}.99 Version: 2.4.0 Release: 0 -Requires: rcs -Requires: subversion -Provides: subversion-cvs2svn = %{version} -Obsoletes: subversion-cvs2svn < %{version} -Url: http://cvs2svn.tigris.org/ -# -PreReq: %insserv_prereq %fillup_prereq # Summary: Converts CVS repositories to Subversion repositories License: Apache-2.0 Group: Development/Tools/Version Control -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Url: http://cvs2svn.tigris.org/ Source0: http://cvs2svn.tigris.org/files/documents/1462/49237/%{name}-%{version}.tar.gz Source1: http://cvs2svn.tigris.org/files/documents/1462/49238/%{name}-%{version}.tar.gz.asc # http://www-heller.harvard.edu/people/mhagger/pgp.html Source2: cvs2svn.keyring Source99: cvs2svn-rpmlintrc Patch0: cvs2svn.install-prefix.patch +BuildRequires: python-devel >= 2.4 +Requires: python < %{py_ver}.99 +Requires: python >= %{py_ver} +Requires: rcs +Requires: subversion +# +PreReq: %insserv_prereq %fillup_prereq +Provides: subversion-cvs2svn = %{version} +Obsoletes: subversion-cvs2svn < %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%py_requires %if 0%{?suse_version} >= 1120 BuildArch: noarch %endif -%py_requires # -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif %description Converts CVS repositories to Subversion repositories. -See /usr/share/doc/packages/cvs2svn directory for more information. - - +See %{_docdir}/cvs2svn directory for more information. %prep -%{?gpg_verify: %gpg_verify %{S:1}} %setup -q # %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} +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 DESTDIR=%{buildroot} install %{?_smp_mflags} %files %defattr(-,root,root) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
