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

[Ondrej Vasik (ovasik)]

Author: ovasik

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

Modified Files:
	docbook-slides.spec 
Log Message:
rpmlint check(see Changelog for details)


Index: docbook-slides.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-slides/devel/docbook-slides.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- docbook-slides.spec	25 May 2007 11:43:12 -0000	1.7
+++ docbook-slides.spec	24 Oct 2007 14:36:01 -0000	1.8
@@ -2,7 +2,7 @@
 Summary: DocBook Slides document type and stylesheets
 Name: docbook-slides
 Version: 3.4.0
-Release: 1.02%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: Applications/Text
 URL: http://sourceforge.net/projects/docbook
@@ -16,7 +16,8 @@
 Requires: docbook-xsl
 Requires: docbook-simple
 Requires: sgml-common
-Requires: libxml2
+Requires(post): libxml2 >= 2.4.8
+Requires(postun): libxml2 >= 2.4.8
 
 
 %description
@@ -29,6 +30,7 @@
 %prep
 %setup -q -n %{pkg}-%{version}
 
+%build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -65,8 +67,8 @@
 %doc NEWS
 %doc README.fedora
 /usr/share/xml/docbook/slides/%{version}
-/etc/sgml/docbook-slides.cat
-/etc/xml/docbook-slides.xml
+%config(noreplace) /etc/sgml/docbook-slides.cat
+%config(noreplace) /etc/xml/docbook-slides.xml
 
 
 %post
@@ -112,15 +114,14 @@
 then
 # xmlcatalog deletes OVERRIDE YES directive, use install-catalog instead
 #         /usr/bin/xmlcatalog --sgml --noout --add \
-# 		"/etc/sgml/docbook-slides.cat"
+#     "/etc/sgml/docbook-slides.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 -i 's/^CATALOG.*log\"$//g' $PKG_SGML_CATALOG
 fi
 
 ####################################################################
@@ -140,9 +141,9 @@
 
 ## Remove package catalog entry from SGML root catalog
 /usr/bin/xmlcatalog --sgml --noout --del \
-	/etc/sgml/catalog \
-	"/etc/sgml/docbook-slides.cat" 
-	
+  /etc/sgml/catalog \
+  "/etc/sgml/docbook-slides.cat" 
+  
 ## Remove SGML package catalog
 rm -f /etc/sgml/docbook-slides.cat
 
@@ -151,8 +152,8 @@
 
 ## Remove package catalog entry from XML root catalog
 /usr/bin/xmlcatalog --noout --del \
-	"file:///etc/xml/docbook-slides.xml" \
-	/etc/xml/catalog 
+  "file:///etc/xml/docbook-slides.xml" \
+  /etc/xml/catalog 
 
 ## Remove XML package catalog
 rm -f /etc/sgml/docbook-slides.xml
@@ -162,6 +163,11 @@
 
 
 %changelog
+* Wed Oct 24 2007 Ondrej Vasik <ovasik at redhat.com> - 3.4.0-2
+- rpmlint check
+- fixed wrong requirements, some cosmetic changes
+- /etc/ files marked as config
+
 * Fri May 25 2007 Ondrej Vasik <ovasik at redhat.com> - 3.4.0-1
 - Initial public release
 - updated cvs files