merge review #225704, spec file modified to follow guidelines

This commit is contained in:
Ondrej Vasik 2007-11-06 13:59:25 +00:00
parent f590d3abd4
commit 4dad04b118

View File

@ -1,6 +1,6 @@
Name: docbook-style-xsl Name: docbook-style-xsl
Version: 1.73.2 Version: 1.73.2
Release: 3%{?dist} Release: 4%{?dist}
Group: Applications/Text Group: Applications/Text
Summary: Norman Walsh's XSL stylesheets for DocBook XML Summary: Norman Walsh's XSL stylesheets for DocBook XML
@ -18,12 +18,12 @@ Requires(postun): libxml2 >= 2.4.8
# PassiveTeX before 1.21 can't handle the newer stylesheets. # PassiveTeX before 1.21 can't handle the newer stylesheets.
Conflicts: passivetex < 1.21 Conflicts: passivetex < 1.21
BuildRoot: %{_tmppath}/%{name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch BuildArch: noarch
Source0: http://prdownloads.sourceforge.net/docbook/docbook-xsl-%{version}.tar.gz Source0: http://downloads.sourceforge.net/docbook/docbook-xsl-%{version}.tar.gz
Source1: %{name}.Makefile Source1: %{name}.Makefile
Source2: http://prdownloads.sourceforge.net/docbook/docbook-xsl-doc-%{version}.tar.bz2 Source2: http://downloads.sourceforge.net/docbook/docbook-xsl-doc-%{version}.tar.bz2
Patch1: docbook-xsl-pagesetup.patch Patch1: docbook-xsl-pagesetup.patch
Patch2: docbook-xsl-marginleft.patch Patch2: docbook-xsl-marginleft.patch
@ -43,7 +43,7 @@ popd
%patch1 -p1 -b .pagesetup %patch1 -p1 -b .pagesetup
%patch2 -p1 -b .marginleft %patch2 -p1 -b .marginleft
%patch3 -p1 -b .newmethods %patch3 -p1 -b .newmethods
cp %{SOURCE1} Makefile cp -p %{SOURCE1} Makefile
for f in $(find -name "*'*") for f in $(find -name "*'*")
do do
mv -v "$f" $(echo "$f" | tr -d "'") mv -v "$f" $(echo "$f" | tr -d "'")
@ -56,12 +56,12 @@ done
%install %install
DESTDIR=$RPM_BUILD_ROOT DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
make install BINDIR=$DESTDIR/usr/bin DESTDIR=$DESTDIR/usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release} make install BINDIR=$DESTDIR%{_bindir} DESTDIR=$DESTDIR%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}-%{release}
ln -s xsl-stylesheets-%{version}-%{release} \ ln -s xsl-stylesheets-%{version}-%{release} \
$DESTDIR/usr/share/sgml/docbook/xsl-stylesheets $DESTDIR%{_datadir}/sgml/docbook/xsl-stylesheets
# Don't ship the extensions (bug #177256). # Don't ship the extensions (bug #177256).
rm -rf $DESTDIR/usr/share/sgml/docbook/xsl-stylesheets/extensions/* rm -rf $DESTDIR%{_datadir}/sgml/docbook/xsl-stylesheets/extensions/*
%clean %clean
@ -69,38 +69,42 @@ DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%files %files
%defattr (-,root,root) %defattr (-,root,root,-)
%doc BUGS %doc BUGS
%doc README %doc README
%doc TODO %doc TODO
%doc doc %doc doc
/usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release} %{_datadir}/sgml/docbook/xsl-stylesheets-%{version}-%{release}
/usr/share/sgml/docbook/xsl-stylesheets %{_datadir}/sgml/docbook/xsl-stylesheets
%post %post
CATALOG=/etc/xml/catalog CATALOG=%{_sysconfdir}/xml/catalog
/usr/bin/xmlcatalog --noout --add "rewriteSystem" \ %{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
"http://docbook.sourceforge.net/release/xsl/%{version}" \ "http://docbook.sourceforge.net/release/xsl/%{version}" \
"file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG "file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG
/usr/bin/xmlcatalog --noout --add "rewriteURI" \ %{_bindir}/xmlcatalog --noout --add "rewriteURI" \
"http://docbook.sourceforge.net/release/xsl/%{version}" \ "http://docbook.sourceforge.net/release/xsl/%{version}" \
"file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG "file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG
/usr/bin/xmlcatalog --noout --add "rewriteSystem" \ %{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
"http://docbook.sourceforge.net/release/xsl/current" \ "http://docbook.sourceforge.net/release/xsl/current" \
"file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG "file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG
/usr/bin/xmlcatalog --noout --add "rewriteURI" \ %{_bindir}/xmlcatalog --noout --add "rewriteURI" \
"http://docbook.sourceforge.net/release/xsl/current" \ "http://docbook.sourceforge.net/release/xsl/current" \
"file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG "file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG
%postun %postun
CATALOG=/etc/xml/catalog CATALOG=%{_sysconfdir}/xml/catalog
/usr/bin/xmlcatalog --noout --del \ %{_bindir}/xmlcatalog --noout --del \
"file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG "file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG
%changelog %changelog
* Tue Nov 06 2007 Ondrej Vasik <ovasik@redhat.com> 1.73.2-4
- Merge review(#225704)
- spec file modified to follow guidelines
* Wed Oct 24 2007 Ondrej Vasik <ovasik@redhat.com> 1.73.2-3 * Wed Oct 24 2007 Ondrej Vasik <ovasik@redhat.com> 1.73.2-3
- rpmlint check - rpmlint check
- fixed License Tag, Requires and some cosmetic issues - fixed License Tag, Requires and some cosmetic issues