Accepting request 18540 from Publishing

Copy from Publishing/docbook_4 based on submit request 18540 from user thomas-schraitle OBS-URL: https://build.opensuse.org/request/show/18540 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/docbook_4?expand=0&rev=11
2009-08-28 15:54:22 +00:00 · 2009-08-28 15:54:22 +00:00 · af0e756ab5
commit af0e756ab5
parent efd78ce536
2 changed files with 19 additions and 150 deletions
--- a/docbook_4.changes
+++ b/docbook_4.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Aug 17 09:51:51 CEST 2009 - aj@suse.de
+
+- Only remove file from catalog if it disappeared.
+- Do not use release numbers, they're not needed anymore.
+- Fix some rpmlint warnings: do not remove buildroot, use fdupes.
+
 -------------------------------------------------------------------
 Thu Mar 29 18:42:27 CEST 2007 - aj@suse.de

--- a/docbook_4.spec
+++ b/docbook_4.spec
@ -1,7 +1,7 @@
 #
 # spec file for package docbook_4 (Version 4.5)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -19,20 +19,20 @@


 Name:           docbook_4
-BuildRequires:  sgml-skel unzip
-License:        BSD 3-Clause; X11/MIT
+BuildRequires:  fdupes sgml-skel unzip
+License:        BSD 3-clause (or similar) ; MIT License (or similar)
 Group:          Productivity/Publishing/DocBook
 Provides:       docbk_4 docbook docbook-dtd
 Obsoletes:      docbk_4
 Requires:       iso_ent xmlcharent
-Requires:       sgml-skel libxml2
+Requires:       libxml2
 %define regcat /usr/bin/sgml-register-catalog
 PreReq:         %{regcat} /usr/bin/xmlcatalog sgml-skel
 PreReq:         sed grep awk
 AutoReqProv:    on
 Summary:        DocBook DTD Version 4.x
 Version:        4.5
-Release:        111
+Release:        112
 Source2:        docbook_4-README.SuSE
 Source7:        CATALOG.docbook_4
 # DocBook 4.1
@ -247,7 +247,7 @@ $xmlcatbin --noout --add "public" \
    "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML" \
    "file://$isodir/iso-cyr2.ent" $CATALOG
 # ====
-%define FOR_ROOT_CAT for-catalog-%{name}-%{version}-%{release}.xml
+%define FOR_ROOT_CAT for-catalog-%{name}-%{version}.xml
 CATALOG=etc/xml/$CATALOG
 rm -f %{FOR_ROOT_CAT}.tmp
 $xmlcatbin --noout --create %{FOR_ROOT_CAT}.tmp
@ -308,16 +308,12 @@ $xmlcatbin --noout --add "delegateURI" \
  "file:///$CATALOG" %{FOR_ROOT_CAT}.tmp
 # 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
 %{INSTALL_DIR} $RPM_BUILD_ROOT%{sgml_config_dir}
 %{INSTALL_DIR} $RPM_BUILD_ROOT%{xml_config_dir}
 %{INSTALL_DATA} CATALOG.* $RPM_BUILD_ROOT%{sgml_config_dir}
@ -353,6 +349,8 @@ unzip -q -a -d $RPM_BUILD_ROOT%{xml_docbook_xsd_dir}/4.2 %{S:422}
 unzip -q -a -d $RPM_BUILD_ROOT%{xml_docbook_xsd_dir}/4.3 %{S:433}
 unzip -q -a -d $RPM_BUILD_ROOT%{xml_docbook_xsd_dir}/4.4 %{S:443}
 unzip -q -a -d $RPM_BUILD_ROOT%{xml_docbook_xsd_dir}/4.5 %{S:453}
+# cleanup
+%fdupes $RPM_BUILD_ROOT

 %post
 if [ -x %{regcat} ]; then
@ -373,9 +371,10 @@ if [ "$1" = "0" -a -x %{regcat} ]; then
      >/dev/null 2>&1 || true
  done
 fi
