Hello community,
here is the log from the commit of package snapper for openSUSE:12.1:Update:Test checked in at 2011-11-17 22:30:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1:Update:Test/snapper (Old)
and /work/SRC/openSUSE:12.1:Update:Test/.snapper.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "snapper", Maintainer is "ASchnell@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:12.1:Update:Test/snapper/snapper.changes 2011-11-17 22:30:05.000000000 +0100
+++ /work/SRC/openSUSE:12.1:Update:Test/.snapper.new/snapper.changes 2011-11-17 22:30:06.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Nov 11 11:20:03 CET 2011 - aschnell@suse.de
+
+- moved supplements btrfsprogs from libsnapper to snapper
+ (bnc#729859)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ snapper.spec ++++++
--- /var/tmp/diff_new_pack.LuOGgC/_old 2011-11-17 22:30:09.000000000 +0100
+++ /var/tmp/diff_new_pack.LuOGgC/_new 2011-11-17 22:30:09.000000000 +0100
@@ -26,10 +26,11 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: snapper-%{version}.tar.bz2
Prefix: /usr
-BuildRequires: boost-devel doxygen gcc-c++ libblocxx-devel libxml2-devel
+BuildRequires: gcc-c++ boost-devel libblocxx-devel libxml2-devel doxygen
BuildRequires: libzypp(plugin:commit)
Requires: libsnapper1 = %version
Recommends: cron logrotate snapper-zypp-plugin
+Supplements: btrfsprogs
Summary: Tool for filesystem snapshot management
Url: http://en.opensuse.org/Portal:Snapper
@@ -78,7 +79,6 @@
Group: System/Libraries
Requires: diffutils util-linux
PreReq: %fillup_prereq
-Supplements: btrfsprogs
%description -n libsnapper1
This package contains libsnapper, a library for filesystem snapshot management.
++++++ snapper-0.0.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.7/Makefile.in new/snapper-0.0.7/Makefile.in
--- old/snapper-0.0.7/Makefile.in 2011-10-21 12:25:58.000000000 +0200
+++ new/snapper-0.0.7/Makefile.in 2011-11-17 16:24:07.000000000 +0100
@@ -43,7 +43,7 @@
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/snapper.spec.in $(top_srcdir)/configure AUTHORS \
COPYING config.guess config.sub depcomp install-sh ltmain.sh \
- missing py-compile
+ missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.7/py-compile new/snapper-0.0.7/py-compile
--- old/snapper-0.0.7/py-compile 2011-10-07 12:06:40.000000000 +0200
+++ new/snapper-0.0.7/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 or send patches to
-# .
-
-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 .
-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.0.7/snapper.spec.in new/snapper-0.0.7/snapper.spec.in
--- old/snapper-0.0.7/snapper.spec.in 2011-09-22 14:26:57.000000000 +0200
+++ new/snapper-0.0.7/snapper.spec.in 2011-11-17 16:22:51.000000000 +0100
@@ -1,8 +1,23 @@
#
-# spec file for package snapper (Version @VERSION@)
+# spec file for package snapper
#
+# Copyright (c) 2011 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
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
# norootforbuild
+
Name: snapper
Version: @VERSION@
Release: 0
@@ -15,6 +30,7 @@
BuildRequires: libzypp(plugin:commit)
Requires: libsnapper@LIBVERSION_MAJOR@ = %version
Recommends: cron logrotate snapper-zypp-plugin
+Supplements: btrfsprogs
Summary: Tool for filesystem snapshot management
Url: http://en.opensuse.org/Portal:Snapper
@@ -63,7 +79,6 @@
Group: System/Libraries
Requires: diffutils util-linux
PreReq: %fillup_prereq
-Supplements: btrfsprogs
%description -n libsnapper@LIBVERSION_MAJOR@
This package contains libsnapper, a library for filesystem snapshot management.
@@ -132,3 +147,5 @@
%files -n snapper-zypp-plugin
%defattr(-,root,root)
/usr/lib/zypp/plugins/commit/snapper.py
+
+%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org