This seems to make packaging work again... probably needs checking for kludginess

3 files changed, 23 insertions, 17 deletions

diff --git a/Makefile.common b/Makefile.common
index 9d10c5d..1eb1902 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -75,7 +75,7 @@ XML2PO	=xml2po
 #########################################################################
 # Use our very own "docs-common/bin/fdpsh" as the command interpreter
 # This automatically has ${FDPBIN} as first in the ${PATH}
-SHELL	=${FDPBIN}/fdpsh
+SHELL	=RPMINFO=${RPMINFO} ${FDPBIN}/fdpsh
 #########################################################################
 VERSION:=$(shell version doc)
 RELEASE:=$(shell version rpm)
@@ -250,7 +250,7 @@ endef
 #
 $(foreach LANG,${LANGUAGES},$(eval $(call fdp-info_template,${LANG})))
 #
-fdp-info::  $(foreach LANG,${LANGUAGES},fdp-info-$(LANG).xml)
+fdp-info::  $(foreach LANG,${LANGUAGES},$(LANG)/fdp-info-$(LANG).xml)
 #
 #########################################################################
 # Make a new changelog entry for an existing rpm-info.xml file.
@@ -359,7 +359,7 @@ $(DOCBASE)-$(VERSION).src.tar.gz::
 
 package-prep::
 	${MAKE} distclean
-	${MAKE} ${DOCBASE}-${VERSION}.src.tar.gz
+	${MAKE} ${DOCBASE}-${shell version doc}.src.tar.gz
 	${MAKE} ${SPECFILE}
 	${MAKE} omf
 	${MAKE} kde.desktop
@@ -367,7 +367,7 @@ package-prep::
 	${RM} -r rpm
 	mkdir -p rpm/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 	mkdir -p rpm/RPMS/{i386,i486,i586,i686,noarch,ppc,x86_64}
-	cp -f $(DOCBASE)-$(VERSION).src.tar.gz rpm/SOURCES/
+	cp -f $(DOCBASE)-$(shell version doc).src.tar.gz rpm/SOURCES/
 	cp -f ${SPECFILE} rpm/SPECS
 	cp -f *.omf *.desktop rpm/SOURCES
 
diff --git a/bin/fdpsh b/bin/fdpsh
index f4baef2..71b3544 100755
--- a/bin/fdpsh
+++ b/bin/fdpsh
@@ -14,9 +14,11 @@ ME=`basename $0`
 FDPBINDIR=`dirname $0`
 USAGE="usage: ${ME} [-c cmd] [file [arg..]]"
 #
-PATH=${FDPBINDIR}:${PATH}	export PATH
-FDPDIR=${FDPBINDIR}/../..	export FDPDIR
-SHELL=${FDPBINDIR}/${ME}	export SHELL
+PATH=${FDPBINDIR}:${PATH}				export PATH
+# This change keeps pathnames from growing out of control
+FDPDIR=$(pushd ${FDPBINDIR}/../.. 2>&1 >/dev/null \
+	&& pwd && popd 2>&1 >/dev/null)			export FDPDIR
+SHELL=${FDPBINDIR}/${ME}				export SHELL
 #
 FDPLOG=/tmp/fdpsh.log
 #
diff --git a/packaging/spec.xsl b/packaging/spec.xsl
index ce2e61a..68aa722 100644
--- a/packaging/spec.xsl
+++ b/packaging/spec.xsl
@@ -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 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	scrollkeeper &gt;= 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 @@ Group:          Documentation
 %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 @@ desktop-file-install --vendor fedora \
 		     %{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}/{}