Properly own directories so no cruft; also use macro to improve readability

1 files changed, 23 insertions, 48 deletions

diff --git a/packaging/fedora-doc-common.spec b/packaging/fedora-doc-common.spec
index d0deb31..86c0578 100644
--- a/packaging/fedora-doc-common.spec
+++ b/packaging/fedora-doc-common.spec
@@ -1,6 +1,7 @@
 # This spec file is only for building supporting common files from the
 # docs-common module.  It is not for use with other docs modules at
 # this time.
+%define docs_common	$RPM_BUILD_ROOT%{_datadir}/fedora/doc/docs-common
 
 Summary:        Fedora Documentation common files
 Name:           fedora-doc-common
@@ -31,44 +32,39 @@ This package contains the following official Fedora Documentation components:
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/bin/
+install -d -m 755 %{docs_common}/bin/
 for i in xmlformat xmldiff copy-figs tidy-bowl fdpsh doctype db2rpm-info \
       	 move-if-change
 do
 	install -m 755 bin/${i} \
-		$RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/bin/
+		%{docs_common}/bin/
 done
 for i in xmlformat-fdp.conf xmldiff.pl active fdp-functions
 do
 	install -m 644 bin/${i} \
-		$RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/bin/
+		%{docs_common}/bin/
 done
-install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/common/
-install -m 644 common/*.{xml,ent} \
-	$RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/common/
-install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/css/
-install -m 644 css/* $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/css/
+install -d -m 755 %{docs_common}/common/
+install -m 644 common/*.{xml,ent} %{docs_common}/common/
+install -d -m 755 %{docs_common}/css/
+install -m 644 css/* %{docs_common}/css/
 install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/menus/applications-merged/
 install -m 644 packaging/fedora-documentation.menu \
 	$RPM_BUILD_ROOT/%{_sysconfdir}/xdg/menus/applications-merged/
-install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/stylesheet-images/
-install -m 644 stylesheet-images/* \
-	$RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/stylesheet-images/
-install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/packaging/
-install -m 644 packaging/*.{xsl,dtd} \
-	$RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/packaging/
-install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/w3.org/2001/
-install -m 644 w3.org/2001/* \
-	$RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/w3.org/2001/
-install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/xsl/
-install -m 644 xsl/* $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/xsl/
-install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/images/
-install -m 644 images/* \
-	$RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/images/
+install -d -m 755 %{docs_common}/stylesheet-images/
+install -m 644 stylesheet-images/* %{docs_common}/stylesheet-images/
+install -d -m 755 %{docs_common}/packaging/
+install -m 644 packaging/*.{xsl,dtd} %{docs_common}/packaging/
+install -d -m 755 %{docs_common}/w3.org/2001/
+install -m 644 w3.org/2001/* %{docs_common}/w3.org/2001/
+install -d -m 755 %{docs_common}/xsl/
+install -m 644 xsl/* %{docs_common}/xsl/
+install -d -m 755 %{docs_common}/images/
+install -m 644 images/* %{docs_common}/images/
 install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/apps/khelpcenter/plugins/Fedora
-install -m 644 packaging/khelpcenter-fdp.directory $RPM_BUILD_ROOT/%{_datadir}/apps/khelpcenter/plugins/Fedora/.directory
-install -m 644 Makefile.common \
-	$RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/Makefile.common
+install -m 644 packaging/khelpcenter-fdp.directory \
+	$RPM_BUILD_ROOT/%{_datadir}/apps/khelpcenter/plugins/Fedora/.directory
+install -m 644 Makefile.common %{docs_common}/Makefile.common
 
 
 %clean 
@@ -77,29 +73,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root,-)
-%dir %{_datadir}/fedora/
-%dir %{_datadir}/fedora/doc/
-%dir %{_datadir}/fedora/doc/docs-common/
-%dir %{_datadir}/fedora/doc/docs-common/bin/
-%dir %{_datadir}/fedora/doc/docs-common/common/
-%dir %{_datadir}/fedora/doc/docs-common/css/
-%dir %{_datadir}/fedora/doc/docs-common/images/
-%dir %{_datadir}/fedora/doc/docs-common/packaging/
-%dir %{_datadir}/fedora/doc/docs-common/stylesheet-images/
-%dir %{_datadir}/fedora/doc/docs-common/w3.org/
-%dir %{_datadir}/fedora/doc/docs-common/w3.org/2001/
-%dir %{_datadir}/fedora/doc/docs-common/xsl/
-%{_datadir}/fedora/doc/docs-common/Makefile.common
-%{_datadir}/fedora/doc/docs-common/bin/*
-%{_datadir}/fedora/doc/docs-common/common/*
-%{_datadir}/fedora/doc/docs-common/css/*
-%{_datadir}/fedora/doc/docs-common/images/*
-%{_datadir}/fedora/doc/docs-common/packaging/*
-%{_datadir}/fedora/doc/docs-common/stylesheet-images/*
-%{_datadir}/fedora/doc/docs-common/w3.org/2001/*
-%{_datadir}/fedora/doc/docs-common/xsl/*
-%dir %{_datadir}/apps/khelpcenter/plugins/Fedora/
-%{_datadir}/apps/khelpcenter/plugins/Fedora/.directory
+%{_datadir}/fedora/
+%{_datadir}/apps/khelpcenter/plugins/Fedora/
 %{_sysconfdir}/xdg/menus/applications-merged/*
 
 %changelog