rpms/docbook-style-xsl/devel docbook-style-xsl.spec,1.40,1.41

[Ondrej Vasik (ovasik)]

Author: ovasik

Update of /cvs/extras/rpms/docbook-style-xsl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11908

Modified Files:
	docbook-style-xsl.spec 
Log Message:
merge review #225704, spec file modified to follow guidelines


Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/devel/docbook-style-xsl.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- docbook-style-xsl.spec	24 Oct 2007 10:40:13 -0000	1.40
+++ docbook-style-xsl.spec	6 Nov 2007 13:59:25 -0000	1.41
@@ -1,6 +1,6 @@
 Name: docbook-style-xsl
 Version: 1.73.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/Text
 
 Summary: Norman Walsh's XSL stylesheets for DocBook XML
@@ -18,12 +18,12 @@
 # PassiveTeX before 1.21 can't handle the newer stylesheets.
 Conflicts: passivetex < 1.21
 
-BuildRoot: %{_tmppath}/%{name}-%{version}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 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
-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
 Patch2: docbook-xsl-marginleft.patch
@@ -43,7 +43,7 @@
 %patch1 -p1 -b .pagesetup
 %patch2 -p1 -b .marginleft
 %patch3 -p1 -b .newmethods
-cp %{SOURCE1} Makefile
+cp -p %{SOURCE1} Makefile
 for f in $(find -name "*'*")
 do
   mv -v "$f" $(echo "$f" | tr -d "'")
@@ -56,12 +56,12 @@
 %install
 DESTDIR=$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} \
-	$DESTDIR/usr/share/sgml/docbook/xsl-stylesheets
+	$DESTDIR%{_datadir}/sgml/docbook/xsl-stylesheets
 
 # 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
@@ -69,38 +69,42 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr (-,root,root)
+%defattr (-,root,root,-)
 %doc BUGS
 %doc README
 %doc TODO
 %doc doc
-/usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release}
-/usr/share/sgml/docbook/xsl-stylesheets
+%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}-%{release}
+%{_datadir}/sgml/docbook/xsl-stylesheets
 
 
 %post
-CATALOG=/etc/xml/catalog
-/usr/bin/xmlcatalog --noout --add "rewriteSystem" \
+CATALOG=%{_sysconfdir}/xml/catalog
+%{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
  "http://docbook.sourceforge.net/release/xsl/%{version}" \
- "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG
-/usr/bin/xmlcatalog --noout --add "rewriteURI" \
+ "file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG
+%{_bindir}/xmlcatalog --noout --add "rewriteURI" \
  "http://docbook.sourceforge.net/release/xsl/%{version}" \
- "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG
-/usr/bin/xmlcatalog --noout --add "rewriteSystem" \
+ "file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG
+%{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
  "http://docbook.sourceforge.net/release/xsl/current" \
- "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG
-/usr/bin/xmlcatalog --noout --add "rewriteURI" \
+ "file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG
+%{_bindir}/xmlcatalog --noout --add "rewriteURI" \
  "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
-CATALOG=/etc/xml/catalog
-/usr/bin/xmlcatalog --noout --del \
- "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG
+CATALOG=%{_sysconfdir}/xml/catalog
+%{_bindir}/xmlcatalog --noout --del \
+ "file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG
 
 
 %changelog
+* Tue Nov 06 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.2-4
+- Merge review(#225704)
+- spec file modified to follow guidelines
+
 * Wed Oct 24 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.2-3
 - rpmlint check
 - fixed License Tag, Requires and some cosmetic issues