Hello community, here is the log from the commit of package zeroinstall-injector for openSUSE:Factory checked in at 2012-08-05 15:24:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zeroinstall-injector (Old) and /work/SRC/openSUSE:Factory/.zeroinstall-injector.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zeroinstall-injector", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/zeroinstall-injector/zeroinstall-injector.changes 2012-06-28 17:24:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.zeroinstall-injector.new/zeroinstall-injector.changes 2012-08-05 15:24:48.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Aug 3 09:01:36 UTC 2012 - talex5@gmail.com + +- Updated to 1.10. For a list of changes see: + http://thread.gmane.org/gmane.comp.file-systems.zero-install.devel/6109 +- Python 3 libraries are now also installed, although the commands still + default to using Python 2. + +------------------------------------------------------------------- Old: ---- zeroinstall-injector-1.9.tar.bz2 New: ---- zeroinstall-injector-1.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zeroinstall-injector.spec ++++++ --- /var/tmp/diff_new_pack.KmxboS/_old 2012-08-05 15:24:50.000000000 +0200 +++ /var/tmp/diff_new_pack.KmxboS/_new 2012-08-05 15:24:50.000000000 +0200 @@ -20,10 +20,15 @@ %define cache_dir /var/cache/0install.net +%if 0%{?suse_version} +%define use_python3 1 +%define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") +%endif + Name: zeroinstall-injector -Version: 1.9 +Version: 1.10 Release: 0 -%define source_version 1.9 +%define source_version 1.10 Summary: Decentralised cross-distribution software installation License: LGPL-2.1+ Group: System/Management @@ -35,6 +40,11 @@ BuildArch: noarch BuildRequires: gnupg BuildRequires: python-devel +%if 0%{?use_python3} +BuildRequires: fdupes +BuildRequires: python3 +BuildRequires: python3-gobject +%endif Requires: binutils Requires: gnupg @@ -88,12 +98,25 @@ %build python setup.py build +%if 0%{?use_python3} +# (avoids error about missing build/scripts-3.2 directory) +python3 setup.py build +%endif %check #(cd tests && python ./testall.py) %install -python setup.py install --skip-build --prefix=/usr --root $RPM_BUILD_ROOT +# Make Python3 libraries available, but (for now) use Python 2 as the default +# for the commands. +%if 0%{?use_python3} +python3 setup.py install --skip-build --prefix=/usr --root $RPM_BUILD_ROOT +%endif +python setup.py install --skip-build --force --prefix=/usr --root $RPM_BUILD_ROOT +%if 0%{?use_python3} +%fdupes -s %{buildroot} +rm -f $RPM_BUILD_ROOT/%{python3_sitelib}/*.egg-info +%endif mv "$RPM_BUILD_ROOT/usr/man" "$RPM_BUILD_ROOT%{_datadir}/man" rm -f $RPM_BUILD_ROOT/%{python_sitelib}/*.egg-info mkdir -p "$RPM_BUILD_ROOT%{cache_dir}/implementations" @@ -111,6 +134,9 @@ %doc COPYING README %{_bindir}/0* %{python_sitelib}/zeroinstall +%if 0%{?use_python3} +%{python3_sitelib}/zeroinstall +%endif %{_mandir}/man1/0* %{_datadir}/applications/zeroinstall-add.desktop %{_datadir}/applications/zeroinstall-manage.desktop @@ -128,6 +154,7 @@ # This is not used by default, but is required if you want to # set up sharing of downloads later. /usr/sbin/useradd -c 'Zero Install shared cache' \ - -s /sbin/nologin -r -d '/' zeroinst 2> /dev/null || : + -s /sbin/nologin -r -d '%{cache_dir}' zeroinst 2> /dev/null || : +/usr/sbin/groupadd -r zeroinst 2> /dev/null || : %changelog ++++++ zeroinstall-injector-1.9.tar.bz2 -> zeroinstall-injector-1.10.tar.bz2 ++++++ ++++ 7889 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org