Accepting request 541551 from Publishing

- Run spec-cleaner

- Rename README.SuSE to README.SUSE, adhering to the correct
  spelling.
- Set RPM group for -devel package to "Development/Languages/C and
  C++" (fix rpmlint warning).

OBS-URL: https://build.opensuse.org/request/show/541551
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openjade?expand=0&rev=22
This commit is contained in:
Dominique Leuenberger 2017-11-16 12:57:28 +00:00 committed by Git OBS Bridge
commit e8127968e3
3 changed files with 71 additions and 96 deletions

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Nov 13 17:13:49 UTC 2017 - mpluskal@suse.com
- Run spec-cleaner
-------------------------------------------------------------------
Mon Nov 13 15:12:52 UTC 2017 - dimstar@opensuse.org
- Rename README.SuSE to README.SUSE, adhering to the correct
spelling.
- Set RPM group for -devel package to "Development/Languages/C and
C++" (fix rpmlint warning).
-------------------------------------------------------------------
Mon Feb 15 12:58:47 UTC 2016 - rguenther@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package openjade
#
# Copyright (c) 2016 SUSE LINUX 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
@ -16,32 +16,31 @@
#
%define regcat %{_bindir}/sgml-register-catalog
Name: openjade
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: opensp-devel
Version: 1.3.2
Release: 0
Summary: DSSSL Engine for SGML Documents
License: MIT
Group: Productivity/Publishing/SGML
Url: http://openjade.sourceforge.net/
Source: http://switch.dl.sourceforge.net/sourceforge/openjade/openjade-1.3.2.tar.bz2
Source1: jade_style-sheet.dtd
Source2: %{name}-README.SuSE
Source2: %{name}-README.SUSE
Patch1: openjade-1.3.1-autoconf.dif
Patch2: openjade-1.3.2-makefile.patch
Patch3: openjade-1.3.2-shared.patch
Patch4: gcc46_default_ctors.patch
Patch5: openjade-1.3.2-getopts.patch
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: opensp-devel
Requires: opensp
Requires(pre): %{regcat}
# Conflicts: jade_dsl
Obsoletes: jade_dsl
Provides: jade
Provides: jade_dsl
Requires: opensp
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://openjade.sourceforge.net/
%define regcat /usr/bin/sgml-register-catalog
PreReq: %{regcat}
%description
OpenJade, the follow-up to Jade by James Clark, is an implementation of
@ -53,59 +52,27 @@ It has back-ends for SGML, RTF, MIF, TeX, and HTML.
The parser, "nsgmls," and helper tools like "sgmlnorm," "spam,"
"spent," and "sx" are now included in the separate "opensp" package.
Authors:
--------
Avi Kivity
Cees de Groot <cg@sgmltools.org>
David Megginson <dmeggins@microstar.com>
Didier PH Martin
Ian Castle <icastle@users.sourceforge.net>
James Clark <jjc@jclark.com>
Kathleen Marszalek
Matthias Clasen <clasen@mathematik.uni-freiburg.de>
Paul Prescod <papresco@calum.csclub.uwaterloo.ca>
Peter Nilsson
Sebastian Rahtz <s.rahtz@elsevier.co.uk>
%package devel
Summary: DSSSL Engine (development package)
Group: Productivity/Publishing/SGML
Group: Development/Languages/C and C++
Requires: %{name} = %{version}
%description devel
Libraries and includes to compile applications that use the OpenJade
framework (package 'openjade').
Authors:
--------
Avi Kivity
Cees de Groot <cg@sgmltools.org>
David Megginson <dmeggins@microstar.com>
Didier PH Martin
Ian Castle <icastle@users.sourceforge.net>
James Clark <jjc@jclark.com>
Kathleen Marszalek
Matthias Clasen <clasen@mathematik.uni-freiburg.de>
Paul Prescod <papresco@calum.csclub.uwaterloo.ca>
Peter Nilsson
Sebastian Rahtz <s.rahtz@elsevier.co.uk>
%define INSTALL install -m755 -s
%define INSTALL_DIR install -d -m755
%define INSTALL_DATA install -m644
%define sgml_dir %{_datadir}/sgml
%define sgml_dir_pkg %{sgml_dir}/%{name}
%define sgml_var_dir /var/lib/sgml
%define sgml_var_dir %{_localstatedir}/lib/sgml
%prep
%setup -q
# -n %{name}-1.3.2-rc2
cp %{S:1} dsssl
cp %{S:2} README.SuSE
# -n %%{name}-1.3.2-rc2
cp %{SOURCE1} dsssl
cp %{SOURCE2} README.SUSE
%patch1
%patch2 -p1
%patch3
@ -114,10 +81,10 @@ cp %{S:2} README.SuSE
%build
# export CXXFLAGS='-O'
%if %{suse_version} > 1320
export CXXFLAGS="$RPM_OPT_FLAGS -fno-lifetime-dse"
%if 0%{?suse_version} > 1320
export CXXFLAGS="%{optflags} -fno-lifetime-dse"
%else
export CXXFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="%{optflags}"
%endif
# export CXXFLAGS="-g -march=i486 -mcpu=i686"
# export DEFAULT_SCHEME_BUILTINS=/usr/share/sgml/openjade/builtins.dsl
@ -134,74 +101,74 @@ autoconf --force
# autoreconf --force --install -I config
%configure --disable-static --with-gnu-ld --with-pic \
--datadir=%{sgml_dir}/openjade \
--enable-splibdir=%_libdir \
--enable-splibdir=%{_libdir} \
--enable-http \
--enable-mif \
--enable-default-catalog="CATALOG:/etc/sgml/catalog:%{sgml_dir}/CATALOG"
--enable-default-catalog="CATALOG:%{_sysconfdir}/sgml/catalog:%{sgml_dir}/CATALOG"
# [ -r jade/openjade.orig ] && mv jade/openjade.orig jade/openjade
%{__make} %{?jobs:-j%jobs}
make %{?_smp_mflags}
# # now start building the debug version
# mv jade/openjade jade/openjade.orig
# zcat %{P:5} | patch -s -p 1
# zcat %%{P:5} | patch -s -p 1
# make
# mv jade/openjade jade/openjade-valid-fo
# mv jade/openjade.orig jade/openjade
%install
%{INSTALL_DIR} $RPM_BUILD_ROOT%{_libdir} \
$RPM_BUILD_ROOT%{sgml_dir}/%{name} \
$RPM_BUILD_ROOT%{_includedir}/%{name}
make install DESTDIR=$RPM_BUILD_ROOT
ln -sf openjade $RPM_BUILD_ROOT/usr/bin/jade
[ -r jade/openjade-valid-fo ] && install -s jade/openjade-valid-fo $RPM_BUILD_ROOT%{_bindir}
make install-man DESTDIR=$RPM_BUILD_ROOT
pushd $RPM_BUILD_ROOT%{_mandir}
%{INSTALL_DIR} %{buildroot}%{_libdir} \
%{buildroot}%{sgml_dir}/%{name} \
%{buildroot}%{_includedir}/%{name}
%make_install
ln -sf openjade %{buildroot}%{_bindir}/jade
[ -r jade/openjade-valid-fo ] && install -s jade/openjade-valid-fo %{buildroot}%{_bindir}
make install-man DESTDIR=%{buildroot}
pushd %{buildroot}%{_mandir}
# find . ! -name 'jade*' -exec rm -f {} \;
pushd man1 && ln -sf openjade.1 jade.1 && popd
popd
/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
# %{INSTALL_DATA} include/*.* $RPM_BUILD_ROOT%{_includedir}/%{name}
%{INSTALL_DATA} generic/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}
%{INSTALL_DATA} grove/Node.h $RPM_BUILD_ROOT%{_includedir}/%{name}
/sbin/ldconfig -n %{buildroot}%{_libdir}
# %%{INSTALL_DATA} include/*.* $RPM_BUILD_ROOT%%{_includedir}/%%{name}
%{INSTALL_DATA} generic/*.h %{buildroot}%{_includedir}/%{name}
%{INSTALL_DATA} grove/Node.h %{buildroot}%{_includedir}/%{name}
%{INSTALL_DATA} spgrove/GroveApp.h \
spgrove/GroveBuilder.h $RPM_BUILD_ROOT%{_includedir}/%{name}
spgrove/GroveBuilder.h %{buildroot}%{_includedir}/%{name}
%{INSTALL_DATA} style/FOTBuilder.h style/GroveManager.h \
style/DssslApp.h style/dsssl_ns.h \
$RPM_BUILD_ROOT%{_includedir}/%{name}
# pushd $RPM_BUILD_ROOT%{_mandir}/man1
%{buildroot}%{_includedir}/%{name}
# pushd $RPM_BUILD_ROOT%%{_mandir}/man1
# popd
# pushd $RPM_BUILD_ROOT%{_bindir}
# pushd $RPM_BUILD_ROOT%%{_bindir}
# popd
# %{INSTALL_DIR} $RPM_BUILD_ROOT/etc/profile.d
# %{INSTALL_DATA} jade_dsl.sh $RPM_BUILD_ROOT/etc/profile.d
%{INSTALL_DIR} $RPM_BUILD_ROOT%{sgml_dir_pkg}
# %%{INSTALL_DIR} $RPM_BUILD_ROOT/etc/profile.d
# %%{INSTALL_DATA} jade_dsl.sh $RPM_BUILD_ROOT/etc/profile.d
%{INSTALL_DIR} %{buildroot}%{sgml_dir_pkg}
# comes with opensp:
# %{INSTALL_DATA} japan.sgmldecl $RPM_BUILD_ROOT%{sgml_dir_pkg}/japan.dcl
# %{INSTALL_DATA} pubtext/xml.dcl $RPM_BUILD_ROOT%{sgml_dir_pkg}/xml.dcl
# sed 's|decl|dcl|' pubtext/xml.soc > $RPM_BUILD_ROOT%{sgml_dir_pkg}/xml.soc
# %%{INSTALL_DATA} japan.sgmldecl $RPM_BUILD_ROOT%%{sgml_dir_pkg}/japan.dcl
# %%{INSTALL_DATA} pubtext/xml.dcl $RPM_BUILD_ROOT%%{sgml_dir_pkg}/xml.dcl
# sed 's|decl|dcl|' pubtext/xml.soc > $RPM_BUILD_ROOT%%{sgml_dir_pkg}/xml.soc
pushd dsssl
%{INSTALL_DATA} catalog dsssl.dtd extensions.dsl fot.dtd style-sheet.dtd \
builtins.dsl jade_style-sheet.dtd $RPM_BUILD_ROOT%{sgml_dir_pkg}
%{INSTALL_DIR} $RPM_BUILD_ROOT%{sgml_var_dir}
builtins.dsl jade_style-sheet.dtd %{buildroot}%{sgml_dir_pkg}
%{INSTALL_DIR} %{buildroot}%{sgml_var_dir}
sed 's:"\([^"]*\(dtd\|dsl\)\)"$:"%{sgml_dir_pkg}/\1":' catalog \
> $RPM_BUILD_ROOT%{sgml_var_dir}/CATALOG.%{name}
ln -sf CATALOG.%{name} $RPM_BUILD_ROOT%{sgml_var_dir}/CATALOG.jade_dsl
cd $RPM_BUILD_ROOT%{sgml_dir} \
> %{buildroot}%{sgml_var_dir}/CATALOG.%{name}
ln -sf CATALOG.%{name} %{buildroot}%{sgml_var_dir}/CATALOG.jade_dsl
cd %{buildroot}%{sgml_dir} \
&& ln -sf ../../..%{sgml_var_dir}/CATALOG.%{name} CATALOG.%{name} \
&& ln -sf ../../..%{sgml_var_dir}/CATALOG.%{name} CATALOG.jade_dsl
popd
%{INSTALL_DIR} $RPM_BUILD_ROOT%{sgml_dir}/James_Clark/dtd
%{INSTALL_DIR} $RPM_BUILD_ROOT%{sgml_dir}/OpenJade/dtd
%{INSTALL_DIR} $RPM_BUILD_ROOT%{sgml_dir}/ISO_IEC_10179:1996/dtd
(cd $RPM_BUILD_ROOT%{sgml_dir}/James_Clark/dtd \
%{INSTALL_DIR} %{buildroot}%{sgml_dir}/James_Clark/dtd
%{INSTALL_DIR} %{buildroot}%{sgml_dir}/OpenJade/dtd
%{INSTALL_DIR} %{buildroot}%{sgml_dir}/ISO_IEC_10179:1996/dtd
(cd %{buildroot}%{sgml_dir}/James_Clark/dtd \
&& ln -sf ../../$RPM_PACKAGE_NAME/jade_style-sheet.dtd DSSSL_Style_Sheet \
&& ln -sf ../../$RPM_PACKAGE_NAME/fot.dtd DSSSL_Flow_Object_Tree)
(cd $RPM_BUILD_ROOT%{sgml_dir}/OpenJade/dtd \
(cd %{buildroot}%{sgml_dir}/OpenJade/dtd \
&& ln -sf ../../$RPM_PACKAGE_NAME/style-sheet.dtd DSSSL_Style_Sheet)
(cd $RPM_BUILD_ROOT%{sgml_dir}/ISO_IEC_10179:1996/dtd \
(cd %{buildroot}%{sgml_dir}/ISO_IEC_10179:1996/dtd \
&& ln -sf ../../$RPM_PACKAGE_NAME/dsssl.dtd DSSSL_Architecture)
# for compatibility with SL <= 8.1
pushd $RPM_BUILD_ROOT%{sgml_dir}
pushd %{buildroot}%{sgml_dir}
pushd %{name}
ln -s ../opensp/japan.dcl .
ln -s ../opensp/opensp-implied.dcl sp_implied.dcl
@ -215,7 +182,7 @@ popd
rm -fr html
cp -a jadedoc html
echo "\
<a href=\"README.SuSE\">README.SuSE</a>
<a href=\"README.SUSE\">README.SUSE</a>
<a href=\"html/index.htm\">OpenJade documentation</a> (html)" > index.html
grep -r include %{buildroot}%{_includedir}
@ -233,11 +200,7 @@ if [ "$1" = "0" -a -x %{regcat} ]; then
fi
exit 0
%clean
rm -fr $RPM_BUILD_ROOT
%files
%defattr(-, root, root)
%doc COPYING NEWS README*
%doc index.html html
%doc dsssl develdoc testsuite
@ -245,9 +208,9 @@ rm -fr $RPM_BUILD_ROOT
%doc releasenotes.{html,pdf}
%{sgml_dir}/openjade
%{_bindir}/*jade*
# %{_mandir}/*/*jade*
# %%{_mandir}/*/*jade*
%{_mandir}/*/*
# %config /etc/profile.d/jade_dsl.sh
# %%config /etc/profile.d/jade_dsl.sh
%{sgml_dir}/CATALOG.%{name}
%config %{sgml_var_dir}/CATALOG.%{name}
#for compatibility <= 8.1
@ -259,7 +222,6 @@ rm -fr $RPM_BUILD_ROOT
%{_libdir}/lib*.so.*
%files devel
%defattr(-, root, root)
%{_includedir}/%{name}
%{_libdir}/lib*.so
%exclude %{_libdir}/*a