[pm-utils] Rearranged the included documentation
Jaroslav Škarvada
jskarvad at fedoraproject.org
Thu Dec 15 15:19:35 UTC 2011
commit e8ade396df2804f03ae093207acf48ade5a1c936
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date: Thu Dec 15 16:19:35 2011 +0100
Rearranged the included documentation
pm-utils.spec | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/pm-utils.spec b/pm-utils.spec
index b163177..8571636 100644
--- a/pm-utils.spec
+++ b/pm-utils.spec
@@ -3,7 +3,7 @@ Name: pm-utils
Summary: Power management utilities and scripts for Fedora
License: GPLv2
Version: 1.4.1
-Release: 14%{?dist}
+Release: 15%{?dist}
Group: System Environment/Base
URL: http://pm-utils.freedesktop.org
%ifnarch s390 s390x
@@ -54,7 +54,7 @@ tar -xzf %{SOURCE1}
%patch4 -p1 -b .log-line-spacing-fix
%build
-%configure
+%configure --docdir=%{_docdir}/%{name}-%{version}
make
%install
@@ -72,6 +72,9 @@ cp -r video-quirks $RPM_BUILD_ROOT%{_libdir}/pm-utils
# These break more than they helps, so drop them for now
rm $RPM_BUILD_ROOT%{_libdir}/pm-utils/power.d/*
+# Install extra documentation
+cp -p COPYING AUTHORS ChangeLog $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
+
%preun
# Clean storage to prevent left-behind files. These files are dynamically
# created in runtime (also with dynamic names), thus it is hard to track
@@ -80,7 +83,7 @@ rm -rf %{_localstatedir}/run/pm-utils/{pm-suspend,pm-powersave}/storage/*
%files
%defattr(-,root,root,-)
-%doc README COPYING AUTHORS ChangeLog
+%{_docdir}/%{name}-%{version}
%{_libdir}/pm-utils/bin/
%{_libdir}/pm-utils/defaults
%{_libdir}/pm-utils/functions
@@ -98,8 +101,6 @@ rm -rf %{_localstatedir}/run/pm-utils/{pm-suspend,pm-powersave}/storage/*
%{_mandir}/man8/*.8.gz
%ghost %{_localstatedir}/run/pm-utils
%{_libdir}/pm-utils/video-quirks
-%dir %{_datadir}/doc/pm-utils
-%doc %{_datadir}/doc/pm-utils/*
# no logrotate needed, because only one run of pm-utils is stored
# in the logfile
@@ -110,6 +111,9 @@ rm -rf %{_localstatedir}/run/pm-utils/{pm-suspend,pm-powersave}/storage/*
%{_libdir}/pkgconfig/pm-utils.pc
%changelog
+* Thu Dec 15 2011 Robin Lee <cheeselee at fedoraproject.org> - 1.4.1-15
+- Rearranged the included documentation
+
* Wed Nov 30 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 1.4.1-14
- Removed restorecon hack from init_logfile, it is now correctly handled by selinux
More information about the scm-commits
mailing list