Mailinglist Archive: opensuse-commit (1215 mails)

< Previous Next >
commit docbook_5 for openSUSE:Factory
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 03 Aug 2009 19:27:16 +0200
  • Message-id: <20090803172716.A866D61B6@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package docbook_5 for openSUSE:Factory
checked in at Mon Aug 3 19:27:16 CEST 2009.


--------
--- docbook_5/docbook_5.changes 2008-02-11 11:35:20.000000000 +0100
+++ /mounts/work_src_done/STABLE/docbook_5/docbook_5.changes 2009-08-03
12:58:38.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Aug 3 10:57:28 CEST 2009 - aj@xxxxxxx
+
+- Only remove file from catalog if it disappeared.
+
+- Do not use release numbers, they're not needed anymore.
+
+- Cleanup some rpmlint warnings: Non-executable-in-bin, duplicate
+ requires, do not remove buildroot.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


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

Other differences:
------------------
++++++ docbook_5.spec ++++++
--- /var/tmp/diff_new_pack.b3RPsL/_old 2009-08-03 19:26:48.000000000 +0200
+++ /var/tmp/diff_new_pack.b3RPsL/_new 2009-08-03 19:26:48.000000000 +0200
@@ -21,11 +21,11 @@
Name: docbook_5
Summary: DocBook Schemas (DTD, RELAX NG, W3C Schema) for Version 5.x
Version: 5.0
-Release: 49
-License: BSD 3-Clause; X11/MIT
+Release: 50
+License: BSD 3-clause (or similar) ; MIT License (or similar)
Group: Productivity/Publishing/DocBook
Requires: iso_ent xmlcharent
-Requires: sgml-skel libxml2
+Requires: libxml2
BuildRequires: sgml-skel
PreReq: /usr/bin/xmlcatalog sgml-skel
PreReq: sed grep awk
@@ -88,7 +88,7 @@
%build
# # build root catalog fragment
xmlcatbin=/usr/bin/xmlcatalog
-CATALOG=docbook_5.xml
+CATALOG=%{name}.xml
$xmlcatbin --create --noout $CATALOG
for v in %{version}; do
# DTD
@@ -255,7 +255,7 @@
esac
done
done
-%define FOR_ROOT_CAT %{name}-%{version}-%{release}.xml
+%define FOR_ROOT_CAT %{name}-%{version}.xml
CATALOG=etc/xml/$CATALOG
rm -f %{FOR_ROOT_CAT}.tmp
$xmlcatbin --noout --create %{FOR_ROOT_CAT}.tmp
@@ -286,23 +286,19 @@
done
# 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
# Create installation structure
%{INSTALL_DIR} $RPM_BUILD_ROOT%{xml_config_dir} \
$RPM_BUILD_ROOT%{_bindir} \
$RPM_BUILD_ROOT%{xml_docbook_style_dir}/upgrade
cat_dir=%{buildroot}/etc/xml
%{INSTALL_DIR} $cat_dir
-%{INSTALL_DATA} %{FOR_ROOT_CAT} docbook_5.xml $cat_dir
+%{INSTALL_DATA} %{FOR_ROOT_CAT} %{name}.xml $cat_dir
%{INSTALL_DIR} $RPM_BUILD_ROOT%{xml_docbook_dtd_dir}/%{version} \
$RPM_BUILD_ROOT%{xml_docbook_rng_dir}/%{version} \
$RPM_BUILD_ROOT%{xml_docbook_sch_dir}/%{version} \
@@ -314,7 +310,7 @@
%{INSTALL_DATA} docbook-$v/xsd/* $RPM_BUILD_ROOT%{xml_docbook_xsd_dir}/$v
done
# Use the last version
-%{INSTALL_DATA} docbook-$v/tools/db4-entities.pl $RPM_BUILD_ROOT%{_bindir}
+%{INSTALL_SCRIPT} docbook-$v/tools/db4-entities.pl $RPM_BUILD_ROOT%{_bindir}
%{INSTALL_DATA} docbook-$v/tools/db4-upgrade.xsl \
$RPM_BUILD_ROOT%{xml_docbook_style_dir}/upgrade
# Install NDVL file(s)
@@ -326,12 +322,15 @@
if [ -x /usr/bin/edit-xml-catalog ]; then
/usr/bin/edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--add /etc/xml/%{FOR_ROOT_CAT}
+ /usr/bin/edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
+ --add /etc/xml/%{name}.xml
fi

%postun
-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@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages