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

[Ondrej Vasik (ovasik)]

Author: ovasik

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

Modified Files:
	docbook-simple.spec 
Log Message:
merge review, spec file rewritten to follow packaging guidelines


Index: docbook-simple.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-simple/devel/docbook-simple.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- docbook-simple.spec	24 Oct 2007 12:44:55 -0000	1.8
+++ docbook-simple.spec	5 Nov 2007 17:12:50 -0000	1.9
@@ -1,6 +1,6 @@
 Name: docbook-simple
 Version: 1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Text
 Summary: Simplified DocBook is a small subset of the DocBook XML DTD
 License: Freely redistributable without restriction
@@ -9,7 +9,7 @@
 Source1: %{name}.README.redhat
 Source2: %{name}.xml
 Source3: %{name}.cat
-BuildRoot: %{_tmppath}/%{name}-%{version}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 BuildRequires: unzip
 Requires: sgml-common
@@ -49,28 +49,28 @@
 
 XML_CAT_DIR=$RPM_BUILD_ROOT/etc/xml
 mkdir -p $XML_CAT_DIR
-install -m 644 %{SOURCE2} $XML_CAT_DIR
+install -p -m 644 %{SOURCE2} $XML_CAT_DIR
 
 SGML_CAT_DIR=$RPM_BUILD_ROOT/etc/sgml
 mkdir -p $SGML_CAT_DIR
-install -m 644 %{SOURCE3} $SGML_CAT_DIR
+install -p -m 644 %{SOURCE3} $SGML_CAT_DIR
 
 ####### FIXME: must copy README.redhat to source directory ########
 #######        for %doc to find it, ${SOURCE1} doesn't work ########
 
-cp %{SOURCE1} ./README.fedora
+cp -p %{SOURCE1} ./README.fedora
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf ../%{version}
 
 %files
-%defattr (-,root,root)
+%defattr (-,root,root,-)
 %doc sdocbook.css
 %doc README.fedora
-/usr/share/xml/docbook/simple/%{version}
-%config(noreplace) /etc/sgml/docbook-simple.cat
-%config(noreplace) /etc/xml/docbook-simple.xml
+%{_datadir}/xml/docbook/simple/%{version}
+%config(noreplace) %{_sysconfdir}/sgml/docbook-simple.cat
+%config(noreplace) %{_sysconfdir}/xml/docbook-simple.xml
 
 
 %post
@@ -79,24 +79,24 @@
 
 ## Define handy variables ##
 
-ROOT_XML_CATALOG=/etc/xml/catalog
-PKG_XML_CATALOG=/etc/xml/docbook-simple.xml
+ROOT_XML_CATALOG=%{_sysconfdir}/xml/catalog
+PKG_XML_CATALOG=%{_sysconfdir}/xml/docbook-simple.xml
 
 #### Root XML Catalog Entries ####
 #### Delegate appropriate lookups to package catalog ####
 
 if [ -w $ROOT_XML_CATALOG ]
 then
-        /usr/bin/xmlcatalog --noout --add "delegatePublic" \
+        %{_bindir}/xmlcatalog --noout --add "delegatePublic" \
                 "-//OASIS//DTD Simplified" \
                 "file://$PKG_XML_CATALOG" $ROOT_XML_CATALOG
 
-        /usr/bin/xmlcatalog --noout --add "delegateURI" \
+        %{_bindir}/xmlcatalog --noout --add "delegateURI" \
                 "http://www.oasis-open.org/docbook/xml/simple/1.1/" \
                 "file://$PKG_XML_CATALOG" $ROOT_XML_CATALOG
 
   # Next line because some resolvers misinterpret uri entries
-        /usr/bin/xmlcatalog --noout --add "delegateSystem" \
+        %{_bindir}/xmlcatalog --noout --add "delegateSystem" \
                 "http://www.oasis-open.org/docbook/xml/simple/1.1/" \
                 "file://$PKG_XML_CATALOG" $ROOT_XML_CATALOG
 fi
@@ -106,8 +106,8 @@
 
 #################  SGML catalog registration  ######################
 
-ROOT_SGML_CATALOG=/etc/sgml/catalog
-PKG_SGML_CATALOG=/etc/sgml/docbook-simple.cat
+ROOT_SGML_CATALOG=%{_sysconfdir}/sgml/catalog
+PKG_SGML_CATALOG=%{_sysconfdir}/sgml/docbook-simple.cat
 
 #### Root SGML Catalog Entries ####
 #### "Delegate" appropriate lookups to package catalog ####
@@ -126,16 +126,15 @@
   $ROOT_SGML_CATALOG 1>/dev/null
 
 # Hack to workaround bug in install-catalog
-  sed 's/^CATALOG.*log\"$//g' $PKG_SGML_CATALOG  >> $PKG_SGML_CATALOG.tmp
-  mv -f $PKG_SGML_CATALOG.tmp $PKG_SGML_CATALOG
+   sed -i 's/^CATALOG.*log\"$//g' $PKG_SGML_CATALOG  
 fi
 
 ####################################################################
 
 
 # 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
 ##
@@ -147,28 +146,32 @@
 ##### SGML catalogs #####
 
 ## Remove package catalog entry from SGML root catalog
-/usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/catalog \
-  "/etc/sgml/docbook-simple.cat" 
+%{_bindir}/xmlcatalog --sgml --noout --del \
+   %{_sysconfdir}/sgml/catalog \
+  "%{_sysconfdir}/sgml/docbook-simple.cat" 
   
 ## Remove SGML package catalog
-rm -f /etc/sgml/docbook-simple.cat
+rm -f  %{_sysconfdir}/sgml/docbook-simple.cat
 
 
 ##### XML catalogs #####
 
 ## Remove package catalog entry from XML root catalog
-/usr/bin/xmlcatalog --noout --del \
-  "file:///etc/xml/docbook-simple.xml" \
-  /etc/xml/catalog 
+%{_bindir}/xmlcatalog --noout --del \
+  "file://%{_sysconfdir}/xml/docbook-simple.xml" \
+   %{_sysconfdir}/xml/catalog 
 
 ## Remove XML package catalog
-rm -f /etc/sgml/docbook-simple.xml
+rm -f  %{_sysconfdir}/sgml/docbook-simple.xml
 
 ## Remove dtd directory
-rm -rf /usr/share/xml/docbook/simple
+rm -rf %{_datadir}/xml/docbook/simple
 
 %changelog
+* Mon Nov 05 2007 Ondrej Vasik <ovasik at redhat.com> - 1.1-3
+- merge review(#225701)
+- spec modified to follow guidelines
+
 * Wed Oct 24 2007 Ondrej Vasik <ovasik at redhat.com> - 1.1-2
 - rpmlint check
 - /etc/ files marked as config, fixed bad requirements