Push to 0.3.1:

- Update Makefile to properly remove supporting source files
- Support generation of fdp-info in local build environment
- Include additional scripts
- Revert spec.xsl to distinguish local builds from CVS builds

3 files changed, 16 insertions, 15 deletions

diff --git a/packaging/bookinfo.xsl b/packaging/bookinfo.xsl
index a2070a9..d18fba5 100644
--- a/packaging/bookinfo.xsl
+++ b/packaging/bookinfo.xsl
@@ -4,6 +4,7 @@
   <xsl:param name="lang" select="'en'"/>
   <xsl:param name="doctype" select="'bookinfo'"/>
   <xsl:param name="who" select="''"/>
+  <xsl:param name="fdpdir" select="'../..'"/>
 
   <xsl:output encoding="UTF-8" indent="yes" method="xml"
     omit-xml-declaration="no" version="1.0"
@@ -68,11 +69,10 @@
       </xsl:element>
       <xsl:choose>
 	<xsl:when test="/rpm-info/license/rights='OPL'">
-	  <xsl:text disable-output-escaping="yes">&lt;xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../docs-common/common/legalnotice-opl-en.xml"/&gt;</xsl:text>
+	  <xsl:text disable-output-escaping="yes">&lt;xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="</xsl:text><xsl:value-of select="$fdpdir"/><xsl:text disable-output-escaping="yes">/docs-common/common/legalnotice-opl-en.xml"/&gt;</xsl:text>
 	</xsl:when>
 	<xsl:otherwise> <!-- assume FDL for now -->
-	  <xsl:text disable-output-escaping="yes">&lt;xi:include
-	  xmlns:xi="http://www.w3.org/2001/XInclude" href="../../docs-common/common/legalnotice-en.xml"/&gt;</xsl:text>
+	  <xsl:text disable-output-escaping="yes">&lt;xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="</xsl:text><xsl:value-of select="$fdpdir"/><xsl:text disable-output-escaping="yes">/docs-common/common/legalnotice-en.xml"/&gt;</xsl:text>
 	</xsl:otherwise>
       </xsl:choose>
     </xsl:element>
diff --git a/packaging/fedora-doc-common.spec b/packaging/fedora-doc-common.spec
index 605b126..d0deb31 100644
--- a/packaging/fedora-doc-common.spec
+++ b/packaging/fedora-doc-common.spec
@@ -5,7 +5,7 @@
 Summary:        Fedora Documentation common files
 Name:           fedora-doc-common
 # To be defined in Makefile
-Version:        0.3
+Version:        0.3.1
 Release: 	1
 License:        FDL
 Url:		http://fedora.redhat.com/projects/docs/
@@ -32,21 +32,17 @@ 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 tidy-bowl fdpsh doctype
+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/
 done
 for i in xmlformat-fdp.conf xmldiff.pl active fdp-functions
 do
-	install -m 755 bin/${i} \
+	install -m 644 bin/${i} \
 		$RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/bin/
 done
-# Correct exceptions to make rpmlint happy
-for i in active fdp-functions xmlformat-fdp.conf
-do
-	chmod 644 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/bin/${i}
-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/
@@ -107,6 +103,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/xdg/menus/applications-merged/*
 
 %changelog
+* Mon Feb 13 2006 Paul W. Frields <stickster@gmail.com> - 0.3.1-1
+- Update Makefile to properly remove supporting source files
+- Support generation of fdp-info in local build environment
+- Include additional scripts
+- Revert spec.xsl to distinguish local builds from CVS builds
+
 * Sun Feb 12 2006 Paul W. Frields <stickster@gmail.com> - 0.3-1
 - Move to XInclude for all legalnotice content
 
diff --git a/packaging/spec.xsl b/packaging/spec.xsl
index 20874be..f8b44da 100644
--- a/packaging/spec.xsl
+++ b/packaging/spec.xsl
@@ -12,8 +12,8 @@
 %define	docbase	<xsl:value-of select="$docbase"/>
 # We may not be using this because of the way that $FDPDIR commutes
 # into the sed(1) command below
-#%{!?fdpdir:%define localbuild 1}
-#%{!?fdpdir:%define fdpdir %{_datadir}/fedora/doc}
+%{!?fdpdir:%define localbuild 1}
+%{!?fdpdir:%define fdpdir %{_datadir}/fedora/doc}
 %define fdpdir %{_datadir}/fedora/doc
 
 Summary:	Fedora Documentation: %{docbase}
@@ -39,9 +39,8 @@ Requires:	scrollkeeper &gt;= 0.3.11
 Requires:	fedora-doc-common
 BuildRequires:	xmlto
 BuildRequires:	kdelibs
-BuildRequires:	fedora-doc-common
 # Used if builder does not specify common files locally
-#%{?localbuild:%{expand:BuildRequires: fedora-doc-common}}
+%{?localbuild:%{expand:BuildRequires: fedora-doc-common}}
 
 
 %description