diff options
| author | Tommy Reynolds <Tommy.Reynolds@MegaCoder.com> | 2006-01-19 19:49:48 +0000 |
|---|---|---|
| committer | Tommy Reynolds <Tommy.Reynolds@MegaCoder.com> | 2006-01-19 19:49:48 +0000 |
| commit | f41084d4acba94796050d6b4939af4b213e40a11 (patch) | |
| tree | 486951067db68346ccedeb1c8e84ac186e09dfa8 /packaging | |
| parent | 46b7eac1c5a54b23d50c94ac5094618bf0ad6ecc (diff) | |
| download | fedora-doc-utils-f41084d4acba94796050d6b4939af4b213e40a11.tar.gz fedora-doc-utils-f41084d4acba94796050d6b4939af4b213e40a11.tar.xz fedora-doc-utils-f41084d4acba94796050d6b4939af4b213e40a11.zip | |
First cut a integrating the RPM packaging stuff with the
"docs-common/Makefile.common" infrastructure. While this appears to
work *somewhat* with the "example-tutorial", it is certainly not
ready for prime time yet.
TODO:
1) Verify that all generated RPM's have the necessary files inside.
2) Mangle the "../docs-common" strings in Makefiles, *.xml, to
reference the "/usr/share/fedora/doc" ${FDPDIR} so that we don't
need to bugger the RPM checksums of the files by altering them at
RPM install time.
3) Buy a beer all round.
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/fedora-doc-common.spec | 4 | ||||
| -rw-r--r-- | packaging/fedora-doc.spec.in.common | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/packaging/fedora-doc-common.spec b/packaging/fedora-doc-common.spec index 48f697b..c031764 100644 --- a/packaging/fedora-doc-common.spec +++ b/packaging/fedora-doc-common.spec @@ -32,12 +32,12 @@ 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/ -for i in xmlformat xmldiff copy-figs bulkbuild tidy-bowl +for i in xmlformat xmldiff copy-figs tidy-bowl fdpsh doctype do install -m 755 $RPM_BUILD_DIR/%{name}-%{release}/bin/${i} \ $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/bin/ done -for i in xmlformat-fdp.conf xmldiff.pl active +for i in xmlformat-fdp.conf xmldiff.pl active fdp-functions do install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/bin/${i} \ $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/bin/ diff --git a/packaging/fedora-doc.spec.in.common b/packaging/fedora-doc.spec.in.common index 23bcf88..73667a0 100644 --- a/packaging/fedora-doc.spec.in.common +++ b/packaging/fedora-doc.spec.in.common @@ -25,9 +25,12 @@ For more information, refer to the Fedora Documentation Project. %prep %setup -q -n %{docbase}-%{version} +# FIXME: Need to do this remapping in the RPM build section, since it +# causes "rpm -V foo" to fail, even if it's done immediately after an +# install... for i in $RPM_BUILD_DIR/%{docbase}-%{version}/%{docbase}*.xml do - %{__sed} -i 's!../docs-common/!../../docs-common/!' "$i" + %{__sed} -i 's!../docs-common/!/usr/share/fedora/doc/docs-common/!' "$i" done |