From ea0c89dd901e5ffd615644f97bb8a85bb5354a4b22605a4b76f916ac3f382620 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 26 Apr 2014 09:45:01 +0000 Subject: [PATCH] Accepting request 230480 from YaST:Head - updated to latest repository OBS-URL: https://build.opensuse.org/request/show/230480 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/snapper?expand=0&rev=57 --- snapper-0.2.1.tar.bz2 | 3 --- snapper-0.2.2.tar.bz2 | 3 +++ snapper.changes | 33 +++++++++++++++++++++++++++------ snapper.spec | 17 ++++++++++++++++- 4 files changed, 46 insertions(+), 10 deletions(-) delete mode 100644 snapper-0.2.1.tar.bz2 create mode 100644 snapper-0.2.2.tar.bz2 diff --git a/snapper-0.2.1.tar.bz2 b/snapper-0.2.1.tar.bz2 deleted file mode 100644 index 2a2b37e..0000000 --- a/snapper-0.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1fccffed6b025f3ca687b2d03f9e099b5ecaafc3d865c84989613c28c043dcd5 -size 439860 diff --git a/snapper-0.2.2.tar.bz2 b/snapper-0.2.2.tar.bz2 new file mode 100644 index 0000000..e975616 --- /dev/null +++ b/snapper-0.2.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b3de69b44e38c548ca5c58e8e9db3b6a70f62963aeb6b4cdf92e735f6c70fbd +size 446525 diff --git a/snapper.changes b/snapper.changes index 54a1d31..6aba061 100644 --- a/snapper.changes +++ b/snapper.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Thu Apr 17 15:00:25 CEST 2014 - aschnell@suse.de + +- fixed parent of snapshot generated by rollback + +------------------------------------------------------------------- +Thu Apr 10 10:17:49 CEST 2014 - aschnell@suse.de + +- added rollback support (fate#317062) +- version 0.2.2 + +------------------------------------------------------------------- +Thu Apr 03 17:49:12 CEST 2014 - aschnell@suse.de + +- fixed execution of grub plugin (bnc#871880) + +------------------------------------------------------------------- +Tue Apr 01 20:04:33 CEST 2014 - aschnell@suse.de + +- allow to add snapshots subvolume to fstab (for fate#317062) + ------------------------------------------------------------------- Mon Mar 03 17:20:41 CET 2014 - aschnell@suse.de @@ -27,14 +48,14 @@ Tue Feb 11 14:08:06 CET 2014 - aschnell@suse.de Wed Feb 05 10:50:25 CET 2014 - aschnell@suse.de - fixed execution of grub scripts -- 0.2.1 +- version 0.2.1 ------------------------------------------------------------------- Wed Jan 29 11:09:45 CET 2014 - aschnell@suse.de - allow to sync ALLOW_USERS and ALLOW_GROUPS to ACL of .snapshots directory (see bnc#860116) -- 0.2.0 +- version 0.2.0 ------------------------------------------------------------------- Fri Jan 24 10:01:35 CET 2014 - aschnell@suse.de @@ -51,7 +72,7 @@ Mon Nov 25 11:38:43 CET 2013 - aschnell@suse.de - allow to configure snapshotting from zypp-plugin depending on package list (fate#316203) -- 0.1.8 +- version 0.1.8 ------------------------------------------------------------------- Mon Oct 21 10:24:43 CEST 2013 - aschnell@suse.de @@ -74,7 +95,7 @@ Tue Oct 15 16:28:15 CEST 2013 - aschnell@suse.de Tue Oct 01 15:46:19 CEST 2013 - aschnell@suse.de - restrict permissions on .snapshots subvolume (bnc#843219) -- 0.1.7 +- version 0.1.7 ------------------------------------------------------------------- Mon Sep 30 14:20:22 CEST 2013 - aschnell@suse.de @@ -85,7 +106,7 @@ Mon Sep 30 14:20:22 CEST 2013 - aschnell@suse.de Fri Sep 06 16:02:47 CEST 2013 - aschnell@suse.de - added option --no-dbus to snapper tool -- 0.1.6 +- version 0.1.6 ------------------------------------------------------------------- Thu Jul 25 14:40:31 CEST 2013 - aschnell@suse.de @@ -98,7 +119,7 @@ Tue Jul 09 14:00:16 CEST 2013 - aschnell@suse.de - added manpage describing snapper configs - optimize timeline cleanup algorithm for only sporadic running systems -- 0.1.5 +- version 0.1.5 ------------------------------------------------------------------- Mon Jul 08 16:18:10 CEST 2013 - aschnell@suse.de diff --git a/snapper.spec b/snapper.spec index 3968dfb..50df331 100644 --- a/snapper.spec +++ b/snapper.spec @@ -17,7 +17,7 @@ Name: snapper -Version: 0.2.1 +Version: 0.2.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: snapper-%{version}.tar.bz2 @@ -27,6 +27,12 @@ BuildRequires: gcc-c++ BuildRequires: libacl-devel BuildRequires: libtool BuildRequires: libxml2-devel +%if 0%{?suse_version} > 1230 +BuildRequires: libbtrfs-devel +%endif +%if 0%{?suse_version} > 1310 +BuildRequires: libmount-devel >= 2.24 +%endif BuildRequires: pkg-config %if ! 0%{?mandriva_version} BuildRequires: dbus-1-devel @@ -75,6 +81,9 @@ autoconf ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} \ --docdir=%{prefix}/share/doc/packages/snapper \ +%if 0%{?suse_version} <= 1310 + --disable-rollback \ +%endif --disable-silent-rules --disable-ext4 make %{?jobs:-j%jobs} @@ -160,6 +169,12 @@ Requires: libacl-devel Requires: libsnapper2 = %version Requires: libstdc++-devel Requires: libxml2-devel +%if 0%{?suse_version} > 1230 +Requires: libbtrfs-devel +%endif +%if 0%{?suse_version} > 1310 +Requires: libmount-devel >= 2.24 +%endif Summary: Header files and documentation for libsnapper Group: Development/Languages/C and C++