Hello community,
here is the log from the commit of package docbook2x for openSUSE:Factory checked in at 2019-07-08 15:04:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/docbook2x (Old)
and /work/SRC/openSUSE:Factory/.docbook2x.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docbook2x"
Mon Jul 8 15:04:53 2019 rev:22 rq:713468 version:0.8.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/docbook2x/docbook2x.changes 2017-11-14 14:17:41.950575257 +0100
+++ /work/SRC/openSUSE:Factory/.docbook2x.new.4615/docbook2x.changes 2019-07-08 15:04:54.410886712 +0200
@@ -1,0 +2,11 @@
+Thu Jul 4 14:29:27 UTC 2019 - Stefan Brüns
+
+- Cleanup spec file:
+ * Remove tidy BuildRequires, only used for XSL based HTML generation
+ using --with-html-xsl (defaults to off).
+ * Reorder tags, Group/Source/Url etc first, BuildRequires/Requires last
+ * Remove BuildRoot: tag, use %buildroot
+ * Remove %defattr, use %license and %doc macros
+ * Remove unused macros, expand trivial single use macros
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ docbook2x.spec ++++++
--- /var/tmp/diff_new_pack.WzbSc3/_old 2019-07-08 15:04:55.198887904 +0200
+++ /var/tmp/diff_new_pack.WzbSc3/_new 2019-07-08 15:04:55.198887904 +0200
@@ -1,7 +1,7 @@
#
# spec file for package docbook2x
#
-# 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,26 +12,33 @@
# 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/
#
Name: docbook2x
+Summary: DocBook-to-Texinfo Converter
+License: GPL-2.0-or-later
+Group: Productivity/Publishing/DocBook
+Version: 0.8.8
+Release: 0
+Url: http://docbook2x.sourceforge.net/
+Source: http://downloads.sourceforge.net/docbook2x/docbook2X-%{version}.tar.bz2
+#Source: http://ftp1.sourceforge.net/sourceforge/docbook2x/docbook2X-%%{version}.tar.gz
+Source1: docbook2x-README.SUSE
+Patch: docbook2X-0.8.8-catalog.diff
BuildRequires: automake
BuildRequires: docbook_4
BuildRequires: libxslt-devel
-%if 0%{?suse_version} >= 1200
BuildRequires: makeinfo
-%endif
BuildRequires: openjade
BuildRequires: perl-XML-DOM
BuildRequires: perl-XML-Parser
BuildRequires: perl-XML-SAX
BuildRequires: perl-libwww-perl
BuildRequires: sgml-skel
-BuildRequires: tidy
-Url: http://docbook2x.sourceforge.net/
-Provides: db2x
+Provides: db2x = %{version}
+Obsoletes: db2x < %{version}
Provides: docbook2X
Requires: docbook_4
Requires: openjade
@@ -47,17 +54,6 @@
%define regcat /usr/bin/sgml-register-catalog
PreReq: %{regcat} /usr/bin/xmlcatalog /usr/bin/edit-xml-catalog
PreReq: sed grep awk
-Obsoletes: db2x
-Summary: DocBook-to-Texinfo Converter
-License: GPL-2.0+
-Group: Productivity/Publishing/DocBook
-Version: 0.8.8
-Release: 0
-Source: http://downloads.sourceforge.net/docbook2x/docbook2X-%{version}.tar.bz2
-#Source: http://ftp1.sourceforge.net/sourceforge/docbook2x/docbook2X-%%{version}.tar.gz
-Source1: docbook2x-README.SUSE
-Patch: docbook2X-0.8.8-catalog.diff
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
A new tool based on Perl modules.
@@ -70,25 +66,17 @@
%description doc
A new tool based on Perl modules.
-%define INSTALL install -m755 -s
-%define INSTALL_SCRIPT install -m755
-%define INSTALL_DIR install -d -m755
-%define INSTALL_DATA install -m644
-
%prep
-#echo %%{_docdir}
-#echo %%{_defaultdocdir}
%setup -q -n docbook2X-%{version}
cp %{S:1} README.SUSE
%patch -p 1
-%define perl_site %(TMP=%{perl_sitearch}; echo ${TMP%/*})
%build
autoreconf --force --install
%configure --with-xmldecl=/usr/share/sgml/opensp/xml.dcl
sed -i.bak 's/${prefix}/\/usr/' perl/config.pl
# exit 1
-make htmldir=%{_docdir}/%{name}/html %{?_smp_mflags}
+%make_build htmldir=%{_docdir}/%{name}/html
%define FOR_ROOT_CAT for-catalog-%{name}-%{version}.xml
xmlcatbin=/usr/bin/xmlcatalog
CATALOG=usr/share/docbook2X/dtd/catalog.xml
@@ -105,25 +93,21 @@
%{FOR_ROOT_CAT}.tmp > %{FOR_ROOT_CAT}
%install
-make install DESTDIR=$RPM_BUILD_ROOT \
+%make_install \
nsgmls_xmldecl=/usr/share/sgml/opensp/xml.dcl \
htmldir=%{_docdir}/%{name}/html
-install -m644 AUTHORS COPYING NEWS README README.SUSE \
- $RPM_BUILD_ROOT%{_docdir}/%{name}
-rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
-mv $RPM_BUILD_ROOT%{_mandir}/man1/docbook2man.1 \
- $RPM_BUILD_ROOT%{_mandir}/man1/docbook-to-man.1
-mv $RPM_BUILD_ROOT%{_mandir}/man1/docbook2texi.1 \
- $RPM_BUILD_ROOT%{_mandir}/man1/docbook-to-texi.1
-mv $RPM_BUILD_ROOT%{_bindir}/docbook2man \
- $RPM_BUILD_ROOT%{_bindir}/docbook-to-man
-mv $RPM_BUILD_ROOT%{_bindir}/docbook2texi \
- $RPM_BUILD_ROOT%{_bindir}/docbook-to-texi
+rm -f %{buildroot}/%{_infodir}/dir
+mv %{buildroot}%{_mandir}/man1/docbook2man.1 \
+ %{buildroot}%{_mandir}/man1/docbook-to-man.1
+mv %{buildroot}%{_mandir}/man1/docbook2texi.1 \
+ %{buildroot}%{_mandir}/man1/docbook-to-texi.1
+mv %{buildroot}%{_bindir}/docbook2man \
+ %{buildroot}%{_bindir}/docbook-to-man
+mv %{buildroot}%{_bindir}/docbook2texi \
+ %{buildroot}%{_bindir}/docbook-to-texi
%perl_process_packlist
-cat_dir=%{buildroot}/etc/xml
-%{INSTALL_DIR} $cat_dir
-%{INSTALL_DATA} %{FOR_ROOT_CAT} $cat_dir
-%define all_cat %{name}-%{version}
+install -m644 -D -t %{buildroot}/etc/xml %{FOR_ROOT_CAT}
+
%define info_files docbook2texi-xslt docbook2man-xslt docbook2X
%post
@@ -149,13 +133,13 @@
done
%files
-%defattr(-, root, root)
%config %{_sysconfdir}/xml/%{FOR_ROOT_CAT}
%{_bindir}/*
%{_datadir}/docbook2X
%files doc
-%defattr(-, root, root)
+%license COPYING
+%doc AUTHORS NEWS README README.SUSE
%{_docdir}/%{name}
%{_infodir}/*
%{_mandir}/*/*
