docs-common/packaging spec.xsl,1.14,1.15

[Paul W. Frields (pfrields)]

Author: pfrields

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

Modified Files:
	spec.xsl 
Log Message:
This seems to make packaging work again... probably needs checking for kludginess


Index: spec.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/spec.xsl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- spec.xsl	20 Jan 2006 00:19:53 -0000	1.14
+++ spec.xsl	4 Feb 2006 04:18:37 -0000	1.15
@@ -10,8 +10,11 @@
 
 <xsl:template match="/"># Fedora Documentation Specfile
 %define	docbase	<xsl:value-of select="$docbase"/>
-%{!?fdpdir:%define localbuild 1}
-%{!?fdpdir:%define fdpdir %{_datadir}/fedora/doc}
+# 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}
@@ -34,9 +37,10 @@
 Requires:	scrollkeeper >= 0.3.11
 Requires:	fedora-doc-common
 BuildRequires:	xmlto
-BuildRequires:	kdelibs   
+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
@@ -52,19 +56,19 @@
 %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,Makefile}
 do
-	%{__sed} -i 's;\.\./docs-common;%{fdpdir}/docs-common;g' "$i"
+	%{__sed} -i 's;\(\.\./\)\{1,\}docs-common;%{fdpdir}/docs-common;g' "$i"
 done
 
 
 %build
-make html FDPDIR=%{fdpdir} %{!?localbuild:HTMLCSSEXTRA=""}
+make html FDPDIR=%{fdpdir} %{!?localbuild:DRAFT="no"}
 <xsl:for-each select="/rpm-info/titles/translation">
 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 \
-	 %{docbase}-<xsl:value-of select="@lang"/>.xml
+	 <xsl:value-of select="@lang"/>/%{docbase}-<xsl:value-of select="@lang"/>.xml
 </xsl:for-each>
 
 
@@ -84,9 +88,9 @@
 		     %{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.xml $RPM_BUILD_ROOT%{_datadir}/fedora/doc/fedora-doc-%{docbase}/C
+install -m 644 en/*-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"/>.xml $RPM_BUILD_ROOT%{_datadir}/fedora/doc/fedora-doc-%{docbase}/<xsl:value-of select="@lang"/></xsl:if>
+<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"/>
 find . -type d | xargs -i \
      install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/HTML/<xsl:value-of select="@lang"/>/fedora-doc-%{docbase}/{}