Accepting request 29826 from Publishing

Copy from Publishing/xmlcharent based on submit request 29826 from user coolo

OBS-URL: https://build.opensuse.org/request/show/29826
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xmlcharent?expand=0&rev=7
This commit is contained in:
OBS User autobuild 2010-01-18 14:10:02 +00:00 committed by Git OBS Bridge
parent 8ec4c31973
commit bc8355e019
2 changed files with 16 additions and 46 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Dec 24 12:34:30 UTC 2009 - aj@suse.de
- Only remove file from catalog if it disappeared.
- Do not use release numbers, they're not needed anymore.
-------------------------------------------------------------------
Tue Jan 27 00:29:12 CET 2009 - crrodriguez@suse.de

View File

@ -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 @@ Requires: sgml-skel libxml2
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 @@ s|@DIR@|%{xml_mod_dir}|' %{S:2} >CATALOG.%{name}
# } > 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 @@ $xmlcatbin --noout --add "delegatePublic" "ISO 8879:1986//ENTITIES" \
"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 @@ if [ "$1" = "0" -a -x %{regcat} ]; then
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
@ -168,40 +168,3 @@ rm -fr $RPM_BUILD_ROOT
%dir %{xml_dir}/entities/xmlcharent
%changelog
* Tue Jan 27 2009 crrodriguez@suse.de
- test if /usr/bin/edit-xml-catalog is executable before using it.
* Thu Mar 29 2007 ke@suse.de
- Add BuildRequires: unzip
* Thu Jan 11 2007 ke@suse.de
- Remove /usr/share/xml from the files list.
* Thu Aug 17 2006 ke@suse.de
- Remove SuSEconfig call and a %%post warning for SL < 8.1.
* 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 Nov 03 2004 ke@suse.de
- catalog.xml: Add namespace attribute as reported by Thomas Schraitle.
* Mon May 24 2004 ke@suse.de
- Fix syntax of catalog.xml.
* Mon Feb 09 2004 ke@suse.de
- Adjust directories according to FHS 2.3:
* Move entity files to /usr/share/xml/entities/xmlcharent
* Provide compatibility links for SL =< 9.0 (log this info in
/var/adm/SuSEconfig/run-sgmldir-links for later processing).
* Thu Feb 05 2004 hmacht@suse.de
- added option # norootforbuild in specfile
* Fri Jul 11 2003 ke@suse.de
- Fix typo in suse-catalog.xml entry: s/MathML/ISO 8879:1986/ .
* Fri Jun 06 2003 ke@suse.de
- Unregister sgml catalog at deinstallation only.
* Wed Apr 30 2003 ke@suse.de
- Use /etc/xml/suse-catalog.xml instead of /etc/xml/catalog.
* Fri Dec 13 2002 ke@suse.de
- Now use the original .zip file.
- Remove spurious entry from CATALOG.xmlcharent; reported by Thomas
Schraitle.
- Register catalog file using sgml-register-catalog.
* Mon Jun 24 2002 ke@suse.de
- Initial package: version 0.3cvs (released zip file isn't
accessible since several days...).