rpms/docbook-slides/devel docbook-slides.spec,1.8,1.9

Ondrej Vasik (ovasik) fedora-extras-commits at redhat.com
Wed Nov 14 09:20:21 UTC 2007


Author: ovasik

Update of /cvs/extras/rpms/docbook-slides/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18020

Modified Files:
	docbook-slides.spec 
Log Message:
merge review changes(#225702)


Index: docbook-slides.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-slides/devel/docbook-slides.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- docbook-slides.spec	24 Oct 2007 14:36:01 -0000	1.8
+++ docbook-slides.spec	14 Nov 2007 09:19:48 -0000	1.9
@@ -2,15 +2,17 @@
 Summary: DocBook Slides document type and stylesheets
 Name: docbook-slides
 Version: 3.4.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Applications/Text
 URL: http://sourceforge.net/projects/docbook
-Source0: %{pkg}-%{version}.tar.gz
+#in upstream tarball is NOT included tests subdir, but you can download
+#it separately as docbook-slides-demo there if you wish to have it
+Source0: http://downloads.sourceforge.net/docbook/%{name}-%{version}.tar.gz
 Source1: %{name}.xml
 Source2: %{name}.cat
 Source3: %{name}.README.redhat
-BuildRoot: %{_tmppath}/%{name}-%{version}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 Requires: docbook-dtds
 Requires: docbook-xsl
@@ -35,7 +37,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-DESTDIR=$RPM_BUILD_ROOT/usr/share/xml/docbook/slides/%{version}
+DESTDIR=$RPM_BUILD_ROOT%{_datadir}/xml/docbook/slides/%{version}
 mkdir -p $DESTDIR
 cp -a browser $DESTDIR
 cp -a graphics $DESTDIR
@@ -46,29 +48,29 @@
 
 ## Install package catalogs into /etc/*ml/ ##
 
-XML_CAT_DIR=$RPM_BUILD_ROOT/etc/xml
+XML_CAT_DIR=$RPM_BUILD_ROOT%{_sysconfdir}/xml
 mkdir -p $XML_CAT_DIR
-install -m 644 %{SOURCE1} $XML_CAT_DIR
+install -p -m 644 %{SOURCE1} $XML_CAT_DIR
 
-SGML_CAT_DIR=$RPM_BUILD_ROOT/etc/sgml
+SGML_CAT_DIR=$RPM_BUILD_ROOT%{_sysconfdir}/sgml
 mkdir -p $SGML_CAT_DIR
-install -m 644 %{SOURCE2} $SGML_CAT_DIR
+install -p -m 644 %{SOURCE2} $SGML_CAT_DIR
 
-cp %{SOURCE3} ./README.fedora
+cp -p %{SOURCE3} ./README.fedora
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr (-,root,root)
+%defattr (-,root,root, -)
 %doc doc
 %doc tests
 %doc README
 %doc NEWS
 %doc README.fedora
-/usr/share/xml/docbook/slides/%{version}
-%config(noreplace) /etc/sgml/docbook-slides.cat
-%config(noreplace) /etc/xml/docbook-slides.xml
+%{_datadir}/xml/docbook/slides/%{version}
+%config(noreplace) %{_sysconfdir}/sgml/docbook-slides.cat
+%config(noreplace) %{_sysconfdir}/xml/docbook-slides.xml
 
 
 %post
@@ -77,8 +79,8 @@
 
 ## Define handy variables ##
 
-ROOT_XML_CATALOG=/etc/xml/catalog
-PKG_XML_CATALOG=/etc/xml/docbook-slides.xml
+ROOT_XML_CATALOG=%{_sysconfdir}/xml/catalog
+PKG_XML_CATALOG=%{_sysconfdir}/xml/docbook-slides.xml
 #LOCAL_XML_CATALOG=/usr/share/xml/docbook/slides/3.4.0/catalog.xml
 
 #
@@ -86,14 +88,14 @@
 #
 if [ -w $ROOTCATALOG ]
 then
-        /usr/bin/xmlcatalog --noout --add "delegatePublic" \
+        %{_bindir}/xmlcatalog --noout --add "delegatePublic" \
                 "-//Norman Walsh//DTD Slides" \
                 "file://$PKG_XML_CATALOG" $ROOT_XML_CATALOG
 
-        /usr/bin/xmlcatalog --noout --add "delegateSystem" \
+        %{_bindir}/xmlcatalog --noout --add "delegateSystem" \
                 "http://docbook.sourceforge.net/release/slides" \
                 "file://$PKG_XML_CATALOG" $ROOT_XML_CATALOG
-        /usr/bin/xmlcatalog --noout --add "delegateURI" \
+        %{_bindir}/xmlcatalog --noout --add "delegateURI" \
                 "http://docbook.sourceforge.net/release/slides" \
                 "file://$PKG_XML_CATALOG" $ROOT_XML_CATALOG
 fi
@@ -102,8 +104,8 @@
 
 #################  SGML catalog registration  ######################
 
-ROOT_SGML_CATALOG=/etc/sgml/catalog
-PKG_SGML_CATALOG=/etc/sgml/docbook-slides.cat
+ROOT_SGML_CATALOG=%{_sysconfdir}/sgml/catalog
+PKG_SGML_CATALOG=%{_sysconfdir}/sgml/docbook-slides.cat
 
 #### Root SGML Catalog Entries ####
 #### "Delegate" appropriate lookups to package catalog ####
@@ -127,8 +129,8 @@
 ####################################################################
 
 # Finally, make sure everything in /etc/*ml is readable!
-/bin/chmod a+r /etc/sgml/*
-/bin/chmod a+r /etc/xml/*
+/bin/chmod a+r %{_sysconfdir}/sgml/*
+/bin/chmod a+r %{_sysconfdir}/xml/*
 
 %postun
 ##
@@ -140,29 +142,33 @@
 ##### SGML catalogs #####
 
 ## Remove package catalog entry from SGML root catalog
-/usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/catalog \
-  "/etc/sgml/docbook-slides.cat" 
+%{_bindir}/xmlcatalog --sgml --noout --del \
+  %{_sysconfdir}/sgml/catalog \
+  "%{_sysconfdir}/sgml/docbook-slides.cat" 
   
 ## Remove SGML package catalog
-rm -f /etc/sgml/docbook-slides.cat
+rm -f %{_sysconfdir}/sgml/docbook-slides.cat
 
 
 ##### XML catalogs #####
 
 ## Remove package catalog entry from XML root catalog
-/usr/bin/xmlcatalog --noout --del \
-  "file:///etc/xml/docbook-slides.xml" \
-  /etc/xml/catalog 
+%{_bindir}/xmlcatalog --noout --del \
+  "file://%{_sysconfdir}/xml/docbook-slides.xml" \
+  %{_sysconfdir}/xml/catalog 
 
 ## Remove XML package catalog
-rm -f /etc/sgml/docbook-slides.xml
+rm -f %{_sysconfdir}/sgml/docbook-slides.xml
 
 ## Remove dtd directory
-rm -rf /usr/share/xml/docbook/slides
+rm -rf %{_datadir}/xml/docbook/slides
 
 
 %changelog
+* Tue Nov 06 2007 Ondrej Vasik <ovasik at redhat.com> - 3.4.0-3
+- merge review(#225702)
+- spec file changed to follow guidelines
+
 * Wed Oct 24 2007 Ondrej Vasik <ovasik at redhat.com> - 3.4.0-2
 - rpmlint check
 - fixed wrong requirements, some cosmetic changes




More information about the fedora-extras-commits mailing list