Accepting request 109492 from YaST:Head

- updated to latest repository

OBS-URL: https://build.opensuse.org/request/show/109492
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/snapper?expand=0&rev=24

no-readonly.diff

@@ -0,0 +1,11 @@
+--- snapper/Filesystem.cc
++++ snapper/Filesystem.cc
+@@ -96,7 +96,7 @@
+     void
+     Btrfs::createSnapshot(unsigned int num) const
+     {
+-	SystemCmd cmd(BTRFSBIN " subvolume snapshot -r " + quote(subvolume) + " " +
++	SystemCmd cmd(BTRFSBIN " subvolume snapshot " + quote(subvolume) + " " +
+ 		      quote(snapshotDir(num)));
+ 	if (cmd.retcode() != 0)
+ 	    throw CreateSnapshotFailedException();

snapper-0.0.10.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:babf03dd6506a07a00fc48a61d5fe5a283fe8416cdcd63e73a53952686a710bc
+size 341804

snapper-0.0.8.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:950456deea9aa6f17bb6bf5e1f3e017c1f8edc79f4211bc81604c98074ba2d46
-size 341658

snapper.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Thu Mar 15 10:56:40 CET 2012 - aschnell@suse.de
+
+- added missing includes for gcc 4.7
+
+-------------------------------------------------------------------
+Tue Mar 06 11:37:34 CET 2012 - aschnell@suse.de
+
+- allow to disable background comparison (bnc#726122)
+- 0.0.10
+
+-------------------------------------------------------------------
+Fri Mar 02 16:25:26 CET 2012 - aschnell@suse.de
+
+- added option --command to snapper create
+- 0.0.9
+
+-------------------------------------------------------------------
+Fri Feb 24 19:21:15 CET 2012 - aschnell@suse.de
+
+- allow to compile without blocxx
+
 -------------------------------------------------------------------
 Fri Dec 23 15:33:12 CET 2011 - aschnell@suse.de
 

snapper.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package snapper
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -18,19 +18,27 @@
 
 
 Name:           snapper
-Version:        0.0.8
+Version:        0.0.10
 Release:        0
 License:        GPL-2.0
 Group:          System/Packages
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         snapper-%{version}.tar.bz2
+Patch1:         no-readonly.diff
 Prefix:         /usr
-BuildRequires:  boost-devel doxygen gcc-c++ libblocxx-devel libtool libxml2-devel
+BuildRequires:  boost-devel doxygen gcc-c++ libtool libxml2-devel
 BuildRequires:  python-devel swig
+%if 0%{?suse_version}
+BuildRequires:  libblocxx-devel
+%if 0%{?suse_version} >= 1210
 BuildRequires:  libzypp(plugin:commit)
+%endif
+%endif
 Requires:       libsnapper1 = %version
+%if 0%{?suse_version}
 Recommends:     cron logrotate snapper-zypp-plugin
 Supplements:    btrfsprogs
+%endif
 Summary:        Tool for filesystem snapshot management
 Url:            http://en.opensuse.org/Portal:Snapper
 
@@ -43,6 +51,9 @@ Authors:
 
 %prep
 %setup -n snapper-%{version}
+%if (0%{?suse_version} && 0%{?suse_version} < 1210) || (0%{?fedora} && 0%{?fedora} < 17) || (0%{?rhel_version} && 0%{?rhel_version} < 700) || (0%{?centos_version} && 0%{?centos_version} < 700) || (0%{?mdkversion} && 0%{?mdkversion} < 201200)
+%patch1
+%endif
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
@@ -60,6 +71,12 @@ make %{?jobs:-j%jobs}
 %install
 make install DESTDIR="$RPM_BUILD_ROOT"
 
+%if 0%{?suse_version}
+install -D data/sysconfig.snapper $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.snapper
+%else
+install -D data/sysconfig.snapper $RPM_BUILD_ROOT/etc/sysconfig/snapper
+%endif
+
 %{find_lang} snapper
 
 rm -f $RPM_BUILD_ROOT/%{python_sitearch}/_libsnapper.a
@@ -80,7 +97,9 @@ rm -rf "$RPM_BUILD_ROOT"
 Summary:        Library for filesystem snapshot management
 Group:          System/Libraries
 Requires:       diffutils util-linux
+%if 0%{?suse_version}
 PreReq:         %fillup_prereq
+%endif
 
 %description -n libsnapper1
 This package contains libsnapper, a library for filesystem snapshot management.
@@ -101,21 +120,30 @@ Authors:
 %doc %dir %{prefix}/share/doc/packages/snapper
 %doc %{prefix}/share/doc/packages/snapper/AUTHORS
 %doc %{prefix}/share/doc/packages/snapper/COPYING
+%if 0%{?suse_version}
 /var/adm/fillup-templates/sysconfig.snapper
+%else
+%config(noreplace) %{_sysconfdir}/sysconfig/snapper
+%endif
 %dir %{prefix}/lib/snapper
 %dir %{prefix}/lib/snapper/bin
 %{prefix}/lib/snapper/bin/compare-dirs
 
 %post -n libsnapper1
 /sbin/ldconfig
+%if 0%{?suse_version}
 %{fillup_only -n snapper}
+%endif
 
 %postun -n libsnapper1
 /sbin/ldconfig
 
 %package -n libsnapper-devel
 Requires:       libsnapper1 = %version
-Requires:       gcc-c++ libstdc++-devel boost-devel blocxx-devel libxml2-devel
+Requires:       gcc-c++ libstdc++-devel boost-devel libxml2-devel
+%if 0%{?suse_version}
+Requires:       blocxx-devel
+%endif
 Summary:        Header files and documentation for libsnapper
 Group:          Development/Languages/C and C++
 
@@ -164,6 +192,11 @@ Authors:
 
 %files -n snapper-zypp-plugin
 %defattr(-,root,root)
+%if 0%{?suse_version} < 1210
+%dir /usr/lib/zypp
+%dir /usr/lib/zypp/plugins
+%dir /usr/lib/zypp/plugins/commit
+%endif
 /usr/lib/zypp/plugins/commit/snapper.py
 
 %changelog