[cfengine] Don't duplicate docs in main package and -doc (#993694).

[Ville Skyttä]

commit f8f9c89d2c76d1e7a0a9e0cb1e748bef8bc9e7c2
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Thu Dec 12 23:57:02 2013 +0200

    Don't duplicate docs in main package and -doc (#993694).
    
    - Fix bogus date and escape percents in %changelog.

 cfengine.spec |   31 +++++++++++++++++++------------
 1 files changed, 19 insertions(+), 12 deletions(-)
---
diff --git a/cfengine.spec b/cfengine.spec
index 6ca6edd..2d5e875 100644
--- a/cfengine.spec
+++ b/cfengine.spec
@@ -1,7 +1,7 @@
 Summary: A systems administration tool for networks
 Name: cfengine
 Version: 3.3.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3
 Group: Applications/System
 #Source0: http://cfengine.com/source-code/download?file=cfengine-3.3.0.tar.gz
@@ -42,7 +42,6 @@ This package contains the documentation for cfengine.
 
 %build
 %configure \
-    --docdir=%{_defaultdocdir}/%{name}-%{version} \
     --enable-fhs \
     --libexecdir=%{_libdir} \
     --enable-selinux
@@ -55,6 +54,7 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 make DESTDIR=$RPM_BUILD_ROOT install
+install -pm 644 AUTHORS $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 # It's ugly, but thats the way Mark wants to have it. :(
 # If we don't create this link, cfexecd will not be able to start
@@ -117,7 +117,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog README
+%dir %{_docdir}/%{name}
+%{_docdir}/%{name}/AUTHORS
+%{_docdir}/%{name}/ChangeLog
+%{_docdir}/%{name}/README
 %{_sbindir}/*
 %{_libdir}/%{name}
 %{_mandir}/man8/*
@@ -130,10 +133,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files doc
 %defattr(-,root,root,-)
-%{_defaultdocdir}/%{name}
+%{_docdir}/%{name}/example*
 
 
 %changelog
+* Thu Dec 12 2013 Ville Skyttä <ville.skytta at iki.fi> - 3.3.0-5
+- Don't duplicate docs in main package and -doc (#993694).
+- Fix bogus date and escape percents in %%changelog.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -326,7 +333,7 @@ rm -rf $RPM_BUILD_ROOT
 - Various spec file changes: change summary, line separators, defattr
 - Remove epoch 0
 
-* Mon Feb 27 2005 David Dorgan <davidd at micro-gravity.com> - 0:2.1.13-0
+* Sun Feb 27 2005 David Dorgan <davidd at micro-gravity.com> - 0:2.1.13-0
 - Updated to version 2.1.13
 
 * Sun Aug 15 2004 Juha Ylitalo <jylitalo at iki.fi> - 0:2.1.9-2
@@ -370,7 +377,7 @@ rm -rf $RPM_BUILD_ROOT
 - changes to version and release to apply with Fedora's Naming Guidelines
 - dropped gcc from BuildRequires
 - "2345" initlevels replaced with "-" in init.d scripts chkconfig part.
-- added chkconfig into %post and %pre for all init.d scripts
+- added chkconfig into %%post and %%pre for all init.d scripts
 
 * Wed Jun 25 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:2.0.7p3-0.fdr.1
 - new upstream version.
@@ -378,7 +385,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sun May 04 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:2.0.6-0.fdr.4
 - added init.d script for cfenvd.
 - sanity checks for cfservd and cfexecd init.d script
-- added outputs and ppkeys directories into %files list.
+- added outputs and ppkeys directories into %%files list.
 
 * Sun Apr 20 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:2.0.6-0.fdr.3
 - set Group to "System Environment/Daemons", which is valid in RPM 4.2
@@ -387,17 +394,17 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Apr 09 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:2.0.6-0.fdr.2
 - fixed URL
 - removed Requires as redundant
-- remove %{_infodir}/dir from package, if it would exist 
+- remove %%{_infodir}/dir from package, if it would exist 
   (which is not the case in RH8)
 
 * Wed Apr 09 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:2.0.6-0.fdr.1
 - upgrade from 2.0.5 to 2.0.6
-- added install-info to %post and %preun
+- added install-info to %%post and %%preun
 - added Epoch
-- changed all paths that are not hard coded into %{_sbindir}, etc.
-- changed ./configure to %configure
+- changed all paths that are not hard coded into %%{_sbindir}, etc.
+- changed ./configure to %%configure
 - changed URL to something you can cut&paste
-- simplified %files list and yet added more stuff into %doc part.
+- simplified %%files list and yet added more stuff into %%doc part.
 
 * Wed Mar 26 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:2.0.5-0.fdr.1
 - upgrade from 2.0.4 to 2.0.5