rpms/docbook-dtds/F-8 docbook-dtds.spec,1.17,1.18
Ondrej Vasik (ovasik)
fedora-extras-commits at redhat.com
Fri Jul 11 10:43:36 UTC 2008
Author: ovasik
Update of /cvs/extras/rpms/docbook-dtds/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1226
Modified Files:
docbook-dtds.spec
Log Message:
fixed license tag, rpmlint complaints and typo in DocBook 4.5 DTD's registration (causing mishandling for DocBook 4.4 and 4.5-#453513)
Index: docbook-dtds.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-dtds/F-8/docbook-dtds.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- docbook-dtds.spec 1 Oct 2007 09:05:39 -0000 1.17
+++ docbook-dtds.spec 11 Jul 2008 10:42:50 -0000 1.18
@@ -1,37 +1,47 @@
Name: docbook-dtds
Version: 1.0
-Release: 32%{?dist}
+Release: 33%{?dist}
Group: Applications/Text
-Summary: SGML and XML document type definitions for DocBook.
+Summary: SGML and XML document type definitions for DocBook
-License: Distributable
+License: Freely redistributable without restriction
URL: http://www.oasis-open.org/docbook/
-Obsoletes: docbook-dtd30-sgml docbook-dtd31-sgml
-Obsoletes: docbook-dtd40-sgml docbook-dtd41-sgml
-Obsoletes: docbook-dtd412-xml
-
-Provides: docbook-dtd-xml docbook-dtd-sgml
-Provides: docbook-dtd30-sgml docbook-dtd31-sgml
-Provides: docbook-dtd40-sgml docbook-dtd41-sgml
-Provides: docbook-dtd412-xml
-Provides: docbook-dtd42-sgml docbook-dtd42-xml
-Provides: docbook-dtd43-sgml docbook-dtd43-xml
-Provides: docbook-dtd44-sgml docbook-dtd44-xml
-Provides: docbook-dtd45-sgml docbook-dtd45-xml
-
-PreReq: xml-common fileutils
-PreReq: textutils grep perl
-PreReq: libxml2 >= 2.4.8
+Obsoletes: docbook-dtd30-sgml < %{version}-%{release}
+Obsoletes: docbook-dtd31-sgml < %{version}-%{release}
+Obsoletes: docbook-dtd40-sgml < %{version}-%{release}
+Obsoletes: docbook-dtd41-sgml < %{version}-%{release}
+Obsoletes: docbook-dtd412-xml < %{version}-%{release}
+
+Provides: docbook-dtd-xml = %{version}-%{release}
+Provides: docbook-dtd-sgml = %{version}-%{release}
+Provides: docbook-dtd30-sgml = %{version}-%{release}
+Provides: docbook-dtd31-sgml = %{version}-%{release}
+Provides: docbook-dtd40-sgml = %{version}-%{release}
+Provides: docbook-dtd41-sgml = %{version}-%{release}
+Provides: docbook-dtd412-xml = %{version}-%{release}
+Provides: docbook-dtd42-sgml = %{version}-%{release}
+Provides: docbook-dtd42-xml = %{version}-%{release}
+Provides: docbook-dtd43-sgml = %{version}-%{release}
+Provides: docbook-dtd43-xml = %{version}-%{release}
+Provides: docbook-dtd44-sgml = %{version}-%{release}
+Provides: docbook-dtd44-xml = %{version}-%{release}
+Provides: docbook-dtd45-sgml = %{version}-%{release}
+Provides: docbook-dtd45-xml = %{version}-%{release}
+
+
+Requires: grep perl
+Requires(post): libxml2 >= 2.4.8
+Requires(postun): libxml2 >= 2.4.8
# If upgrading, the old package's postun scriptlet may use install-catalog
# to remove its entries. xmlcatalog (which this package uses) adds quotes
# to the catalog files, and install-catalog only handles this in 0.6.3-4 or
# later.
-PreReq: sgml-common >= 0.6.3-4
+Requires: sgml-common >= 0.6.3-4
# We provide the directory layout expected by 0.6.3-5 or later of
# xml-common. Earlier versions won't understand.
-PreReq: xml-common >= 0.6.3-8
+Requires: xml-common >= 0.6.3-8
BuildRoot: %{_tmppath}/%{name}-%{version}
@@ -162,6 +172,9 @@
# Increase NAMELEN (bug #36058, bug #159382).
sed -e's,\(NAMELEN\s\+\)44\(\s\*\)\?,\1256,' -i.namelen */docbook.dcl
+# fix of \r\n issue from rpmlint
+sed -i 's/\r//' */*.txt
+
if [ `id -u` -eq 0 ]; then
chown -R root:root .
chmod -R a+rX,g-w,o-w .
@@ -335,12 +348,12 @@
%files
-%defattr (-,root,root)
+%defattr (0644,root,root,0755)
%doc --parents 3.1-sgml/ChangeLog
%doc --parents 4.1-sgml/ChangeLog
%doc --parents */*.txt
-/etc/sgml/sgml-docbook.cat
-/etc/sgml/xml-docbook.cat
+%config(noreplace) /etc/sgml/sgml-docbook.cat
+%config(noreplace) /etc/sgml/xml-docbook.cat
/usr/share/sgml/docbook/sgml-dtd-3.0-%{version}-%{release}
/usr/share/sgml/docbook/sgml-dtd-3.1-%{version}-%{release}
/usr/share/sgml/docbook/sgml-dtd-4.0-%{version}-%{release}
@@ -354,19 +367,19 @@
/usr/share/sgml/docbook/xml-dtd-4.3-%{version}-%{release}
/usr/share/sgml/docbook/xml-dtd-4.4-%{version}-%{release}
/usr/share/sgml/docbook/xml-dtd-4.5-%{version}-%{release}
-%ghost /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat
-%ghost /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat
-%ghost /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat
-%ghost /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat
-%ghost /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat
-%ghost /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat
-%ghost /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat
-%ghost /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat
-%ghost /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat
-%ghost /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat
-%ghost /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat
-%ghost /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat
-%ghost /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat
+%ghost %config(noreplace) /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat
+%ghost %config(noreplace) /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat
+%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat
+%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat
+%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat
+%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat
+%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat
+%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat
+%ghost %config(noreplace) /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat
+%ghost %config(noreplace) /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat
+%ghost %config(noreplace) /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat
+%ghost %config(noreplace) /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat
+%ghost %config(noreplace) /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat
%post
## Clean up pre-docbook-dtds mess caused by broken trigger.
@@ -997,7 +1010,7 @@
"ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
"xml-dtd-4.5-%{version}-%{release}/ent/iso-box.ent" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
- "-//OASIS//DTD DocBook XML V4.4//EN" \
+ "-//OASIS//DTD DocBook XML V4.5//EN" \
"xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Greek Symbols//EN" \
@@ -1467,11 +1480,16 @@
fi
%changelog
-* Mon Oct 1 2007 Ondrej Vasik <ovasik at redhat.com> - 1.0.32
-- DocBook 4.4 SGML and XML.(#312941)
+* Fri Jul 11 2008 Ondrej Vasik <ovasik at redhat.com> - 1.0-33
+- fixed license tag + some rpmlint complaints
+- fixed typo in post scriptlet(causing mishandling of
+ DocBook 4.4 and 4.5 DTD's -#453513)
+
+* Mon Oct 1 2007 Ondrej Vasik <ovasik at redhat.com> - 1.0-32
+- DocBook 4.5 SGML and XML.(#312941)
- added dist tag
-* Wed Jun 20 2007 Ondrej Vasik <ovasik at redhat.com> - 1.0.31
+* Wed Jun 20 2007 Ondrej Vasik <ovasik at redhat.com> - 1.0-31
- .cat files touched and ghosted to be owned by package
- (bug #193475)
More information about the scm-commits
mailing list