Hello community,
here is the log from the commit of package rarian for openSUSE:Factory checked
in at 2013-12-30 10:39:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rarian (Old)
and /work/SRC/openSUSE:Factory/.rarian.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rarian"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rarian/rarian.changes 2013-12-22
19:37:34.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.rarian.new/rarian.changes 2013-12-30
10:39:14.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Dec 26 13:26:49 UTC 2013 - dims...@opensuse.org
+
+- Register / deregister Scrollkeeper DTD from the XML Catalog on
+ installation / removal.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rarian.spec ++++++
--- /var/tmp/diff_new_pack.4AaSTk/_old 2013-12-30 10:39:15.000000000 +0100
+++ /var/tmp/diff_new_pack.4AaSTk/_new 2013-12-30 10:39:15.000000000 +0100
@@ -110,6 +110,31 @@
%configure --disable-static --with-pic
%{__make} %{?jobs:-j%jobs}
+# Prepare for the XML Catalog for scrollkeeper compatibility; snipped copied
from scrollkeeper.spec
+xmlcatbin=/usr/bin/xmlcatalog
+CATALOG=scrollkeeper.xml
+$xmlcatbin --noout --create $CATALOG
+$xmlcatbin --noout --add "public" \
+ "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
+ "file://%{_datadir}/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" $CATALOG
+%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
+$xmlcatbin --noout --add "delegatePublic" \
+ "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
+ "file:///$CATALOG" %{FOR_ROOT_CAT}.tmp
+$xmlcatbin --noout --add "rewriteSystem" \
+ "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0"; \
+ "file://%{_datadir}/xml/scrollkeeper/dtds" %{FOR_ROOT_CAT}.tmp
+# Create tag
+sed '/<catalog/a\
+ <group id="%{name}-%{version}">
+/<\/catalog/i\
+ </group>' \
+ %{FOR_ROOT_CAT}.tmp > %{FOR_ROOT_CAT}
+# End scrollkeeper compatibility
+
%install
%makeinstall
rm -f %{buildroot}%{_libdir}/*.la
@@ -119,6 +144,13 @@
mkdir -p %{buildroot}%{_datadir}/xml/scrollkeeper/dtds
cp %{S:1} %{buildroot}%{_datadir}/xml/scrollkeeper/dtds
+# Register the scrollkeeper DTDs for offline usage; replicated from
scrollkeeper's .spec files
+# xml catalog
+cat_dir=%{buildroot}/etc/xml
+install -d -m755 $cat_dir
+# install -m644 %{name}.xml $RPM_BUILD_ROOT/etc/xml/%{name}.xml
+install -m644 %{FOR_ROOT_CAT} scrollkeeper.xml $cat_dir
+
%clean
rm -rf %{buildroot}
@@ -147,12 +179,25 @@
--slave %{_bindir}/scrollkeeper-uninstall scrollkeeper-uninstall
%{_bindir}/rarian-sk-install \
--slave %{_bindir}/scrollkeeper-update scrollkeeper-update
%{_bindir}/rarian-sk-update
+# Update the cache
+%{_bindir}/rarian-sk-update
+
+# Register scrollkeeper DTD
+edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
+ --add /etc/xml/%{FOR_ROOT_CAT}
+
%postun scrollkeeper-compat
# Note: we don't use "$1 -eq 0", to avoid issues if the package gets renamed
if [ ! -f %{_bindir}/rarian-sk-config ]; then
update-alternatives --remove scrollkeeper-config %{_bindir}/rarian-sk-config
fi
+# remove entries only on removal of file
+if [ ! -f %{_sysconfdir}/xml/%{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
+
%posttrans
# Workaround old bug in 11.1/11.2 packages that always removed the symlinks in
# %postun. Can be removed during 12.2 development.
@@ -188,6 +233,8 @@
%defattr(-,root,root)
%{_bindir}/rarian-sk-*
%{_datadir}/xml/
+%{_sysconfdir}/xml/for-catalog-rarian-0.8.1.xml
+%{_sysconfdir}/xml/scrollkeeper.xml
%ghost %{_bindir}/scrollkeeper-config
%ghost %{_bindir}/scrollkeeper-extract
%ghost %{_bindir}/scrollkeeper-gen-seriesid
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
