From 3a553b17b5ab49873457c623f6006c8b1ccf426f42ce776ec39658d1f0a28733 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 14 Jan 2010 18:01:44 +0000 Subject: [PATCH] Accepting request 29347 from Publishing Copy from Publishing/svg-schema based on submit request 29347 from user coolo OBS-URL: https://build.opensuse.org/request/show/29347 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/svg-schema?expand=0&rev=5 --- svg-schema.changes | 9 +++++++ svg-schema.spec | 58 ++++++++++------------------------------------ 2 files changed, 21 insertions(+), 46 deletions(-) diff --git a/svg-schema.changes b/svg-schema.changes index 8a9ba75..8c49e76 100644 --- a/svg-schema.changes +++ b/svg-schema.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Dec 24 13:18:24 UTC 2009 - aj@suse.de + +- Use fdupes to reduce duplicate waste. + +- Only remove file from catalog if it disappeared. + +- Do not use release numbers, they're not needed anymore. + ------------------------------------------------------------------- Wed May 2 13:34:02 CEST 2007 - ke@suse.de diff --git a/svg-schema.spec b/svg-schema.spec index 19e2d42..2dff5a4 100644 --- a/svg-schema.spec +++ b/svg-schema.spec @@ -1,7 +1,7 @@ # # spec file for package svg-schema (Version 20030114) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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,10 +19,10 @@ Name: svg-schema -BuildRequires: sgml-skel unzip +BuildRequires: fdupes sgml-skel unzip Summary: SVG DTDs and Documentation Version: 20030114 -Release: 100 +Release: 101 Group: Productivity/Graphics/Other BuildArch: noarch Provides: svg-dtd @@ -32,7 +32,7 @@ Requires: sgml-skel libxml2 PreReq: %{regcat} /usr/bin/xmlcatalog /usr/bin/edit-xml-catalog PreReq: sed grep awk #Provides: -License: BSD 3-Clause +License: BSD3c Url: http://www.w3.org/Graphics/SVG/ Source0: http://www.w3.org/TR/2001/REC-SVG-20010904/REC-SVG-20010904.zip Source1: http://www.w3.org/TR/SVG11/REC-SVG11-20030114.zip @@ -124,7 +124,7 @@ pushd $RPM_BUILD_ROOT%{sgml_dir} done popd xmlcatbin=/usr/bin/xmlcatalog -%define FOR_ROOT_CAT for-catalog-%{name}-%{version}-%{release}.xml +%define FOR_ROOT_CAT for-catalog-%{name}-%{version}.xml rm -f %{FOR_ROOT_CAT}.tmp $xmlcatbin --noout --create %{FOR_ROOT_CAT}.tmp $xmlcatbin --noout --add "delegatePublic" "-//W3C//DTD SVG 1.0//EN" \ @@ -149,7 +149,7 @@ $xmlcatbin --noout --add "uri" \ "file://%{xml_mod_rng_dir}/1.1/svg11.rng" %{FOR_ROOT_CAT}.tmp # Create tag sed '/ + /<\/catalog/i\ ' \ %{FOR_ROOT_CAT}.tmp > %{FOR_ROOT_CAT} @@ -157,6 +157,7 @@ cat_dir=%{buildroot}/etc/xml %{INSTALL_DIR} $cat_dir %{INSTALL_DATA} %{FOR_ROOT_CAT} $cat_dir %define all_cat svg-1.0 svg-1.1 +%fdupes $RPM_BUILD_ROOT %post if [ -x %{regcat} ]; then @@ -174,8 +175,11 @@ if [ "$1" = "0" -a -x %{regcat} ]; then %{regcat} -r %{sgml_dir}/CATALOG.$c >/dev/null 2>&1 || : done fi -edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{name}-%{version}-%{release} +# 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} +fi exit 0 %clean @@ -191,41 +195,3 @@ rm -fr $RPM_BUILD_ROOT %{xml_mod_dir} %changelog -* Wed May 02 2007 ke@suse.de -- Rename svg-dtd to svg-schema -- Add RNG schema files as proposed by Thomas Schraitle. -* Thu Mar 29 2007 ke@suse.de -- Add BuildRequires: unzip -* Tue Feb 27 2007 ke@suse.de -- Fix fix typo in postun script; reported by Florian La Roche [# - 249023]. -* Thu Jan 11 2007 ke@suse.de -- Remove /usr/share/xml from the files list. -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Wed Jun 29 2005 ke@suse.de -- Provide XML catalog entries for "-//W3C//ENTITIES SVG 1.1" and - "-//W3C//ELEMENTS SVG 1.1"; reported by Berthold Gunreben. -* Tue Jun 28 2005 ke@suse.de -- Remove wrong references in svg-1.1.xml catalog file. -* Tue Jun 28 2005 ke@suse.de -- Add systemIds to the catalog files. -- Stop creating compat links. -* Mon Feb 23 2004 hmacht@suse.de -- added option # norootforbuild in specfile -* Thu Feb 12 2004 ke@suse.de -- Adjust directories according to FHS 2.3: - * Move DTDs to /usr/share/xml/svg/schema/dtd. - * Provide compatibility links for SL =< 9.0 (log this info in - /var/adm/SuSEconfig/run-sgmldir-links for later processing). -* Thu Jan 22 2004 ro@suse.de -- added "exit 0" as temporary workaround to postinstall -* Fri Jun 06 2003 ke@suse.de -- Add version 1.1. -- Use absolute links. -- Use edit-xml-catalog to register xml catalog fragments. -* Mon Feb 24 2003 ke@suse.de -- In %%post drop brain dead file check which cause re-creation of an - empty xml catalog file; reported by Thomas Schraitle [# 24186]. -* Fri Dec 06 2002 ke@suse.de -- New package: SVG 1.0; cf. [# 12050].