Hello community, here is the log from the commit of package snapper for openSUSE:Factory checked in at 2013-12-16 07:09:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/snapper (Old) and /work/SRC/openSUSE:Factory/.snapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "snapper" Changes: -------- --- /work/SRC/openSUSE:Factory/snapper/snapper.changes 2013-12-03 16:58:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.snapper.new/snapper.changes 2013-12-16 07:09:59.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Dec 13 16:10:42 CET 2013 - [email protected] + +- tag subpackages containing only Python plugins as noarch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snapper.spec ++++++ --- /var/tmp/diff_new_pack.PNij4y/_old 2013-12-16 07:10:00.000000000 +0100 +++ /var/tmp/diff_new_pack.PNij4y/_new 2013-12-16 07:10:00.000000000 +0100 @@ -174,6 +174,7 @@ %{prefix}/include/snapper %package -n snapper-zypp-plugin +BuildArch: noarch Requires: dbus-1-python Requires: python-xml Requires: snapper = %version @@ -203,6 +204,7 @@ %doc %{_mandir}/*/snapper-zypp-plugin.conf.5* %package -n grub-snapper-plugin +BuildArch: noarch Requires: python Requires: python-xattr Requires: snapper = %version ++++++ snapper-0.1.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.8/Makefile.in new/snapper-0.1.8/Makefile.in --- old/snapper-0.1.8/Makefile.in 2013-12-03 10:43:55.000000000 +0100 +++ new/snapper-0.1.8/Makefile.in 2013-12-13 16:12:19.000000000 +0100 @@ -87,7 +87,7 @@ $(top_srcdir)/configure $(am__configure_deps) \ $(srcdir)/config.h.in $(srcdir)/snapper.spec.in AUTHORS \ COPYING README config.guess config.sub depcomp install-sh \ - missing py-compile ltmain.sh + missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.8/configure new/snapper-0.1.8/configure --- old/snapper-0.1.8/configure 2013-12-03 10:43:54.000000000 +0100 +++ new/snapper-0.1.8/configure 2013-12-13 16:12:19.000000000 +0100 @@ -15034,7 +15034,6 @@ - # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.8/configure.ac new/snapper-0.1.8/configure.ac --- old/snapper-0.1.8/configure.ac 2013-12-03 10:43:34.000000000 +0100 +++ new/snapper-0.1.8/configure.ac 2013-12-04 18:12:49.000000000 +0100 @@ -19,8 +19,7 @@ AC_DISABLE_STATIC AC_PROG_CXX -AC_PROG_LIBTOOL -AM_PROG_LIBTOOL +LT_INIT AC_PREFIX_DEFAULT(/usr) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.8/data/Makefile.am new/snapper-0.1.8/data/Makefile.am --- old/snapper-0.1.8/data/Makefile.am 2013-12-03 10:43:34.000000000 +0100 +++ new/snapper-0.1.8/data/Makefile.am 2013-12-04 18:12:49.000000000 +0100 @@ -16,4 +16,7 @@ install -D -m 644 x11.txt $(DESTDIR)/etc/snapper/filters/x11.txt install -D -m 644 org.opensuse.Snapper.conf $(DESTDIR)/etc/dbus-1/system.d/org.opensuse.Snapper.conf install -D -m 644 org.opensuse.Snapper.service $(DESTDIR)/usr/share/dbus-1/system-services/org.opensuse.Snapper.service + +if HAVE_ZYPP install -D -m 644 zypp-plugin.conf $(DESTDIR)/etc/snapper/zypp-plugin.conf +endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.8/data/Makefile.in new/snapper-0.1.8/data/Makefile.in --- old/snapper-0.1.8/data/Makefile.in 2013-12-03 10:43:55.000000000 +0100 +++ new/snapper-0.1.8/data/Makefile.in 2013-12-13 16:12:19.000000000 +0100 @@ -460,7 +460,8 @@ install -D -m 644 x11.txt $(DESTDIR)/etc/snapper/filters/x11.txt install -D -m 644 org.opensuse.Snapper.conf $(DESTDIR)/etc/dbus-1/system.d/org.opensuse.Snapper.conf install -D -m 644 org.opensuse.Snapper.service $(DESTDIR)/usr/share/dbus-1/system-services/org.opensuse.Snapper.service - install -D -m 644 zypp-plugin.conf $(DESTDIR)/etc/snapper/zypp-plugin.conf + +@HAVE_ZYPP_TRUE@ install -D -m 644 zypp-plugin.conf $(DESTDIR)/etc/snapper/zypp-plugin.conf # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.8/doc/Makefile.am new/snapper-0.1.8/doc/Makefile.am --- old/snapper-0.1.8/doc/Makefile.am 2013-12-03 10:43:34.000000000 +0100 +++ new/snapper-0.1.8/doc/Makefile.am 2013-12-04 18:12:49.000000000 +0100 @@ -2,13 +2,16 @@ # Makefile.am for snapper/doc # -man_MANS = snapper.8 snapperd.8 snapper-configs.5 snapper-zypp-plugin.8 \ - snapper-zypp-plugin.conf.5 +man_MANS = snapper.8 snapperd.8 snapper-configs.5 if HAVE_PAM man_MANS += pam_snapper.8 endif +if HAVE_ZYPP +man_MANS += snapper-zypp-plugin.conf.5 snapper-zypp-plugin.8 +endif + .xml.5: .xml $(XSLTPROC) --nonet manpages.xsl $< diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.8/doc/Makefile.in new/snapper-0.1.8/doc/Makefile.in --- old/snapper-0.1.8/doc/Makefile.in 2013-12-03 10:43:55.000000000 +0100 +++ new/snapper-0.1.8/doc/Makefile.in 2013-12-13 16:12:19.000000000 +0100 @@ -82,6 +82,7 @@ build_triplet = @build@ host_triplet = @host@ @HAVE_PAM_TRUE@am__append_1 = pam_snapper.8 +@HAVE_ZYPP_TRUE@am__append_2 = snapper-zypp-plugin.conf.5 snapper-zypp-plugin.8 subdir = doc DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/snapper.xml.in $(srcdir)/snapperd.xml.in \ @@ -294,9 +295,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -man_MANS = snapper.8 snapperd.8 snapper-configs.5 \ - snapper-zypp-plugin.8 snapper-zypp-plugin.conf.5 \ - $(am__append_1) +man_MANS = snapper.8 snapperd.8 snapper-configs.5 $(am__append_1) \ + $(am__append_2) EXTRA_DIST = dbus-protocol.txt manpages.xsl html.xsl all: all-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.8/py-compile new/snapper-0.1.8/py-compile --- old/snapper-0.1.8/py-compile 2012-04-25 11:47:45.000000000 +0200 +++ new/snapper-0.1.8/py-compile 1970-01-01 01:00:00.000000000 +0100 @@ -1,146 +0,0 @@ -#!/bin/sh -# py-compile - Compile a Python program - -scriptversion=2009-04-28.21; # UTC - -# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008, 2009 Free Software -# Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <[email protected]> or send patches to -# <[email protected]>. - -if [ -z "$PYTHON" ]; then - PYTHON=python -fi - -basedir= -destdir= -files= -while test $# -ne 0; do - case "$1" in - --basedir) - basedir=$2 - if test -z "$basedir"; then - echo "$0: Missing argument to --basedir." 1>&2 - exit 1 - fi - shift - ;; - --destdir) - destdir=$2 - if test -z "$destdir"; then - echo "$0: Missing argument to --destdir." 1>&2 - exit 1 - fi - shift - ;; - -h|--h*) - cat <<\EOF -Usage: py-compile [--help] [--version] [--basedir DIR] [--destdir DIR] FILES..." - -Byte compile some python scripts FILES. Use --destdir to specify any -leading directory path to the FILES that you don't want to include in the -byte compiled file. Specify --basedir for any additional path information you -do want to be shown in the byte compiled file. - -Example: - py-compile --destdir /tmp/pkg-root --basedir /usr/share/test test.py test2.py - -Report bugs to <[email protected]>. -EOF - exit $? - ;; - -v|--v*) - echo "py-compile $scriptversion" - exit $? - ;; - *) - files="$files $1" - ;; - esac - shift -done - -if test -z "$files"; then - echo "$0: No files given. Try \`$0 --help' for more information." 1>&2 - exit 1 -fi - -# if basedir was given, then it should be prepended to filenames before -# byte compilation. -if [ -z "$basedir" ]; then - pathtrans="path = file" -else - pathtrans="path = os.path.join('$basedir', file)" -fi - -# if destdir was given, then it needs to be prepended to the filename to -# byte compile but not go into the compiled file. -if [ -z "$destdir" ]; then - filetrans="filepath = path" -else - filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)" -fi - -$PYTHON -c " -import sys, os, py_compile - -files = '''$files''' - -sys.stdout.write('Byte-compiling python modules...\n') -for file in files.split(): - $pathtrans - $filetrans - if not os.path.exists(filepath) or not (len(filepath) >= 3 - and filepath[-3:] == '.py'): - continue - sys.stdout.write(file) - sys.stdout.flush() - py_compile.compile(filepath, filepath + 'c', path) -sys.stdout.write('\n')" || exit $? - -# this will fail for python < 1.5, but that doesn't matter ... -$PYTHON -O -c " -import sys, os, py_compile - -files = '''$files''' -sys.stdout.write('Byte-compiling python modules (optimized versions) ...\n') -for file in files.split(): - $pathtrans - $filetrans - if not os.path.exists(filepath) or not (len(filepath) >= 3 - and filepath[-3:] == '.py'): - continue - sys.stdout.write(file) - sys.stdout.flush() - py_compile.compile(filepath, filepath + 'o', path) -sys.stdout.write('\n')" 2>/dev/null || : - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.8/scripts/pam_snapper_homeconvert.sh new/snapper-0.1.8/scripts/pam_snapper_homeconvert.sh --- old/snapper-0.1.8/scripts/pam_snapper_homeconvert.sh 2013-05-02 16:01:23.000000000 +0200 +++ new/snapper-0.1.8/scripts/pam_snapper_homeconvert.sh 2013-12-07 11:42:49.000000000 +0100 @@ -17,7 +17,7 @@ CMD_USERADD="useradd -m" CMD_USERDEL="userdel -r" CMD_CHOWN="chown" -CMD_CHOWN="chmod" +CMD_CHMOD="chmod" # SNAPPERCFGDIR="/etc/snapper/configs" HOMEHOME=/home diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.8/scripts/pam_snapper_useradd.sh new/snapper-0.1.8/scripts/pam_snapper_useradd.sh --- old/snapper-0.1.8/scripts/pam_snapper_useradd.sh 2013-05-02 16:01:23.000000000 +0200 +++ new/snapper-0.1.8/scripts/pam_snapper_useradd.sh 2013-12-07 11:42:49.000000000 +0100 @@ -17,7 +17,7 @@ CMD_USERADD="useradd -m" CMD_USERDEL="userdel -r" CMD_CHOWN="chown" -CMD_CHOWN="chmod" +CMD_CHMOD="chmod" # SNAPPERCFGDIR="/etc/snapper/configs" HOMEHOME=/home diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.8/snapper.spec.in new/snapper-0.1.8/snapper.spec.in --- old/snapper-0.1.8/snapper.spec.in 2013-12-03 10:43:34.000000000 +0100 +++ new/snapper-0.1.8/snapper.spec.in 2013-12-13 16:03:59.000000000 +0100 @@ -174,6 +174,7 @@ %{prefix}/include/snapper %package -n snapper-zypp-plugin +BuildArch: noarch Requires: dbus-1-python Requires: libzypp(plugin:commit) = 1 Requires: python-xml @@ -203,10 +204,13 @@ %doc %{_mandir}/*/snapper-zypp-plugin.conf.5* %package -n grub-snapper-plugin +BuildArch: noarch Requires: python Requires: python-xattr Requires: snapper = %version +%if 0%{?suse_version} Supplements: packageand(snapper-zypp-plugin:grub2) +%endif Summary: A snapper plugin for adding snapshot metadata for grub2 Group: System/Packages -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
