Attachment 266561 Details for Bug 226415 – spec patch to avoid rerunning autotools and use %doc

[patch] spec patch to avoid rerunning autotools and use %doc

sgml-common.spec.diff (text/plain), 2.52 KB, created by Patrice Dumas on 2007-11-22 09:11:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2007-11-22 09:11:32 UTC

Size: 2.52 KB

patch

obsolete

>Index: sgml-common.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/sgml-common/devel/sgml-common.spec,v
>retrieving revision 1.18
>diff -u -3 -p -r1.18 sgml-common.spec
>--- sgml-common.spec	21 Nov 2007 14:04:23 -0000	1.18
>+++ sgml-common.spec	22 Nov 2007 08:55:14 -0000
>@@ -29,7 +29,7 @@ Patch3: sgml-common-automake.patch
> Patch4: sgml-common-0.6.3-docdir.patch
> 
> BuildRequires: libxml2 >= 2.4.8-2
>-BuildRequires: automake autoconf
>+BuildRequires: automake-1.4
> 
> %description
> The sgml-common package contains a collection of entities and DTDs
>@@ -54,23 +54,24 @@ included in multiple packages.
> %patch0 -p1 -b .umask
> %patch1 -p1 -b .xmldir
> %patch2 -p1 -b .quotes
>-%patch3 -p1 -b .automake
>-#patch4 not applied but still shipped with SRPM(see #226415 MergeReview)
>+#patch3 and 4 not applied but still shipped with SRPM(see #226415 MergeReview)
>+#%patch3 -p1 -b .automake
> #%patch4 -p1 -b .docdir
>-aclocal
>-autoconf
>-automake --add-missing
>+# replace bogus links with files
>+for file in COPYING INSTALL install-sh missing mkinstalldirs; do 
>+   rm $file
>+   cp -p /usr/share/automake-1.4/$file .
>+done
> 
> %build
> %configure
> 
> %install
> rm -rf $RPM_BUILD_ROOT
>-export DESTDIR="$RPM_BUILD_ROOT"
>-make install docdir=$RPM_BUILDROOT%{_docdir} prefix=$RPM_BUILDROOT%{_prefix} \
>-mandir=$RPMBUILDROOT%{_mandir}
>+# the files in htmldir are removed below, since doc is in %%doc
>+make install DESTDIR="$RPM_BUILD_ROOT" htmldir='%{_datadir}/doc' INSTALL='install -p'
> mkdir $RPM_BUILD_ROOT%{_sysconfdir}/xml
>-mkdir $RPM_BUILD_ROOT%{_datadir}/sgml/docbook
>+mkdir -p $RPM_BUILD_ROOT%{_datadir}/sgml/docbook
> # Create an empty XML catalog.
> XMLCATALOG=$RPM_BUILD_ROOT%{_sysconfdir}/xml/catalog
> %{_bindir}/xmlcatalog --noout --create $XMLCATALOG
>@@ -99,12 +100,19 @@ install -p -m0644 %{SOURCE1} %{SOURCE2} 
> 	$RPM_BUILD_ROOT%{_datadir}/sgml
> rm -rf $RPM_BUILD_ROOT%{_datadir}/xml/*
> 
>+# remove installed doc file and prepare installation with %%doc
>+rm $RPM_BUILD_ROOT%{_datadir}/doc/*.html
>+rm -rf __dist_doc/html/
>+mkdir -p __dist_doc/html/
>+cp -p doc/HTML/*.html __dist_doc/html/
>+
> 
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
> %files
> %defattr (-,root,root, -)
>+%doc __dist_doc/html/ AUTHORS NEWS ChangeLog README
> %dir %{_sysconfdir}/sgml
> %config(noreplace) %{_sysconfdir}/sgml/sgml.conf
> %dir %{_datadir}/sgml
>@@ -116,8 +124,7 @@ rm -rf $RPM_BUILD_ROOT
> %{_datadir}/sgml/html.soc
> %{_bindir}/sgmlwhich
> %{_bindir}/install-catalog
>-%{_mandir}/*/*
>-%{_docdir}/*
>+%{_mandir}/man8/install-catalog.8*
> 
> %files -n xml-common
> %defattr (-,root,root,-)

Actions: View | Diff

Attachments on bug 226415: 266561