Accepting request 140975 from YaST:Head

- updated to latest repository

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

no-readonly.diff

@@ -1,11 +0,0 @@
---- 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.14.tar.bz2

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

snapper-0.1.1.tar.bz2

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

snapper.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Mon Nov 12 15:37:25 CET 2012 - aschnell@suse.de
+
+- reject create-config on non-thin LVM volumes
+- 0.1.1
+
+-------------------------------------------------------------------
+Thu Oct 18 15:11:49 CEST 2012 - aschnell@suse.de
+
+- .snapshots is not required to have group root if it is not
+  group-writable
+
+-------------------------------------------------------------------
+Mon Oct 15 10:40:07 CEST 2012 - aschnell@suse.de
+
+- merged dbus branch (fate #313010 and fate #313042)
+  - allows non-root user to use snapper
+  - record user id during snapshot creation
+  - run background comparisons sequential
+  - use ioctl instead of btrfs program
+  - disable ext4 support
+  - removed Python bindings
+- 0.1.0
+
 -------------------------------------------------------------------
 Wed Aug 22 18:43:47 CEST 2012 - aschnell@suse.de
 

snapper.spec

@@ -17,23 +17,25 @@
 
 
 Name:           snapper
-Version:        0.0.14
+Version:        0.1.1
 Release:        0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         snapper-%{version}.tar.bz2
-Patch1:         no-readonly.diff
 Prefix:         /usr
 BuildRequires:  boost-devel
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
 BuildRequires:  libxml2-devel
-BuildRequires:  python-devel
+%if ! 0%{?mandriva_version}
-BuildRequires:  swig
+BuildRequires:  dbus-1-devel
+%else
+BuildRequires:  libdbus-1-devel
+%endif
 %if (0%{?suse_version} && 0%{?suse_version} >= 1210)
 BuildRequires:  libzypp(plugin:commit)
 %endif
-Requires:       libsnapper1 = %version
+Requires:       libsnapper2 = %version
 %if 0%{?suse_version}
 Recommends:     cron logrotate snapper-zypp-plugin
 Supplements:    btrfsprogs
@@ -52,9 +54,6 @@ 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"
@@ -66,7 +65,7 @@ autoheader
 automake --add-missing --copy
 autoconf
 
-./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} --docdir=%{prefix}/share/doc/packages/snapper --disable-silent-rules
+./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} --docdir=%{prefix}/share/doc/packages/snapper --disable-ext4 --disable-silent-rules
 make %{?jobs:-j%jobs}
 
 %install
@@ -80,21 +79,21 @@ install -D data/sysconfig.snapper $RPM_BUILD_ROOT/etc/sysconfig/snapper
 
 %{find_lang} snapper
 
-rm -f $RPM_BUILD_ROOT/%{python_sitearch}/_libsnapper.a
-rm -f $RPM_BUILD_ROOT/%{python_sitearch}/_libsnapper.la
-
 %clean
 rm -rf "$RPM_BUILD_ROOT"
 
 %files -f snapper.lang
 %defattr(-,root,root)
 %{prefix}/bin/snapper
+%{prefix}/sbin/snapperd
 %doc %{_mandir}/*/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/snapper
 /etc/cron.hourly/suse.de-snapper
 /etc/cron.daily/suse.de-snapper
+%config /etc/dbus-1/system.d/org.opensuse.Snapper.conf
+%{prefix}/share/dbus-1/system-services/org.opensuse.Snapper.service
 
-%package -n libsnapper1
+%package -n libsnapper2
 Summary:        Library for filesystem snapshot management
 Group:          System/Libraries
 Requires:       diffutils
@@ -103,14 +102,14 @@ Requires:       util-linux
 PreReq:         %fillup_prereq
 %endif
 
-%description -n libsnapper1
+%description -n libsnapper2
 This package contains libsnapper, a library for filesystem snapshot management.
 
 Authors:
 --------
     Arvin Schnell <aschnell@suse.de>
 
-%files -n libsnapper1
+%files -n libsnapper2
 %defattr(-,root,root)
 %{_libdir}/libsnapper.so.*
 %dir %{_sysconfdir}/snapper
@@ -127,23 +126,20 @@ Authors:
 %else
 %config(noreplace) %{_sysconfdir}/sysconfig/snapper
 %endif
-%dir %{_libdir}/snapper
-%dir %{_libdir}/snapper/bin
-%{_libdir}/snapper/bin/compare-dirs
 
-%post -n libsnapper1
+%post -n libsnapper2
 /sbin/ldconfig
 %if 0%{?suse_version}
 %{fillup_only -n snapper}
 %endif
 
-%postun -n libsnapper1
+%postun -n libsnapper2
 /sbin/ldconfig
 
 %package -n libsnapper-devel
 Requires:       boost-devel
 Requires:       gcc-c++
-Requires:       libsnapper1 = %version
+Requires:       libsnapper2 = %version
 Requires:       libstdc++-devel
 Requires:       libxml2-devel
 Summary:        Header files and documentation for libsnapper
@@ -163,22 +159,6 @@ Authors:
 %{_libdir}/libsnapper.so
 %{prefix}/include/snapper
 
-%package -n libsnapper-python
-Summary:        Python bindings for libsnapper
-Group:          System/Libraries
-
-%description -n libsnapper-python
-This package contains Python bindings for libsnapper.
-
-Authors:
---------
-    Thomas Fehr <fehr@suse.de>
-
-%files -n libsnapper-python
-%defattr(-,root,root)
-%{python_sitelib}/libsnapper.py*
-%attr(755,root,root) %{python_sitearch}/_libsnapper.so
-
 %package -n snapper-zypp-plugin
 Requires:       snapper
 Requires:       zypp-plugin-python