From e38d62eb595cf1f5bf9aece1669fc469dec6584a Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Wed, 28 Dec 2005 20:02:13 +0000 Subject: Hopefully improve conditions for offline doc builders --- Makefile | 2 ++ packaging/fedora-doc-common.spec | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/Makefile b/Makefile index 6bfb38f..c0a8b83 100644 --- a/Makefile +++ b/Makefile @@ -48,6 +48,8 @@ rpm: update -name '.*' -o -name '*~' -o \ -name '*.svg' -o -name '*.eps' \) | \ cpio -pamdv $(DOCBASE)-$(RELEASE) +# include Makefile.common for use in offline FDP doc building + cp Makefile.common $(DOCBASE)-$(RELEASE) # # Make RPM build tree; don't rely on local user's setup mkdir -p rpmbuild/{BUILD,RPMS/noarch,SOURCES,SPECS,SRPMS} diff --git a/packaging/fedora-doc-common.spec b/packaging/fedora-doc-common.spec index 8094281..fa81260 100644 --- a/packaging/fedora-doc-common.spec +++ b/packaging/fedora-doc-common.spec @@ -44,8 +44,13 @@ install -m 644 \ install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/stylesheet-images/ install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/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 $RPM_BUILD_DIR/%{name}-%{release}/packaging/*.{xsl,dtd} \ + $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/packaging/ install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/apps/khelpcenter/plugins/Fedora install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/packaging/khelpcenter-fdp.directory $RPM_BUILD_ROOT/%{_datadir}/apps/khelpcenter/plugins/Fedora/.directory +install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/Makefile.common \ + $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/Makefile.common %clean @@ -55,8 +60,10 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root,-) %docdir %{_datadir}/fedora/doc/docs-common/common/ +%{_datadir}/fedora/doc/docs-common/Makefile.common %{_datadir}/fedora/doc/docs-common/common/* %{_datadir}/fedora/doc/docs-common/css/* +%{_datadir}/fedora/doc/docs-common/packaging/* %{_datadir}/fedora/doc/docs-common/stylesheet-images/* %{_datadir}/apps/khelpcenter/plugins/Fedora/.directory %{_sysconfdir}/xdg/menus/applications-merged/* -- cgit