[bcfg2: 5/16] reconcile: Don't copy docs into buildroot

John Morris zultron at fedoraproject.org
Sat Nov 23 20:58:53 UTC 2013


commit cfd2b64110dc0e39f363f5b3ee888c0c4ba7d9b5
Author: John Morris <john at zultron.com>
Date:   Mon Aug 5 10:29:36 2013 -0500

    reconcile:  Don't copy docs into buildroot
    
    Point %doc directly to source tree files.

 bcfg2.spec |   18 ++++--------------
 1 files changed, 4 insertions(+), 14 deletions(-)
---
diff --git a/bcfg2.spec b/bcfg2.spec
index 04acc8a..0b3c8fa 100644
--- a/bcfg2.spec
+++ b/bcfg2.spec
@@ -404,18 +404,8 @@ install -p -m 644 redhat/systemd/%{name}-server.service %{buildroot}%{_unitdir}/
 
 # Webserver
 install -d %{buildroot}%{apache_conf}/conf.d
-install -p -m 644 misc/apache/bcfg2.conf %{buildroot}%{apache_conf}/conf.d/wsgi_bcfg2.conf
-
-# Documentation
-mkdir -p %{buildroot}%{_defaultdocdir}/bcfg2-doc-%{version}%{?_pre_rc}
-cp -a build/sphinx/html/* \
-    %{buildroot}%{_defaultdocdir}/bcfg2-doc-%{version}%{?_pre_rc}
-#cp -a build/dtd %{buildroot}%{_defaultdocdir}/bcfg2-doc-%{version}%{?_pre_rc}/
-
-# Examples
-mkdir -p %{buildroot}%{_defaultdocdir}/bcfg2-examples-%{version}%{?_pre_rc}
-cp -a examples %{buildroot}%{_defaultdocdir}/bcfg2-examples-%{version}%{?_pre_rc}/
-
+install -p -m 644 misc/apache/bcfg2.conf \
+    %{buildroot}%{apache_conf}/conf.d/wsgi_bcfg2.conf
 
 %if 0%{?rhel} == 5
 # Required for EL5
@@ -621,14 +611,14 @@ sed 's at http://www.w3.org/2001/xml.xsd at file://%{SOURCE3}@' \
 # Required for EL5
 %defattr(-,root,root,-)
 %endif
-%doc %{_defaultdocdir}/bcfg2-doc-%{version}%{?_pre_rc}
+%doc build/sphinx/html/*
 
 %files examples
 %if 0%{?rhel} == 5
 # Required for EL5
 %defattr(-,root,root,-)
 %endif
-%doc %{_defaultdocdir}/bcfg2-examples-%{version}%{?_pre_rc}
+%doc examples/*
 
 %changelog
 * Wed Jul  3 2013 John Morris <john at zultron.com> - 1.3.2-1


More information about the scm-commits mailing list