[snapper] - update to latest upstream - various specfile fixes
okozina
okozina at fedoraproject.org
Mon Jul 29 15:29:19 UTC 2013
commit 60a9bf21184d8364aed9cbc369aaf6a79a110a52
Author: Ondrej Kozina <okozina at redhat.com>
Date: Mon Jul 29 17:27:54 2013 +0200
- update to latest upstream
- various specfile fixes
.gitignore | 1 +
snapper-boost-mt.patch | 13 ++++------
snapper-remove-ext4-info-xml.patch | 22 +++++++++++++++++
snapper-remove-ext4-info.patch | 22 -----------------
snapper-rename-cron-files.patch | 10 +++----
snapper-securelibdir.patch | 11 ++++++++
snapper.spec | 46 +++++++++++++++++++++++++++--------
sources | 2 +-
8 files changed, 79 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index de08d27..02e096a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/snapper-0.1.0.tar.bz2
/snapper-0.1.2.tar.bz2
/snapper-0.1.3.tar.bz2
+/snapper-0.1.5.tar.gz
diff --git a/snapper-boost-mt.patch b/snapper-boost-mt.patch
index 272470c..29cae07 100644
--- a/snapper-boost-mt.patch
+++ b/snapper-boost-mt.patch
@@ -1,14 +1,11 @@
-diff -up snapper-0.1.3/snapper/Makefile.am\~ snapper-0.1.3/snapper/Makefile.am
---- snapper-0.1.3/snapper/Makefile.am~ 2013-04-26 12:21:53.000000000 +0200
-+++ snapper-0.1.3/snapper/Makefile.am 2013-07-28 00:15:33.023069583 +0200
-@@ -54,7 +54,7 @@ endif
+--- a/snapper/Makefile.am 2013-07-12 10:47:19.000000000 +0200
++++ b/snapper/Makefile.am 2013-07-29 12:58:29.570736991 +0200
+@@ -53,7 +53,7 @@ endif
libsnapper_la_LDFLAGS = -version-info @LIBVERSION_INFO@
--libsnapper_la_LIBADD = -lboost_thread-mt -lxml2 -lz -lm
-+libsnapper_la_LIBADD = -lboost_thread -lxml2 -lz -lm
+-libsnapper_la_LIBADD = -lboost_thread-mt -lboost_system-mt -lxml2 -lz -lm
++libsnapper_la_LIBADD = -lboost_thread -lboost_system -lxml2 -lz -lm
pkgincludedir = $(includedir)/snapper
-
-Diff finished. Sun Jul 28 00:15:51 2013
diff --git a/snapper-remove-ext4-info-xml.patch b/snapper-remove-ext4-info-xml.patch
new file mode 100644
index 0000000..1262427
--- /dev/null
+++ b/snapper-remove-ext4-info-xml.patch
@@ -0,0 +1,22 @@
+--- a/doc/snapper.xml.in 2013-07-12 10:47:19.000000000 +0200
++++ b/doc/snapper.xml.in 2013-07-29 12:43:31.582526830 +0200
+@@ -39,9 +39,7 @@
+
+ <para>Snapper never modifies the content of snapshots. Thus snapper creates
+ read-only snapshots if supported by the kernel. Supported filesystems are
+- btrfs and ext4 as well as snapshots of LVM logical volumes with
+- thin-provisioning. Some filesystems might not be supported depending on your
+- installation.</para>
++ btrfs as well as snapshots of LVM logical volumes with thin-provisioning.</para>
+ </refsect1>
+
+ <refsect1 id='concepts'>
+@@ -235,7 +233,7 @@
+ <varlistentry>
+ <term><option>-f, --fstype</option> <replaceable>fstype</replaceable></term>
+ <listitem>
+- <para>Manually set filesystem type. Supported values are btrfs, ext4 and lvm. For
++ <para>Manually set filesystem type. Supported values are btrfs and lvm. For
+ lvm, snapper uses LVM thin-provisioned snapshots. The filesystem type on top of
+ LVM must be provided in parentheses, e.g. lvm(xfs).</para>
+ <para>Without this option snapper tries to detect the filesystem.</para>
diff --git a/snapper-rename-cron-files.patch b/snapper-rename-cron-files.patch
index 9faee22..8d22fcf 100644
--- a/snapper-rename-cron-files.patch
+++ b/snapper-rename-cron-files.patch
@@ -1,9 +1,7 @@
-diff --git a/scripts/Makefile.am b/scripts/Makefile.am
-index 3fcc081..8d014d3 100644
---- a/scripts/Makefile.am
-+++ b/scripts/Makefile.am
-@@ -5,8 +5,8 @@
- EXTRA_DIST = snapper-hourly snapper-daily zypp-plugin.py
+--- a/scripts/Makefile.am 2013-07-12 10:47:19.000000000 +0200
++++ b/scripts/Makefile.am 2013-07-29 12:49:49.505908078 +0200
+@@ -17,8 +17,8 @@ endif
+ EXTRA_DIST = snapper-hourly snapper-daily zypp-plugin.py $(pam_snapper_SCRIPTS)
install-data-local:
- install -D snapper-hourly $(DESTDIR)/etc/cron.hourly/suse.de-snapper
diff --git a/snapper-securelibdir.patch b/snapper-securelibdir.patch
new file mode 100644
index 0000000..701102c
--- /dev/null
+++ b/snapper-securelibdir.patch
@@ -0,0 +1,11 @@
+--- a/pam/Makefile.am 2013-07-12 10:47:19.000000000 +0200
++++ a/pam/Makefile.am 2013-07-29 14:42:37.633082979 +0200
+@@ -8,7 +8,7 @@ AM_CFLAGS = -D_GNU_SOURCE
+
+ INCLUDES = -I$(top_srcdir) $(DBUS_CFLAGS)
+
+-securelibdir = $(shell echo /`basename $(libdir)`/security)
++securelibdir = $(libdir)/security
+
+ securelib_LTLIBRARIES = pam_snapper.la
+
diff --git a/snapper.spec b/snapper.spec
index b5b0eee..2cfbd27 100644
--- a/snapper.spec
+++ b/snapper.spec
@@ -1,22 +1,20 @@
Name: snapper
-Version: 0.1.3
-Release: 2.20130426git35ff4ec%{?dist}
+Version: 0.1.5
+Release: 1%{?dist}
License: GPLv2
Group: Applications/System
-BuildRequires: boost-devel doxygen gettext libtool libxml2-devel
-BuildRequires: dbus-devel
+BuildRequires: boost-devel gettext libtool libxml2-devel dbus-devel
+BuildRequires: pam-devel libxslt docbook-style-xsl
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: diffutils
Summary: Tool for filesystem snapshot management
Url: http://en.opensuse.org/Portal:Snapper
-# source tarball creation process from master branch:
-# git clone git://github.com/openSUSE/snapper.git
-# git archive --format=tar --prefix=snapper-0.1.3/ 35ff4eca49393b033a7cbaf76479addeb6c77a8d | bzip2 > /tmp/snapper-0.1.3.tar.bz2
-Source0: %{name}-%{version}.tar.bz2
-patch0: %{name}-remove-ext4-info.patch
+Source0: https://github.com/openSUSE/snapper/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+patch0: %{name}-remove-ext4-info-xml.patch
patch1: %{name}-rename-cron-files.patch
patch2: %{name}-boost-mt.patch
+patch3: %{name}-securelibdir.patch
%description
This package contains snapper, a tool for filesystem snapshot management.
@@ -40,11 +38,20 @@ Summary: Header files and documentation for libsnapper
This package contains header files and documentation for developing with
snapper.
+%package -n pam_snapper
+Requires: %{name}%{?_isa} = %version-%{release}
+Requires: pam%{?_isa}
+Summary: PAM module for calling snapper
+
+%description -n pam_snapper
+A PAM module for calling snapper during user login and logout.
+
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
aclocal
@@ -54,7 +61,7 @@ automake --add-missing --copy
autoconf
# NOTE: --disable-ext4 option removes support for ext4 internal snapshots since the feature
# never made it into upstream kernel
-%configure --disable-silent-rules --disable-ext4 --docdir=%{_defaultdocdir}/%{name}-%{version} --disable-zypp --enable-xattrs
+%configure --disable-silent-rules --disable-ext4 --disable-zypp --enable-xattrs
#NOTE: avoid 'unused-direct-shlib-dependency' warning in rpmlint checks
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
make %{?_smp_mflags}
@@ -64,6 +71,7 @@ make install DESTDIR=%{buildroot}
install -m644 -D data/sysconfig.snapper %{buildroot}%{_sysconfdir}/sysconfig/%{name}
%{find_lang} %{name}
rm -f %{buildroot}/%{_libdir}/*.la
+rm -f %{buildroot}/%{_libdir}/security/*.la
%post libs -p /sbin/ldconfig
@@ -80,6 +88,7 @@ rm -f %{buildroot}/%{_libdir}/*.la
%doc AUTHORS
%{_mandir}/man8/%{name}.8*
%{_mandir}/man8/snapperd.8*
+%{_mandir}/man5/snapper-configs.5*
%files libs
%{_libdir}/libsnapper.so.*
@@ -93,11 +102,26 @@ rm -f %{buildroot}/%{_libdir}/*.la
%doc AUTHORS COPYING
%files devel
-%doc examples/*.cc
+%doc examples/c/*.c
+%doc examples/c++-lib/*.cc
%{_libdir}/libsnapper.so
%{_includedir}/%{name}
+%files -n pam_snapper
+#%defattr(-,root,root)
+%{_libdir}/security/pam_snapper.so
+%dir %{_prefix}/lib/pam_snapper
+%{_prefix}/lib/pam_snapper/*.sh
+%doc %{_mandir}/*/pam_snapper*.*
+
%changelog
+* Mon Jul 29 2013 Ondrej Kozina <okozina at redhat.com> - 0.1.5-1
+- updated to latest upstream
+- allow whitespace in ALLOW_USERS and ALLOW_GROUPS
+- enable new pam module
+- modified specfile to reflect recent change in %doc macro (no more version suffix)
+- patch: pam module installed in proper libdir
+
* Sat Jul 27 2013 Petr Machata <pmachata at redhat.com> - 0.1.3-2.20130426git35ff4ec
- rebuild for boost 1.54.0
- Boost.Thread DSO does not include -mt suffix anymore (snapper-boost-mt.patch)
diff --git a/sources b/sources
index ae16704..10763b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b033115f16f3ba54010845a90e009191 snapper-0.1.3.tar.bz2
+12e00ca9959333b5dba854a7c9c7e0b0 snapper-0.1.5.tar.gz
More information about the scm-commits
mailing list