fixed most of rpmlint issues(see changelog)
This commit is contained in:
Ondrej Vasik
parent
a556538808
commit
8c6768a789
@ -1,37 +1,46 @@
|
|||||||
Name: docbook-dtds
|
Name: docbook-dtds
|
||||||
Version: 1.0
|
Version: 1.0
|
||||||
Release: 33%{?dist}
|
Release: 34%{?dist}
|
||||||
Group: Applications/Text
|
Group: Applications/Text
|
||||||
|
|
||||||
Summary: SGML and XML document type definitions for DocBook.
|
Summary: SGML and XML document type definitions for DocBook
|
||||||
|
|
||||||
License: Distributable
|
License: Redistributable, no modification permitted
|
||||||
URL: http://www.oasis-open.org/docbook/
|
URL: http://www.oasis-open.org/docbook/
|
||||||
|
|
||||||
Obsoletes: docbook-dtd30-sgml docbook-dtd31-sgml
|
Obsoletes: docbook-dtd30-sgml <= %{version}-%{release}
|
||||||
Obsoletes: docbook-dtd40-sgml docbook-dtd41-sgml
|
Obsoletes: docbook-dtd31-sgml <= %{version}-%{release}
|
||||||
Obsoletes: docbook-dtd412-xml
|
Obsoletes: docbook-dtd40-sgml <= %{version}-%{release}
|
||||||
|
Obsoletes: docbook-dtd41-sgml <= %{version}-%{release}
|
||||||
|
Obsoletes: docbook-dtd412-xml <= %{version}-%{release}
|
||||||
|
|
||||||
Provides: docbook-dtd-xml docbook-dtd-sgml
|
Provides: docbook-dtd-xml = %{version}-%{release}
|
||||||
Provides: docbook-dtd30-sgml docbook-dtd31-sgml
|
Provides: docbook-dtd-sgml = %{version}-%{release}
|
||||||
Provides: docbook-dtd40-sgml docbook-dtd41-sgml
|
Provides: docbook-dtd30-sgml = %{version}-%{release}
|
||||||
Provides: docbook-dtd412-xml
|
Provides: docbook-dtd31-sgml = %{version}-%{release}
|
||||||
Provides: docbook-dtd42-sgml docbook-dtd42-xml
|
Provides: docbook-dtd40-sgml = %{version}-%{release}
|
||||||
Provides: docbook-dtd43-sgml docbook-dtd43-xml
|
Provides: docbook-dtd41-sgml = %{version}-%{release}
|
||||||
Provides: docbook-dtd44-sgml docbook-dtd44-xml
|
Provides: docbook-dtd412-xml = %{version}-%{release}
|
||||||
Provides: docbook-dtd45-sgml docbook-dtd45-xml
|
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}
|
||||||
|
|
||||||
PreReq: xml-common fileutils
|
Requires: grep perl
|
||||||
PreReq: textutils grep perl
|
Requires(post): libxml2 >= 2.4.8
|
||||||
PreReq: libxml2 >= 2.4.8
|
Requires(postun): libxml2 >= 2.4.8
|
||||||
# If upgrading, the old package's postun scriptlet may use install-catalog
|
# If upgrading, the old package's postun scriptlet may use install-catalog
|
||||||
# to remove its entries. xmlcatalog (which this package uses) adds quotes
|
# 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
|
# to the catalog files, and install-catalog only handles this in 0.6.3-4 or
|
||||||
# later.
|
# 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
|
# We provide the directory layout expected by 0.6.3-5 or later of
|
||||||
# xml-common. Earlier versions won't understand.
|
# 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}
|
BuildRoot: %{_tmppath}/%{name}-%{version}
|
||||||
|
|
||||||
@ -162,6 +171,10 @@ cd ..
|
|||||||
# Increase NAMELEN (bug #36058, bug #159382).
|
# Increase NAMELEN (bug #36058, bug #159382).
|
||||||
sed -e's,\(NAMELEN\s\+\)44\(\s\*\)\?,\1256,' -i.namelen */docbook.dcl
|
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
|
if [ `id -u` -eq 0 ]; then
|
||||||
chown -R root:root .
|
chown -R root:root .
|
||||||
chmod -R a+rX,g-w,o-w .
|
chmod -R a+rX,g-w,o-w .
|
||||||
@ -336,12 +349,13 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr (0644,root,root,0755)
|
%defattr (0644,root,root,0755)
|
||||||
|
#in upstream tarballs there is a lot of files with 0755 permissions
|
||||||
|
#but they don't need to be, 0644 is enough for every file in tarball
|
||||||
%doc --parents 3.1-sgml/ChangeLog
|
%doc --parents 3.1-sgml/ChangeLog
|
||||||
%doc --parents 4.1-sgml/ChangeLog
|
%doc --parents 4.1-sgml/ChangeLog
|
||||||
%doc --parents */*.txt
|
%doc --parents */*.txt
|
||||||
%defattr(-,root,root)
|
%config(noreplace) /etc/sgml/sgml-docbook.cat
|
||||||
/etc/sgml/sgml-docbook.cat
|
%config(noreplace) /etc/sgml/xml-docbook.cat
|
||||||
/etc/sgml/xml-docbook.cat
|
|
||||||
/usr/share/sgml/docbook/sgml-dtd-3.0-%{version}-%{release}
|
/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-3.1-%{version}-%{release}
|
||||||
/usr/share/sgml/docbook/sgml-dtd-4.0-%{version}-%{release}
|
/usr/share/sgml/docbook/sgml-dtd-4.0-%{version}-%{release}
|
||||||
@ -355,19 +369,19 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
/usr/share/sgml/docbook/xml-dtd-4.3-%{version}-%{release}
|
/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.4-%{version}-%{release}
|
||||||
/usr/share/sgml/docbook/xml-dtd-4.5-%{version}-%{release}
|
/usr/share/sgml/docbook/xml-dtd-4.5-%{version}-%{release}
|
||||||
%ghost /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat
|
%ghost %config(noreplace) /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat
|
||||||
%ghost /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat
|
%ghost %config(noreplace) /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat
|
||||||
%ghost /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat
|
%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat
|
||||||
%ghost /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat
|
%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat
|
||||||
%ghost /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat
|
%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat
|
||||||
%ghost /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat
|
%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat
|
||||||
%ghost /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat
|
%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat
|
||||||
%ghost /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat
|
%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat
|
||||||
%ghost /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat
|
%ghost %config(noreplace) /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat
|
||||||
%ghost /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat
|
%ghost %config(noreplace) /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat
|
||||||
%ghost /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat
|
%ghost %config(noreplace) /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat
|
||||||
%ghost /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat
|
%ghost %config(noreplace) /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat
|
||||||
%ghost /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat
|
%ghost %config(noreplace) /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat
|
||||||
|
|
||||||
%post
|
%post
|
||||||
## Clean up pre-docbook-dtds mess caused by broken trigger.
|
## Clean up pre-docbook-dtds mess caused by broken trigger.
|
||||||
@ -616,7 +630,7 @@ then
|
|||||||
XML=$((XML - 1))
|
XML=$((XML - 1))
|
||||||
SGML=$((SGML - 1))
|
SGML=$((SGML - 1))
|
||||||
perl -e "@_=<>;@_[$XML, $SGML]=@_[$SGML, $XML];print @_" \
|
perl -e "@_=<>;@_[$XML, $SGML]=@_[$SGML, $XML];print @_" \
|
||||||
${CATALOG} > ${CATALOG}.rpmtmp
|
{CATALOG} > ${CATALOG}.rpmtmp
|
||||||
mv -f ${CATALOG}.rpmtmp ${CATALOG}
|
mv -f ${CATALOG}.rpmtmp ${CATALOG}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -1468,6 +1482,13 @@ then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 23 2007 Ondrej Vasik <ovasik@redhat.com> - 1.0-34
|
||||||
|
- corrected most of rpmlint issues
|
||||||
|
- (PreReq, tab/spaces , wrong permissions on some files,
|
||||||
|
- wrong file end encoding of txt files, non config files
|
||||||
|
- in /etc, some requires issues, versioned provides and
|
||||||
|
- obsoletes, fixed license tag)
|
||||||
|
|
||||||
* Fri Oct 19 2007 Ondrej Vasik <ovasik@redhat.com> - 1.0-33
|
* Fri Oct 19 2007 Ondrej Vasik <ovasik@redhat.com> - 1.0-33
|
||||||
- fixed wrong attributes for docs(#326581)
|
- fixed wrong attributes for docs(#326581)
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user