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

[Ondrej Vasik (ovasik)]

Author: ovasik

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

Modified Files:
	docbook-simple.spec 
Log Message:
rpmlint changes(see changelog)


Index: docbook-simple.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-simple/devel/docbook-simple.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- docbook-simple.spec	24 May 2007 15:40:20 -0000	1.7
+++ docbook-simple.spec	24 Oct 2007 12:44:55 -0000	1.8
@@ -1,11 +1,11 @@
 Name: docbook-simple
 Version: 1.1
-Release: 1.02%{?dist}
+Release: 2%{?dist}
 Group: Applications/Text
-Summary: Simplified DocBook is a small subset of the DocBook XML DTD.
-License: Distributable
+Summary: Simplified DocBook is a small subset of the DocBook XML DTD
+License: Freely redistributable without restriction
 URL: http://www.oasis-open.org/docbook/xml/simple/
-Source0: http://www.docbook.org/xml/simple/1.1/docbook-simple-1.1.zip
+Source0: http://www.docbook.org/xml/simple/1.1/%{name}-%{version}.zip
 Source1: %{name}.README.redhat
 Source2: %{name}.xml
 Source3: %{name}.cat
@@ -13,7 +13,8 @@
 BuildArch: noarch
 BuildRequires: unzip
 Requires: sgml-common
-Requires: libxml2
+Requires(post): libxml2 >= 2.4.8
+Requires(postun): libxml2 >= 2.4.8
 Requires: docbook-dtds
 
 %description
@@ -27,11 +28,12 @@
 
 %prep
 # splatter the files into a version-numbered directory
-%setup -c -n %{version}
+%setup -q -c -n %{version}
 
 # see http://rpm-devel.colug.net/max-rpm/s1-rpm-inside-macros.html
 # setup -c creates the dir then changes to it to expand SOURCE0
 
+%build
 
 %install
 
@@ -67,8 +69,8 @@
 %doc sdocbook.css
 %doc README.fedora
 /usr/share/xml/docbook/simple/%{version}
-/etc/sgml/docbook-simple.cat
-/etc/xml/docbook-simple.xml
+%config(noreplace) /etc/sgml/docbook-simple.cat
+%config(noreplace) /etc/xml/docbook-simple.xml
 
 
 %post
@@ -93,7 +95,7 @@
                 "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
+  # Next line because some resolvers misinterpret uri entries
         /usr/bin/xmlcatalog --noout --add "delegateSystem" \
                 "http://www.oasis-open.org/docbook/xml/simple/1.1/" \
                 "file://$PKG_XML_CATALOG" $ROOT_XML_CATALOG
@@ -117,15 +119,15 @@
 then
 # xmlcatalog deletes OVERRIDE YES directive, use install-catalog instead
 #         /usr/bin/xmlcatalog --sgml --noout --add \
-# 		"/etc/sgml/docbook-simple.cat"
+#     "/etc/sgml/docbook-simple.cat"
 
-	install-catalog --add \
-	$PKG_SGML_CATALOG \
-	$ROOT_SGML_CATALOG 1>/dev/null
+  install-catalog --add \
+  $PKG_SGML_CATALOG \
+  $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 's/^CATALOG.*log\"$//g' $PKG_SGML_CATALOG  >> $PKG_SGML_CATALOG.tmp
+  mv -f $PKG_SGML_CATALOG.tmp $PKG_SGML_CATALOG
 fi
 
 ####################################################################
@@ -146,9 +148,9 @@
 
 ## Remove package catalog entry from SGML root catalog
 /usr/bin/xmlcatalog --sgml --noout --del \
-	/etc/sgml/catalog \
-	"/etc/sgml/docbook-simple.cat" 
-	
+  /etc/sgml/catalog \
+  "/etc/sgml/docbook-simple.cat" 
+  
 ## Remove SGML package catalog
 rm -f /etc/sgml/docbook-simple.cat
 
@@ -157,8 +159,8 @@
 
 ## Remove package catalog entry from XML root catalog
 /usr/bin/xmlcatalog --noout --del \
-	"file:///etc/xml/docbook-simple.xml" \
-	/etc/xml/catalog 
+  "file:///etc/xml/docbook-simple.xml" \
+  /etc/xml/catalog 
 
 ## Remove XML package catalog
 rm -f /etc/sgml/docbook-simple.xml
@@ -167,6 +169,11 @@
 rm -rf /usr/share/xml/docbook/simple
 
 %changelog
+* Wed Oct 24 2007 Ondrej Vasik <ovasik at redhat.com> - 1.1-2
+- rpmlint check
+- /etc/ files marked as config, fixed bad requirements
+- cosmetic cleanup of spec file
+
 * Thu May 24 2007 Ondrej Vasik <ovasik at redhat.com> - 1.1-1.02
 - fixed added error in docbook-simple.xml(wrong catalog version)