OBS User unknown
2009-08-03 17:27:21 +00:00
committed by Git OBS Bridge
parent e06b98bdc8
commit 6715303a25
2 changed files with 24 additions and 59 deletions

View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Aug 3 10:57:28 CEST 2009 - aj@suse.de
- Only remove file from catalog if it disappeared.
- Do not use release numbers, they're not needed anymore.
- Cleanup some rpmlint warnings: Non-executable-in-bin, duplicate
requires, do not remove buildroot.
-------------------------------------------------------------------
Mon Feb 11 08:35:56 CET 2008 - toms@suse.de

View File

@@ -21,11 +21,11 @@
Name: docbook_5
Summary: DocBook Schemas (DTD, RELAX NG, W3C Schema) for Version 5.x
Version: 5.0
Release: 49
License: BSD 3-Clause; X11/MIT
Release: 50
License: BSD 3-clause (or similar) ; MIT License (or similar)
Group: Productivity/Publishing/DocBook
Requires: iso_ent xmlcharent
Requires: sgml-skel libxml2
Requires: libxml2
BuildRequires: sgml-skel
PreReq: /usr/bin/xmlcatalog sgml-skel
PreReq: sed grep awk
@@ -88,7 +88,7 @@ find . -type f | xargs chmod a-x
%build
# # build root catalog fragment
xmlcatbin=/usr/bin/xmlcatalog
CATALOG=docbook_5.xml
CATALOG=%{name}.xml
$xmlcatbin --create --noout $CATALOG
for v in %{version}; do
# DTD
@@ -255,7 +255,7 @@ for v in %{version}; do
esac
done
done
%define FOR_ROOT_CAT %{name}-%{version}-%{release}.xml
%define FOR_ROOT_CAT %{name}-%{version}.xml
CATALOG=etc/xml/$CATALOG
rm -f %{FOR_ROOT_CAT}.tmp
$xmlcatbin --noout --create %{FOR_ROOT_CAT}.tmp
@@ -286,23 +286,19 @@ for v in %{version}; do
done
# Create tag
sed '/<catalog/a\
<group id="%{name}-%{version}-%{release}">
<group id="%{name}-%{version}">
/<\/catalog/i\
</group>' \
%{FOR_ROOT_CAT}.tmp > %{FOR_ROOT_CAT}
%install
if [ ! "x" = "x$RPM_BUILD_ROOT" ] ; then
rm -fr $RPM_BUILD_ROOT
%{INSTALL_DIR} $RPM_BUILD_ROOT
fi
# Create installation structure
%{INSTALL_DIR} $RPM_BUILD_ROOT%{xml_config_dir} \
$RPM_BUILD_ROOT%{_bindir} \
$RPM_BUILD_ROOT%{xml_docbook_style_dir}/upgrade
cat_dir=%{buildroot}/etc/xml
%{INSTALL_DIR} $cat_dir
%{INSTALL_DATA} %{FOR_ROOT_CAT} docbook_5.xml $cat_dir
%{INSTALL_DATA} %{FOR_ROOT_CAT} %{name}.xml $cat_dir
%{INSTALL_DIR} $RPM_BUILD_ROOT%{xml_docbook_dtd_dir}/%{version} \
$RPM_BUILD_ROOT%{xml_docbook_rng_dir}/%{version} \
$RPM_BUILD_ROOT%{xml_docbook_sch_dir}/%{version} \
@@ -314,7 +310,7 @@ for v in %{version}; do
%{INSTALL_DATA} docbook-$v/xsd/* $RPM_BUILD_ROOT%{xml_docbook_xsd_dir}/$v
done
# Use the last version
%{INSTALL_DATA} docbook-$v/tools/db4-entities.pl $RPM_BUILD_ROOT%{_bindir}
%{INSTALL_SCRIPT} docbook-$v/tools/db4-entities.pl $RPM_BUILD_ROOT%{_bindir}
%{INSTALL_DATA} docbook-$v/tools/db4-upgrade.xsl \
$RPM_BUILD_ROOT%{xml_docbook_style_dir}/upgrade
# Install NDVL file(s)
@@ -326,12 +322,15 @@ done
if [ -x /usr/bin/edit-xml-catalog ]; then
/usr/bin/edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--add /etc/xml/%{FOR_ROOT_CAT}
/usr/bin/edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--add /etc/xml/%{name}.xml
fi
%postun
if [ -x /usr/bin/edit-xml-catalog ]; then
# remove entries only on removal of file
if [ ! -f %{xml_sysconf_dir}/%{FOR_ROOT_CAT} -a -x /usr/bin/edit-xml-catalog ] ; then
/usr/bin/edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--del %{name}-%{version}-%{release}
--del %{name}-%{version}
fi
%clean
@@ -342,7 +341,7 @@ rm -fr $RPM_BUILD_ROOT
#%config %{sgml_config_dir}/CATALOG.*
%config %{xml_sysconf_dir}/docbook_5.xml
%config %{xml_sysconf_dir}/%{FOR_ROOT_CAT}
%doc README.SuSE
%doc README.SuSE
%doc docbook-%{version}-spec-cd-01.{pdf,html,xml}
# Use the last version of DocBook:
%doc docbook-%{version}/docs/* docbook-%{version}/docbook.nvdl
@@ -362,47 +361,3 @@ rm -fr $RPM_BUILD_ROOT
%{_bindir}/db4-entities.pl
%changelog
* Mon Feb 11 2008 toms@suse.de
- Release of version 5.0 (Committee Draft)
There are no user-visible changes in 5.0 (Public Review Draft 1).
This version of DocBook V5.0 will become the official Committee
Specification version of DocBook V5.0 as soon as the
Technical Committee balloting process is finished.
- Added DocBook Specification in PDF, HTML and XML
* Thu May 24 2007 toms@suse.de
- Updated to release 5.0CR4:
* Fixed RFE 1708032: Pattern naming inconsistency; changed
db.href.attribute to db.href.attributes.
* Fixed RFE 1700154: Added sortas to <termdef>.
* Fixed RFE 1686919: Added an NVDL rules file.
* Fixed RFE 1705596: Aded db.programming.inlines (<classname>,
<exceptionname>, <function>, <initializer>, <interfacename>,
<methodname>, <modifier>, <ooclass>, <ooexception>, <oointerface>,
<parameter>, <returnvalue>, <type>, and <varname>) to the
content model of <code>.
* Fixed RFE 1689228: Fixed typo in Schematron assertion.
* Fri Mar 23 2007 toms@suse.de
- Updated to release 5.0CR3:
* RFE 1679775: Changed semantics of <termdef>. A <firstterm> is now
required (instead of a <glossterm> as in previous releases). This
allows the definition of one term to refer to another.
* RFE 1682917: Added pgwide attribute to <example>.
* RFE 1644553: Added label attribute to CALS and HTML tables.
* RFE 1588693: Added an <acknowledgements> element, peer to
<dedication>, replacing <ackno> which had only been available at the
end of <article>.
* After several months of consideration and experimentation, we decided
to allow <info> in HTML tables.
* RFE 1673820: Adopted "http://docbook.org/xlink/role/olink" as an XLink
role (that is, the xlink:role attribute) value to identify OLinks
expressed using XLink attributes.
* Wed Mar 14 2007 toms@suse.de
- Updated to release 5.0CR2:
* Fixed RFE 1630203: Allow empty glossary.
* Fixed RFE 1627845: Allow optional caption on CALS table and informaltable.
* Related to RFE 1627845: Allow inlines in HTML table caption.
* Fixed RFE 1589139 (and RFE 1621178): Allow title and titleabbrev on qandaentry.
* Fixed RFE 1675932: Restore localname, prefix and namespace as class attribute values on tag.
* Fixed RFE 1669465: Schematron rules should refer to @xml:id, not @id.
* Mon Feb 19 2007 toms@suse.de
- First release of 5.0CR1