diff options
author | Patrick McCarty <patrick.mccarty@linux.intel.com> | 2013-09-03 13:29:38 -0700 |
---|---|---|
committer | Patrick McCarty <patrick.mccarty@linux.intel.com> | 2013-09-03 14:47:48 -0700 |
commit | 77bcc296e7c6dc40cb2131f94d05c8281ce8e1f1 (patch) | |
tree | 05e9fee02fde00c42ca23b0ab5c2046c07101567 | |
parent | 8c6174efcffd971ba2dd87ca5cf7ab74ded9fbca (diff) | |
download | snapper-submit/tizen_3.0_common/20161104.104000.tar.gz snapper-submit/tizen_3.0_common/20161104.104000.tar.bz2 snapper-submit/tizen_3.0_common/20161104.104000.zip |
Packaging cleanupsHEADtizen_3.0_ivi_releasetizen_3.0.m2.a1_tv_releasetizen_3.0.m2.a1_mobile_releasetizen_3.0.m1_tv_releasetizen_3.0.m1_mobile_releasetizen_3.0.m14.3_ivi_releasetizen_3.0.m14.2_ivi_releasetizen_3.0.2014.q3_common_releasesubmit/tizen_mobile/20141120.000000submit/tizen_ivi_panda/20140403.012112submit/tizen_ivi_genivi/20140131.032720submit/tizen_ivi/20160217.000007submit/tizen_ivi/20160217.000000submit/tizen_common/20151026.085049submit/tizen_common/20151023.083358submit/tizen_3.0_common/20161104.104000submit/tizen/20130912.090708submit/tizen/20130912.080409submit/tizen/20130903.222219ivi_oct_m2accepted/tizen/ivi/panda/20140403.014117accepted/tizen/ivi/genivi/20140131.032959accepted/tizen/ivi/20160218.025721accepted/tizen/3.0/common/20161114.111849accepted/tizen/20130913.025100accepted/tizen/20130912.194022accepted/tizen/20130912.185828tizen_ivi_pandatizen_ivi_genivitizen_3.0_ivitizen_3.0.m2tizen_3.0.m1_tvtizen_3.0.m1_mobiletizen_3.0.m14.3_ivitizen_3.0.m14.2_ivitizen_3.0.2015.q2_commontizen_3.0.2015.q1_commontizen_3.0.2014.q4_commontizen_3.0.2014.q3_commontizenaccepted/tizen_wearableaccepted/tizen_tvaccepted/tizen_mobileaccepted/tizen_ivi_pandaaccepted/tizen_iviaccepted/tizen_genericaccepted/tizen_commonaccepted/tizen_3.0_iviaccepted/tizen_3.0_commonaccepted/tizen_3.0.m14.3_iviaccepted/tizen_3.0.2014.q3_commonaccepted/tizen/ivi/stableaccepted/tizen/ivi/genivi
- 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 <patrick.mccarty@linux.intel.com>
-rw-r--r-- | packaging/snapper.changes | 6 | ||||
-rw-r--r-- | 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 <patrick.mccarty@linux.intel.com> 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 <william.douglas@intel.com> 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 |