-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
@ -426,140 +425,3 @@ rm -fr $RPM_BUILD_ROOT
 %dir %{xml_docbook_xsd_dir}

 %changelog
-* Thu Mar 29 2007 aj@suse.de
- Really add unzip as build requirement.
-* Thu Mar 29 2007 toms@suse.de
- Added unzip as build requirements
-* Fri Feb 16 2007 toms@suse.de
- Added RELAX NG and W3C schema for 4.5
- Completed DocBook 4.2 with RELAX NG and W3C
-* Thu Feb 15 2007 toms@suse.de
- Added DocBook v4.5 XML and SGML DTD
- Added RELAX NG and W3C schema for 4.3 and 4.4
-* Mon Jan 15 2007 ke@suse.de
- PreReq sgml-skel instead of file name.
-* Fri Jan 12 2007 dmueller@suse.de
- fix build of depending packages once again
-* Fri Jan 12 2007 ke@suse.de
- Remove 'exit 0' from %%post and %%postun; reported by Klaus Kaempf
-  [# 216944].
-* Thu Jan 11 2007 ke@suse.de
- Remove /usr/share/xml from the files list.
-* Mon Aug 14 2006 ke@suse.de
- Remove obsolete compatibility link for <= SL 9.0.
-* Sun Feb 19 2006 ro@suse.de
- modify setup line in spec file
-* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Wed Dec 21 2005 aj@suse.de
- Package symlink.
-* Fri Sep 16 2005 ke@suse.de
- Add catalog entries for version 4.3 and 4.4 (SGML flavor); reported by
-  Ulrich Windl [# 104872].
- Allow ":" in attribute names for version 4.4, too (SGML flavor).
- Cleanup CATALOG.docbook_4: Remove commented entries, comment obsolete
-  4.4 references (SGML flavor).
-* Wed May 18 2005 ke@suse.de
- docbook-4-3-xml-cat.diff: add catalog entries for HTML tables;
-  reported by Thomas Schraitle [# 84023].
-* Wed Feb 02 2005 ke@suse.de
- Add docbook version 4.4 (SGML and XML).
-* Fri Jul 02 2004 ke@suse.de
- Disable support for catalog support for 4.3 (SGML) for the moment;
-  reported by Takashi Iwai.
-* Mon Jun 07 2004 ke@suse.de
- Add docbook version 4.3 (SGML, XML, and experimental RNG flavor).
- Cleanup .spec file.
-* Mon Mar 01 2004 ke@suse.de
- In %%postun check for the update case.
-* Tue Feb 24 2004 hmacht@suse.de
- building as non-root
-* Tue Feb 10 2004 ke@suse.de
- Move XML DTDs to /usr/share/xml/docbook/schema/dtd.
-* Fri Jan 30 2004 ke@suse.de
- Add links pointing from the SGML hierarchy to the XML files.
-* Thu Jan 22 2004 ke@suse.de
- Adjust directories according to FHS 2.3:
-  * Move XML DTDs to /usr/share/xml/docbook.
-  * Move SGML DTDs to /usr/share/sgml/docbook.
-  * Keep CATALOG.* files in /usr/share/sgml for the time being.
-  * Provide compatibility links for SL =< 9.0 (log this info in
-  /var/adm/SuSEconfig/run-sgmldir-links for later processing).
-* Fri Jul 11 2003 ke@suse.de
- Remove disturbing link %%{_datadir}/sgml/db42xml via %%pre.
-* Wed Apr 30 2003 ke@suse.de
- Use the "//XML" suffix for Formal Public Identifiers of XML ISO
-  entity sets.
-* Tue Apr 29 2003 ke@suse.de
- Use /etc/xml/suse-catalog.xml instead of /etc/xml/catalog.
-* Tue Apr 29 2003 ke@suse.de
- Use <group> sectioning in  /etc/xml/catalog.
-* Mon Apr 28 2003 ke@suse.de
- Use edit-xml-catalog in %%post/%%postun for managing /etc/xml/catalog.
-* Tue Apr 15 2003 ke@suse.de
- Fix %%preun/%%postun scripts: Use %%postun only to avoid nuking catalog
-  entries during update; add rewriteSystem statement.
-  Reported by Gernot Hillier [# 26270].
-* Mon Nov 25 2002 ke@suse.de
- Use sgml-register-catalog to populate /etc/sgml/catalog.
-* Fri Nov 15 2002 ke@suse.de
- Also for the 4.2 DTD provide convenience links for psgml.
-* Wed Nov 06 2002 ke@suse.de
- Map DocBook 4.0 system identifiers to 4.1.
-* Wed Aug 14 2002 ke@suse.de
- Add delegatePublic and delegateSystem for DocBook DTD 4.1 to the XML
-  catalog.  Thus scrollkeeper-update can make use of local resources.
-  Reported by Thorsten Kukuk and Olaf Hering [# 17646].
- Add more files to the uninstall cleanup scripts.
-* Mon Aug 12 2002 ke@suse.de
- Don't use hardcoded version number ("41") when building the the 42
-  SGML Open Catalog for the XML DTD.
-  Reported by Norbert Eicker.
-* Thu Aug 08 2002 ke@suse.de
- Add the third slash for "file:///' again (necessary because I removed
-  one from the variable assignemnt).
-* Wed Aug 07 2002 mls@suse.de
- Fixed exit status of postinstall script.
-* Wed Aug 07 2002 ke@suse.de
- Drop the SuSEconfig script; reported by Thorsten Kukuk [# 17448].
-* Tue Aug 06 2002 ke@suse.de
- Add missing PreReq (libxml2, zlib); reported by Thorsten Kukuk [#
-  17435].
-* Fri Jul 26 2002 ke@suse.de
- SuSEconfig.docbook_4: Remove CATALOG file with length of zero.
- Add "DTD DocBook XML V4.1" to /etc/xml/docbook_41.xml.
- Drop superfluous slashes ("file:///", not "file:////").
- Fix FPI names in /etc/xml/docbook_41.xml.
-* Fri Jul 26 2002 ke@suse.de
- Actually install the catalogs and make sure applications will find
-  more DTD.
-* Wed Jul 24 2002 ke@suse.de
- Add SGML and XML DTD version 4.2.
- Simplify catalog creation and management.
-* Mon Jun 24 2002 ke@suse.de
- Don't install XML ISO entity links; instead require xmlcharent.
- Start to prepare for release 4.2.
-  Mon May  6 10:40:29 CEST 2002 - ke@suse.de
- Don't try to call the SuSEconfig script as long as the system isn't
-  mounted on "/".
-* Fri May 03 2002 ke@suse.de
- Provide /sbin/conf.d/SuSEconfig.%%{name} to initialize catalogs
-  later if xmlcatalog isn't available at installation time.
-* Thu May 02 2002 ke@suse.de
- Require libxml2 to install proper /etc/xml catalog files.
- Maintain /etc/xml catalog files via %%post/%%postun.
-* Mon Aug 27 2001 ke@suse.de
- Rename README.SuSE to docbook_4-README.SuSE.
- Install DTD and ENTITY links using install-dtd.sh to support
-  Emacs/PSGML.
- Cleanup spec file.
- Add sgml-skel to 'neededforbuild'.
-* Tue Mar 13 2001 ke@suse.de
- Rename package: docbk_4 -> docbook_4 (cf. docbook_3).
- Update XML DTD (version 4.1.2).
- Add 'OVERRIDE YES' to XML catalog.
- Add README.SuSE.
-* Tue Jun 27 2000 ke@suse.de
- Correct CATALOG entries for entities.
-* Tue Jun 20 2000 ke@suse.de
- Initial package: version 4.1.