Accepting request 516615 from Publishing

- Small cleanup with help of spec-cleaner

- do not require lynx for build [bsc#1052979]

OBS-URL: https://build.opensuse.org/request/show/516615
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sgmltools-lite?expand=0&rev=16

sgmltools-lite.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Aug 13 08:58:27 UTC 2017 - mpluskal@suse.com
+
+- Small cleanup with help of spec-cleaner
+
+-------------------------------------------------------------------
+Fri Aug 11 11:29:41 UTC 2017 - pgajdos@suse.com
+
+- do not require lynx for build [bsc#1052979]
+
 -------------------------------------------------------------------
 Tue Nov  3 19:09:45 UTC 2009 - coolo@novell.com
 

sgmltools-lite.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package sgmltools-lite (Version 3.0.2)
+# spec file for package sgmltools-lite
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -15,83 +15,84 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
-
-Name:           sgmltools-lite
-# openjade-devel is not required
-BuildRequires:  docbook-dsssl-stylesheets lynx openjade python sgml-skel w3m
-Summary:        SGML Converter Suite
 %define syscfgsgml %{_sysconfdir}/sgml
+%define regcat %{_bindir}/sgml-register-catalog
+%define INSTALL install -m755 -s -p
+%define INSTALL_SCRIPT install -m755 -p
+%define INSTALL_DIR install -d -m755
+%define INSTALL_DATA install -m644 -p
+Name:           sgmltools-lite
 Version:        3.0.2
-Release:        1301
-Group:          Productivity/Publishing/SGML
-Requires:       python w3m
-Requires:       iso_ent docbook-dsssl-stylesheets docbook_3 docbook_4 openjade opensp
-%define regcat /usr/bin/sgml-register-catalog
-PreReq:         %{regcat}
-#Provides:
+Release:        0
+Summary:        SGML Converter Suite
 License:        GPL-2.0+
+Group:          Productivity/Publishing/SGML
 Url:            http://sourceforge.net/projects/sgmltools-lite/
 Source:         http://download.sourceforge.net/sgmltools-lite/sgmltools-lite-%{version}.tar.gz
-Patch:          sgmltools-lite-html.diff
+Patch0:         sgmltools-lite-html.diff
+BuildRequires:  docbook-dsssl-stylesheets
+BuildRequires:  openjade
+BuildRequires:  python
+BuildRequires:  sgml-skel
+BuildRequires:  w3m
+Requires:       docbook-dsssl-stylesheets
+Requires:       docbook_3
+Requires:       docbook_4
+Requires:       iso_ent
+Requires:       openjade
+Requires:       opensp
+Requires:       python
+Requires:       w3m
+Requires(pre):  %{regcat}
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 SGML Converter Suite written in Python.
 
-
-
-%define INSTALL install -m755 -s
-%define INSTALL_SCRIPT install -m755
-%define INSTALL_DIR install -d -m755
-%define INSTALL_DATA install -m644
-
 %prep
 %setup -q
-%patch -p 1
+%patch0 -p 1
 
 %build
 # `make clean' is needed for 3.0.2 (spurious config.* files)
 # 2000-11-02 07:02:08 CET -ke-
-make clean
-CFLAGS=$RPM_OPT_FLAGS \
-./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \
-            --with-etcsgml=%{syscfgsgml}
-make
+make %{?_smp_mflags} clean
+%configure \
+  --with-etcsgml=%{syscfgsgml}
+make %{?_smp_mflags}
 
 %install
 #make install prefix=$RPM_BUILD_ROOT/usr
 # make install.man
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-%{INSTALL_SCRIPT} bin/sgmltools $RPM_BUILD_ROOT%{_bindir}
-%{INSTALL_SCRIPT} bin/sgmlwhich $RPM_BUILD_ROOT%{_bindir}
+mkdir -p %{buildroot}%{_bindir}
+%{INSTALL_SCRIPT} bin/sgmltools %{buildroot}%{_bindir}
+%{INSTALL_SCRIPT} bin/sgmlwhich %{buildroot}%{_bindir}
 %define sgmldir %{_datadir}/sgml
 %define sgmltoolsdir %{sgmldir}/stylesheets/sgmltools
 %define sgmltoolsdtddir %{sgmldir}/dtd/sgmltools
 %define sgmltoolspythondir %{sgmldir}/misc/sgmltools/python
 %define sgmltoolspythonbackendsdir %{sgmltoolspythondir}/backends
-mkdir -p $RPM_BUILD_ROOT%{sgmltoolsdir}
+mkdir -p %{buildroot}%{sgmltoolsdir}
 for i in dsssl/*.dsl dsssl/*.cat; do \
-  %{INSTALL_DATA} $i $RPM_BUILD_ROOT%{sgmltoolsdir}; \
+  %{INSTALL_DATA} $i %{buildroot}%{sgmltoolsdir}; \
 done
-mkdir -p $RPM_BUILD_ROOT%{sgmltoolsdtddir}
+mkdir -p %{buildroot}%{sgmltoolsdtddir}
 for i in dtd/[a-z]*; do \
-  %{INSTALL_DATA} $i $RPM_BUILD_ROOT%{sgmltoolsdtddir}; \
+  %{INSTALL_DATA} $i %{buildroot}%{sgmltoolsdtddir}; \
 done
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-%{INSTALL_DATA} man/sgmltools.1 $RPM_BUILD_ROOT%{_mandir}/man1/sgmltools-lite.1
-mkdir -p $RPM_BUILD_ROOT%{sgmltoolspythonbackendsdir}
+mkdir -p %{buildroot}%{_mandir}/man1
+%{INSTALL_DATA} man/sgmltools.1 %{buildroot}%{_mandir}/man1/sgmltools-lite.1
+mkdir -p %{buildroot}%{sgmltoolspythonbackendsdir}
 for i in python/*.py; do \
-  %{INSTALL_DATA} $i $RPM_BUILD_ROOT%{sgmltoolspythondir}; \
+  %{INSTALL_DATA} $i %{buildroot}%{sgmltoolspythondir}; \
 done
 for i in python/backends/*.py; do \
-  %{INSTALL_DATA} $i $RPM_BUILD_ROOT%{sgmltoolspythonbackendsdir}; \
+  %{INSTALL_DATA} $i %{buildroot}%{sgmltoolspythonbackendsdir}; \
 done
-%{INSTALL_DATA} VERSION $RPM_BUILD_ROOT%{sgmldir}/misc/sgmltools
-mkdir -p $RPM_BUILD_ROOT%{syscfgsgml}
-%{INSTALL_DATA} aliases $RPM_BUILD_ROOT%{syscfgsgml}/aliases
+%{INSTALL_DATA} VERSION %{buildroot}%{sgmldir}/misc/sgmltools
+mkdir -p %{buildroot}%{syscfgsgml}
+%{INSTALL_DATA} aliases %{buildroot}%{syscfgsgml}/aliases
 # catalog is maintained by sgml-skel 2003-05-26 16:13:37 CEST -ke-
 # # install -m 644 catalog.suse $RPM_BUILD_ROOT%{syscfgsgml}/catalog
 # :> $RPM_BUILD_ROOT%{syscfgsgml}/catalog
@@ -123,15 +124,9 @@ if [ -x %{regcat} ]; then
 fi
 exit 0
 
-%clean
-rm -fr $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root)
 %doc README POSTINSTALL index.html COPYING
 %config %{syscfgsgml}/aliases
-# config file now maintained dynamically by sgml-register-catalog
-# %config %{syscfgsgml}/catalog
 %{_bindir}/*
 %{_mandir}/*/*
 %{sgmldir}/*