diff options
| author | Paul W. Frields <stickster@gmail.com> | 2006-02-04 04:18:26 +0000 |
|---|---|---|
| committer | Paul W. Frields <stickster@gmail.com> | 2006-02-04 04:18:26 +0000 |
| commit | 989cc1e41865d333118aecaf8edd75298e1d511a (patch) | |
| tree | 1d68e98a5554410a53ac953d025eaa1348ce3638 /packaging | |
| parent | 4ca852ed8544c5fc20abc99c7f04d6fe77f50e5f (diff) | |
| download | fedora-doc-utils-989cc1e41865d333118aecaf8edd75298e1d511a.tar.gz fedora-doc-utils-989cc1e41865d333118aecaf8edd75298e1d511a.tar.xz fedora-doc-utils-989cc1e41865d333118aecaf8edd75298e1d511a.zip | |
This seems to make packaging work again... probably needs checking for kludginess
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/spec.xsl | 24 |
1 files changed, 14 insertions, 10 deletions
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 >= 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}/{} |