Mailinglist Archive: opensuse-commit (1097 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package xmlcharent for openSUSE:Factory
checked in at Mon Jan 18 15:12:34 CET 2010.



--------
--- xmlcharent/xmlcharent.changes       2009-01-27 00:30:15.000000000 +0100
+++ /mounts/work_src_done/STABLE/xmlcharent/xmlcharent.changes  2009-12-24 
13:35:12.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Dec 24 12:34:30 UTC 2009 - aj@xxxxxxx
+
+- 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:
------------------
++++++ xmlcharent.spec ++++++
--- /var/tmp/diff_new_pack.XypqTC/_old  2010-01-18 15:11:14.000000000 +0100
+++ /var/tmp/diff_new_pack.XypqTC/_new  2010-01-18 15:11:14.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package xmlcharent (Version 0.3)
 #
-# 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
@@ -20,7 +20,7 @@
 
 Name:           xmlcharent
 BuildRequires:  sgml-skel unzip
-License:        BSD 3-Clause
+License:        BSD3c
 Group:          Productivity/Publishing/XML
 BuildArch:      noarch
 AutoReqProv:    on
@@ -29,7 +29,7 @@
 PreReq:         %{regcat} /usr/bin/xmlcatalog /usr/bin/edit-xml-catalog
 PreReq:         sed grep awk
 Version:        0.3
-Release:        404
+Release:        405
 Summary:        XML Character Entities
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        
http://www.oasis-open.org/committees/docbook/%{name}/%{version}/%{name}-%{version}.zip
@@ -83,7 +83,7 @@
 # } > CATALOG.xmlcharent
 # sed 's:%{xml_mod_dir}/::' CATALOG.xmlcharent > sgml.catalog
 # Prep XML catalog fragment
-%define FOR_ROOT_CAT for-catalog-%{name}-%{version}-%{release}.xml
+%define FOR_ROOT_CAT for-catalog-%{name}-%{version}.xml
 xmlcatbin=/usr/bin/xmlcatalog
 # build root catalog fragment
 rm -f %{FOR_ROOT_CAT}.tmp
@@ -93,13 +93,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
-rm -fr %{buildroot}
 %{INSTALL_DIR} %{buildroot}{%{xml_mod_dir},%{sgml_dir},%{sgml_var_dir}}
 %{INSTALL_DATA} catalog.xml *.ent %{buildroot}%{xml_mod_dir}
 %{INSTALL_DATA} CATALOG.xmlcharent %{buildroot}%{sgml_var_dir}
@@ -148,9 +147,10 @@
   done
 fi
 xmlcatbin=/usr/bin/xmlcatalog
-if [ -x /usr/bin/edit-xml-catalog ]; then 
-/usr/bin/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
+  /usr/bin/edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
+    --del %{name}-%{version}
 fi
 
 %clean




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx