Hello community, here is the log from the commit of package docbook_4 for openSUSE:Factory checked in at Fri Aug 28 17:54:14 CEST 2009. -------- --- docbook_4/docbook_4.changes 2007-03-29 18:42:54.000000000 +0200 +++ docbook_4/docbook_4.changes 2009-08-17 10:09:28.000000000 +0200 @@ -1,0 +2,7 @@ +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. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docbook_4.spec ++++++ --- /var/tmp/diff_new_pack.EbY2RR/_old 2009-08-28 17:53:49.000000000 +0200 +++ /var/tmp/diff_new_pack.EbY2RR/_new 2009-08-28 17:53:49.000000000 +0200 @@ -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 @@ "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 @@ "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.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 @@ >/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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org