Hello community, here is the log from the commit of package hg-fast-export for openSUSE:Factory checked in at 2015-01-20 12:35:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hg-fast-export (Old) and /work/SRC/openSUSE:Factory/.hg-fast-export.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hg-fast-export" Changes: -------- --- /work/SRC/openSUSE:Factory/hg-fast-export/hg-fast-export.changes 2011-09-23 02:02:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hg-fast-export.new/hg-fast-export.changes 2015-01-20 12:38:28.000000000 +0100 @@ -1,0 +2,11 @@ +Sun Jan 18 17:26:53 UTC 2015 - p.drou...@gmail.com + +- Update to version 20140308 + + Fix work with Mercurial 2.9 (Closes: bdo#741087) +- Specfile cleanup +- Use %{python_sitelib} instead of %{python_sitedir} +- Remove python dependency; let RPM handles it +- Follow debian versioning scheme +- Remove redundant %clean section + +------------------------------------------------------------------- Old: ---- fast-export-0.20110613.tar.gz hg-fast-export_20110318-2.debian.tar.gz New: ---- hg-fast-export_20140308-1.debian.tar.xz hg-fast-export_20140308.orig.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hg-fast-export.spec ++++++ --- /var/tmp/diff_new_pack.P0yVHq/_old 2015-01-20 12:38:33.000000000 +0100 +++ /var/tmp/diff_new_pack.P0yVHq/_new 2015-01-20 12:38:33.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package hg-fast-export # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products 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,13 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define short_name fast-export - -%define py_sitedir %{_prefix}/lib/python%{py_ver}/site-packages Name: hg-fast-export -Version: 0.20110613 -Release: 1 +Version: 20140308 +Release: 0 Summary: Mercurial to git converter using git-fast-import License: GPL-2.0 Group: Development/Tools/Version Control @@ -29,14 +26,14 @@ # git clone %{URL} # VERSION=`git log -n 1 --pretty=%ci | cut -d ' ' -f 1 | tr -d '-'` # tar -cjf fast-export-${VERSION}.tar.gz fast-export/ -Source0: %{short_name}-%{version}.tar.gz -Source1: http://ftp.de.debian.org/debian/pool/main/h/hg-fast-export/hg-fast-export_20110318-2.debian.tar.gz - +Source0: http://ftp.de.debian.org/debian/pool/main/h/hg-fast-export/%{name}_%{version}.orig.tar.gz +Source1: http://ftp.de.debian.org/debian/pool/main/h/hg-fast-export/%{name}_%{version}-1.debian.tar.xz +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%else BuildArch: noarch - +%endif BuildRequires: python-devel - -Requires: python Requires: git Requires: mercurial @@ -52,7 +49,7 @@ for pushing back to Mercurial. %prep -%setup -q -n %{short_name} -a 1 +%setup -q -a 1 sed --in-place 's@^ROOT=.*@ROOT="/usr/share/%{name}"@' hg-fast-export.sh hg-reset.sh sed --in-place '/^#!\/usr\/bin\/env.*/d' *.py @@ -69,16 +66,16 @@ %{__install} -m 0755 hg-reset.sh %{buildroot}/%{_bindir}/hg-reset # python lib -%{__install} -d -m 0755 %{buildroot}/%{py_sitedir} -%{__install} -m 0644 hg2git.py* %{buildroot}/%{py_sitedir} +%{__install} -d -m 0755 %{buildroot}/%{python_sitelib} +%{__install} -m 0644 hg2git.py* %{buildroot}/%{python_sitelib} # other stuff %{__install} -d -m 0755 %{buildroot}/%{_datadir}/%{name} %{__install} -m 0644 hg-fast-export.py hg-reset.py %{buildroot}/%{_datadir}/%{name}/ # compile python stuff -%py_compile %{buildroot}/%{py_sitedir} -%py_compile -O %{buildroot}/%{py_sitedir} +%py_compile %{buildroot}/%{python_sitelib} +%py_compile -O %{buildroot}/%{python_sitelib} %py_compile %{buildroot}/%{_datadir}/%{name} %py_compile -O %{buildroot}/%{_datadir}/%{name} @@ -86,17 +83,14 @@ %{__install} -d -m 0755 %{buildroot}/%{_mandir}/man1 %{__install} -m 0644 debian/*.1 %{buildroot}/%{_mandir}/man1/ -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root) -%doc hg-fast-export.txt +%doc README %doc debian/copyright debian/README.git-hg %{_bindir}/git-hg %{_bindir}/hg-fast-export %{_bindir}/hg-reset -%{py_sitedir}/hg2git.py* +%{python_sitelib}/hg2git.py* %{_datadir}/%{name} %{_mandir}/man1/*.1* -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org