Hello community, here is the log from the commit of package docbook-xsl-stylesheets for openSUSE:Factory checked in at Fri Aug 28 17:55:35 CEST 2009. -------- --- docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes 2009-07-28 11:04:19.000000000 +0200 +++ docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes 2009-08-17 10:01:51.000000000 +0200 @@ -1,0 +2,6 @@ +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. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docbook-xsl-stylesheets.spec ++++++ --- /var/tmp/diff_new_pack.DkptHu/_old 2009-08-28 17:54:42.000000000 +0200 +++ /var/tmp/diff_new_pack.DkptHu/_new 2009-08-28 17:54:42.000000000 +0200 @@ -29,7 +29,7 @@ PreReq: sgml-skel %{regcat} /usr/bin/xmlcatalog Summary: XSL Stylesheets for DocBook 4 Version: 1.75.2 -Release: 1 +Release: 2 Source0: http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{version}.tar.bz2 Source1: http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-doc-%{version}.tar.bz2 # %define pack_vers snapshot @@ -104,7 +104,7 @@ %build xmlcatbin=/usr/bin/xmlcatalog -CATALOG=%{name}-%{version}.xml +CATALOG=%{name}.xml # file:///usr/share/sgml/docbook/ = %{sgml_mod_dir} map it to # %{xml_mod_style_prod_dir}/%{version} $xmlcatbin --noout --create $CATALOG @@ -120,7 +120,7 @@ /usr/bin/xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/current" \ "file://%{xml_mod_style_prod_dir}/%{version}" $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 @@ -132,7 +132,7 @@ # "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} @@ -186,12 +186,12 @@ # popd cat_dir=%{buildroot}/etc/xml %{INSTALL_DIR} $cat_dir -%{INSTALL_DATA} %{FOR_ROOT_CAT} %{name}-%{version}.xml $cat_dir +%{INSTALL_DATA} %{FOR_ROOT_CAT} %{name}.xml $cat_dir # cleanup %fdupes $RPM_BUILD_ROOT -rm -f %{buildroot}%{xml_mod_style_prod_dir}/%{version}/%{name}-%{version}.xml +rm -f %{buildroot}%{xml_mod_style_prod_dir}/%{version}/%{name}.xml cp $cat_dir/%{FOR_ROOT_CAT} \ - %{buildroot}%{xml_mod_style_prod_dir}/%{version}/%{name}-%{version}.xml + %{buildroot}%{xml_mod_style_prod_dir}/%{version}/%{name}.xml chmod +x \ %{buildroot}%{xml_mod_style_prod_dir}/%{version}/extensions/docbook.py \ %{buildroot}%{xml_mod_style_prod_dir}/%{version}/extensions/xslt.py @@ -204,19 +204,24 @@ D=usr/share/sgml rmdir $D/docbkxsl >/dev/null 2>&1 || : test -L $D/docbkxsl -a ! -e $D/docbkxsl && rm -f $D/docbkxsl -edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ +if [ -x /usr/bin/edit-xml-catalog ]; then + edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ --add /etc/xml/%{FOR_ROOT_CAT} +fi %postun -edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ +# remove entries only on removal of file +if [ ! -f %{xml_sysconf_dir}/%{FOR_ROOT_CAT} -a -x /usr/bin/edit-xml-catalog ] ; then + edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ --del %{name}-%{version}-%{release} +fi %clean rm -fr $RPM_BUILD_ROOT %files -f %{name}_list %defattr(-, root, root) -%config %{_sysconfdir}/xml/%{name}-%{version}.xml +%config %{_sysconfdir}/xml/%{name}.xml %config %{_sysconfdir}/xml/%{FOR_ROOT_CAT} %{_defaultdocdir}/%{name} %dir %{xml_mod_style_dir} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org