From 77bcc296e7c6dc40cb2131f94d05c8281ce8e1f1 Mon Sep 17 00:00:00 2001 From: Patrick McCarty Date: Tue, 3 Sep 2013 13:29:38 -0700 Subject: [PATCH] Packaging cleanups - Remove extra, unneeded documentation from /usr/share/doc/snapper - Use %license macro to install the license file from the build directory, not the buildroot - Fix RPM group tags Change-Id: I0fca12268d89bd1ab3bf463d0443a2e2dcf388a7 Signed-off-by: Patrick McCarty --- packaging/snapper.changes | 6 ++++++ packaging/snapper.spec | 15 ++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/packaging/snapper.changes b/packaging/snapper.changes index 4883af2..cc18328 100644 --- a/packaging/snapper.changes +++ b/packaging/snapper.changes @@ -1,3 +1,9 @@ +* Tue Sep 03 2013 Patrick McCarty e784b51 +- Remove extra, unneeded documentation from /usr/share/doc/snapper +- Use %license macro to install the license file from the build + directory, not the buildroot +- Fix RPM group tags + * Thu Aug 01 2013 William Douglas upstream/0.1.5@c470b69 - update to v1.5.0 diff --git a/packaging/snapper.spec b/packaging/snapper.spec index db1bb97..38e0fd0 100644 --- a/packaging/snapper.spec +++ b/packaging/snapper.spec @@ -33,7 +33,7 @@ Recommends: snapper-zypp-plugin Supplements: btrfs-progs Summary: Tool for filesystem snapshot management License: GPL-2.0 -Group: System/Packages +Group: System/Utilities Url: http://en.opensuse.org/Portal:Snapper %description @@ -45,7 +45,7 @@ Requires: snapper Requires: zypp-plugin-python Requires: libzypp(plugin:commit) Summary: A zypp commit plugin for calling snapper -Group: System/Packages +Group: System/Utilities %description -n snapper-zypp-plugin This package contains a plugin for zypp that makes filesystem snapshots with @@ -59,7 +59,7 @@ Requires: libsnapper = %version Requires: libstdc++-devel Requires: libxml2-devel Summary: Header files and documentation for libsnapper -Group: Development/Languages/C and C++ +Group: System/Development %description -n libsnapper-devel This package contains header files and documentation for developing with @@ -83,7 +83,7 @@ cp %{SOURCE1001} . export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -%reconfigure --docdir=%{_prefix}/share/doc/packages/snapper --disable-ext4 --disable-silent-rules --disable-pam +%reconfigure --disable-ext4 --disable-silent-rules --disable-pam make %{?jobs:-j%jobs} %install @@ -107,6 +107,8 @@ sed -i 's|SNAPPER_CONFIGS=""|SNAPPER_CONFIGS="root"|' $RPM_BUILD_ROOT/etc/syscon %install_service multi-user.target.wants snapper-hourly.timer %install_service multi-user.target.wants snapper-daily.timer +rm -rf %{buildroot}%{_datadir}/doc/snapper + %{find_lang} snapper %post -n libsnapper -p /sbin/ldconfig @@ -119,6 +121,7 @@ sed -i 's|SNAPPER_CONFIGS=""|SNAPPER_CONFIGS="root"|' $RPM_BUILD_ROOT/etc/syscon %files %manifest %{name}.manifest %defattr(-,root,root) +%license COPYING %{_prefix}/bin/snapper %{_prefix}/sbin/snapperd %{_prefix}/sbin/snapper-hourly @@ -135,6 +138,7 @@ sed -i 's|SNAPPER_CONFIGS=""|SNAPPER_CONFIGS="root"|' $RPM_BUILD_ROOT/etc/syscon %files -n libsnapper %manifest %{name}.manifest %defattr(-,root,root) +%license COPYING %{_libdir}/libsnapper.so.* %dir %{_sysconfdir}/snapper %dir %{_sysconfdir}/snapper/configs @@ -143,9 +147,6 @@ sed -i 's|SNAPPER_CONFIGS=""|SNAPPER_CONFIGS="root"|' $RPM_BUILD_ROOT/etc/syscon %config(noreplace) %{_sysconfdir}/snapper/config-templates/default %dir %{_sysconfdir}/snapper/filters %config(noreplace) %{_sysconfdir}/snapper/filters/*.txt -%doc %dir %{_prefix}/share/doc/packages/snapper -%doc %{_prefix}/share/doc/packages/snapper/AUTHORS -%license %{_prefix}/share/doc/packages/snapper/COPYING %config(noreplace) %{_sysconfdir}/sysconfig/snapper %files -n libsnapper-devel -- 2.7.4