Hello community,
here is the log from the commit of package docbook-dsssl-stylesheets for
openSUSE:Factory checked in at 2019-03-07 10:49:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/docbook-dsssl-stylesheets (Old)
and /work/SRC/openSUSE:Factory/.docbook-dsssl-stylesheets.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docbook-dsssl-stylesheets"
Thu Mar 7 10:49:11 2019 rev:19 rq:673111 version:1.79
Changes:
--------
---
/work/SRC/openSUSE:Factory/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets.changes
2017-11-16 13:57:26.181404298 +0100
+++
/work/SRC/openSUSE:Factory/.docbook-dsssl-stylesheets.new.28833/docbook-dsssl-stylesheets.changes
2019-03-07 10:49:13.621872696 +0100
@@ -1,0 +2,10 @@
+Tue Feb 5 14:51:27 UTC 2019 - Jan Engelhardt <[email protected]>
+
+- Replace old $RPM_* shell vars.
+
+-------------------------------------------------------------------
+Thu Jan 31 08:18:22 UTC 2019 - [email protected]
+
+- Do not install in /var/lib; bsc#1093345.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ docbook-dsssl-stylesheets.spec ++++++
--- /var/tmp/diff_new_pack.xjbJ1N/_old 2019-03-07 10:49:14.453872482 +0100
+++ /var/tmp/diff_new_pack.xjbJ1N/_new 2019-03-07 10:49:14.457872481 +0100
@@ -1,7 +1,7 @@
#
# spec file for package docbook-dsssl-stylesheets
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -39,7 +39,6 @@
# Source6: print-dbqanda.dsl
%define pkgdif docbkdsl.dif
Patch0: docbkdsl.dif
-# Patch1: dds-cvs.diff
Requires: docbook_3
Requires: docbook_4
Obsoletes: docbkdsl
@@ -67,8 +66,8 @@
%setup -q -n docbook-dsssl-%{version} -b 1
# cp -p %{S:5} html/dbqanda.dsl
# cp -p %{S:6} print/dbqanda.dsl
-cp -p $RPM_SOURCE_DIR/%{db2html} .
-cp -p $RPM_SOURCE_DIR/%{ld2db} .
+cp -p %{_sourcedir}/%{db2html} .
+cp -p %{_sourcedir}/%{ld2db} .
cp -p %{S:4} README.SUSE
%patch -P 0 -p 0
#patch -P 1 -p 1 -b .cvs
@@ -76,16 +75,14 @@
%build
%install
-doc_dir=$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
-sgml_dir=$RPM_BUILD_ROOT%{_datadir}/sgml
-sgml_dir_db=$RPM_BUILD_ROOT%{_datadir}/sgml/docbook
-sgml_dir_db_sty=$RPM_BUILD_ROOT%{_datadir}/sgml/docbook/dsssl-stylesheets-%{version}
-sgml_config_dir=$RPM_BUILD_ROOT/var/lib/sgml
+doc_dir=%{buildroot}/%{_defaultdocdir}/%{name}
+sgml_dir=%{buildroot}/%{_datadir}/sgml
+sgml_dir_db=%{buildroot}/%{_datadir}/sgml/docbook
+sgml_dir_db_sty=%{buildroot}/%{_datadir}/sgml/docbook/dsssl-stylesheets-%{version}
%{INSTALL_DIR} $sgml_dir_db_sty
cp -a [a-z]* $sgml_dir_db_sty
cp -a VERSION $sgml_dir_db_sty
%{INSTALL_DIR} $doc_dir
-%{INSTALL_DIR} $sgml_config_dir/%{name}-%{version}
%{INSTALL_DIR} $sgml_dir/Norman_Walsh/document
%{INSTALL_DIR} $sgml_dir/Norman_Walsh/dtd
%{INSTALL_DIR} $sgml_dir/IDN_nwalsh.com/dtd
@@ -98,13 +95,9 @@
# CATALOG \"/var/lib/sgml/CATALOG.docbk30\"\n\
# CATALOG \"/var/lib/sgml/CATALOG.docbk41\"\n"\
# >> docbook/CATALOG.docbkdsl
-%{INSTALL_DATA} CATALOG.docbkdsl $sgml_config_dir/CATALOG.%{name}
-pushd $sgml_config_dir
-ln -sf CATALOG.%{name} CATALOG.docbkdsl
-popd
+%{INSTALL_DATA} CATALOG.docbkdsl $sgml_dir/CATALOG.%{name}
pushd $sgml_dir
-ln -sf ../../../var/lib/sgml/CATALOG.%{name} CATALOG.%{name}
-ln -sf ../../../var/lib/sgml/CATALOG.%{name} CATALOG.docbkdsl
+ln -sf CATALOG.%{name} CATALOG.docbkdsl
popd
# documentation
# pushd docbook
@@ -118,17 +111,6 @@
cp %{ld2db} $sgml_dir_db_sty/misc
# cp index.html $doc_dir
cp -p README.SUSE $doc_dir
-pushd common
- rm -f $sgml_dir_db_sty/common/dbl1*.dsl
- rm -f $sgml_dir_db_sty/common/*.ent
- %{INSTALL_DATA} dbl1*.dsl $sgml_config_dir/%{name}-%{version}
- %{INSTALL_DATA} *.ent $sgml_config_dir/%{name}-%{version}
-popd
-pushd $sgml_dir_db_sty/common
- for l in ../../../../../../var/lib/sgml/%{name}-%{version}/*.{dsl,ent}; do
- ln -sf $l .
- done
-popd
pushd $sgml_dir/docbook
rm -f dsssl-stylesheets
ln -sf dsssl-stylesheets-%{version} dsssl-stylesheets
@@ -170,11 +152,6 @@
%files
%defattr(-, root, root)
-%config /var/lib/sgml/CATALOG.%{name}
-/var/lib/sgml/CATALOG.docbkdsl
-%dir /var/lib/sgml/%{name}-%{version}
-%config /var/lib/sgml/%{name}-%{version}/*.dsl
-%config /var/lib/sgml/%{name}-%{version}/*.ent
%{_datadir}/sgml/CATALOG.*
%{_datadir}/sgml/docbook/dsssl-stylesheets
%{_datadir}/sgml/docbook/%{name}
