docs-common/packaging fedora-doc-common.spec, 1.5, 1.6 fedora-doc.spec.in.common, 1.2, 1.3

[Tommy Reynolds (jtr)]

Author: jtr

Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3874/docs-common/packaging

Modified Files:
	fedora-doc-common.spec fedora-doc.spec.in.common 
Log Message:
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.



Index: fedora-doc-common.spec
===================================================================
RCS file: /cvs/docs/docs-common/packaging/fedora-doc-common.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-doc-common.spec	30 Dec 2005 07:11:22 -0000	1.5
+++ fedora-doc-common.spec	19 Jan 2006 19:50:05 -0000	1.6
@@ -32,12 +32,12 @@
 %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/


Index: fedora-doc.spec.in.common
===================================================================
RCS file: /cvs/docs/docs-common/packaging/fedora-doc.spec.in.common,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-doc.spec.in.common	21 Nov 2005 00:37:58 -0000	1.2
+++ fedora-doc.spec.in.common	19 Jan 2006 19:50:05 -0000	1.3
@@ -25,9 +25,12 @@
 
 %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