docs-common/packaging spec.xsl,1.18,1.19

[Paul W. Frields (pfrields)]

Author: pfrields

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

Modified Files:
	spec.xsl 
Log Message:
Fix spec generation so RPM building will work in NWO



Index: spec.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/spec.xsl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- spec.xsl	15 Feb 2006 13:18:20 -0000	1.18
+++ spec.xsl	24 Feb 2006 03:34:25 -0000	1.19
@@ -10,18 +10,14 @@
 
 <xsl:template match="/"># Fedora Documentation Specfile
 %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}
-%define fdpdir %{_datadir}/fedora/doc
 
 Summary:	Fedora Documentation: %{docbase}
 Name:		fedora-doc-%{docbase}
 Version:	<xsl:value-of select="/rpm-info/changelog/revision[@role = 'doc'][1]/@number"/>
 Release:	<xsl:value-of select="/rpm-info/changelog/revision[@role = 'rpm'][1]/@number"/>
 License:	<xsl:call-template name="rpm-license"><xsl:with-param name='license' select='/rpm-info/license/rights'/></xsl:call-template>
-#License:	<xsl:value-of select="/rpm-info/license/rights"/> (Version <xsl:value-of select="/rpm-info/license/version"/>)
 Url:		http://fedora.redhat.com/projects/docs
 Source0:	%{docbase}-%{version}.src.tar.gz
 Source1:	%{name}-gnome.desktop
@@ -56,7 +52,7 @@
 %prep
 %setup -q -n %{docbase}-%{version}
 #export GLOBIGNORE=rpm-info.xml
-for i in $RPM_BUILD_DIR/%{docbase}-%{version}/{*/*.xml,Makefile}
+for i in $RPM_BUILD_DIR/%{docbase}-%{version}/{*.xml,*/*.xml,Makefile}
 do
 	%{__sed} -i 's;\(\.\./\)\{1,\}docs-common;%{fdpdir}/docs-common;g' "$i"
 done
@@ -68,7 +64,7 @@
 mkdir kde-<xsl:value-of select="@lang"/>
 meinproc --output kde-<xsl:value-of select="@lang"/>/index.docbook \
 	 --cache kde-<xsl:value-of select="@lang"/>/index.cache.bz2 \
-	 <xsl:value-of select="@lang"/>/%{docbase}-<xsl:value-of select="@lang"/>.xml
+	 <xsl:value-of select="@lang"/>/%{docbase}.xml
 </xsl:for-each>
 
 %install
@@ -87,7 +83,7 @@
 		     %{SOURCE1}
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/applications/kde
 install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/apps/khelpcenter/plugins/Fedora
-install -m 644 en/*-en.xml $RPM_BUILD_ROOT%{_datadir}/fedora/doc/fedora-doc-%{docbase}/C
+install -m 644 en/*.xml $RPM_BUILD_ROOT%{_datadir}/fedora/doc/fedora-doc-%{docbase}/C
 <xsl:for-each select="/rpm-info/titles/translation">install -m 644 %{SOURCE<xsl:value-of select="position()+3"/>} $RPM_BUILD_ROOT%{_datadir}/omf/fedora-doc-%{docbase}
 <xsl:if test="@lang != 'en'">install -m 644 <xsl:value-of select="@lang"/>/*-<xsl:value-of select="@lang"/>.xml $RPM_BUILD_ROOT%{_datadir}/fedora/doc/fedora-doc-%{docbase}/<xsl:value-of select="@lang"/></xsl:if>
 pushd %{docbase}-<xsl:value-of select="@lang"/>
@@ -132,12 +128,9 @@
 
 %changelog
 <xsl:for-each select="/rpm-info/changelog/revision"><xsl:if 
-	test="@role='rpm'">* <xsl:value-of select="@date"/> - <xsl:call-template
-	  name="packager"><xsl:with-param name="who"
-	    select="author/@worker"/></xsl:call-template> - <xsl:value-of
+	test="@role='rpm'">* <xsl:value-of select="@date"/> Fedora Documentation Project <fedora-docs-list at redhat.com> - <xsl:value-of
 	  select="following-sibling::revision[@role='doc']/@number"/>-<xsl:value-of select="@number"/>
 - <xsl:value-of select="details"/>
-
 </xsl:if></xsl:for-each>
 </xsl:template>