Use specfile updates from bug #60409.

openjade.spec

@@ -1,24 +1,20 @@
-%define opensp_ver 1.5
 Summary: A DSSSL implementation.
 Name: openjade
 Version: 1.3.2
-Release: 17
+Release: 20
 Prereq: sgml-common >= 0.5
-Prereq: docbook-dtds
+Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz
-Requires: %{name}-libs = %{version}
+Patch0: openjade-ppc64.patch
-Source0: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz
+Patch1: openjade-1.3.1-nsl.patch
-Source1: http://download.sourceforge.net/openjade/OpenSP-%{opensp_ver}.tar.gz
-Patch0: openjade-1.3.1-manpage.patch
-Patch1: openjade-ppc64.patch
-Patch3: opensp-1.5-gcc34.patch
-Patch4: openjade-1.3.1-nsl.patch
 License: Distributable
 Group: Applications/Text
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Prefix: /usr
+Obsoletes: openjade-devel < 1.3.2-17
 Obsoletes: jade
 Provides: jade
-BuildRequires: autoconf, automake, gettext-devel
+
+BuildRequires: opensp-devel
 
 %description
 OpenJade is an implementation of the ISO/IEC 10179:1996 standard DSSSL
@@ -28,84 +24,24 @@ command-line application and a set of components. The DSSSL engine
 inputs an SGML or XML document and can output a variety of formats:
 XML, RTF, TeX, MIF (FrameMaker), SGML, or XML.
 
-%package devel
-Summary: Files for developing applications that use openjade/OpenSP.
-Requires: %{name}-libs = %{version}
-Group: Development/Libraries
 
-%description devel
-The header files, static library, libtool library and man pages for
-developing applications that use openjade/OpenSP.
-
-%package libs
-Summary: Shared libraries needed by openjade and tools.
-Group: System Environment/Libraries
-
-%description libs
-Shared libraries needed by openjade and tools.
-
-%package tools
-Summary: Tools from the openjade package.
-Group: Applications/Text
-Requires: %{name}-libs = %{version}
-
-%description tools
-Tools from the openjade package, such as nsgmls.
-
-%define openjadetop %{_builddir}/%{name}-%{version}
 %prep
-%setup -q -c -a1
+%setup -q
 
-pushd %{openjadetop}/openjade-%{version}
+%patch0 -p1 -b .ppc64
-%patch0 -p1 -b .manpage
+%patch1 -p1
-%patch1 -p1 -b .ppc64
-%patch4 -p1
-popd
 
-pushd %{openjadetop}/OpenSP-%{opensp_ver}
-%patch3 -p1 -b .gcc34
-popd
 
 %build
 
-pushd %{openjadetop}/OpenSP-%{opensp_ver}
+%configure --disable-static --datadir=%{_datadir}/sgml/%{name}
-aclocal
-libtoolize --copy --force
-automake --add-missing --copy
-autoconf --force
-%configure --enable-http --datadir=/usr/share/sgml/%{name}-%{version} \
- --enable-default-catalog=/etc/sgml/catalog \
- --enable-default-search-path=/usr/share/sgml
 make %{?_smp_mflags}
-# This is needed because openjade has an awful hack in its own config.h.
-cp config.h include
-# This is to catch #include <OpenSP/...>
-ln -s . include/OpenSP
-popd
 
-pushd %{openjadetop}/openjade-%{version}
-#cp config/configure.in .
-#libtoolize --copy --force
-%configure --enable-http --datadir=/usr/share/sgml/%{name}-%{version} \
- --enable-spincludedir=%{openjadetop}/OpenSP-%{opensp_ver}/include \
- --enable-splibdir=%{openjadetop}/OpenSP-%{opensp_ver}/lib \
- --enable-default-catalog=/etc/sgml/catalog \
- --enable-default-search-path=/usr/share/sgml
-make %{?_smp_mflags}
-popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-pushd %{openjadetop}/OpenSP-%{opensp_ver}
+make install install-man DESTDIR=$RPM_BUILD_ROOT
-%makeinstall datadir=$RPM_BUILD_ROOT/usr/share/sgml/%{name}-%{version}
-make install-man mandir=$RPM_BUILD_ROOT/%{_mandir}
-popd
-
-pushd %{openjadetop}/openjade-%{version}
-%makeinstall datadir=$RPM_BUILD_ROOT/usr/share/sgml/%{name}-%{version}
-make install-man mandir=$RPM_BUILD_ROOT/%{_mandir}
-popd
 
 # Fix up libtool libraries
 find $RPM_BUILD_ROOT -name '*.la' | \
@@ -114,85 +50,65 @@ find $RPM_BUILD_ROOT -name '*.la' | \
 # oMy, othis ois osilly.
 ln -s openjade $RPM_BUILD_ROOT/%{prefix}/bin/jade
 echo ".so man1/openjade.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/jade.1
-for file in nsgmls sgmlnorm spam spent sx ; do
-   ln -s o$file $RPM_BUILD_ROOT/%{prefix}/bin/$file
-   echo ".so man1/o${file}.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/${file}.1
-done
-
-mv $RPM_BUILD_ROOT/%{prefix}/bin/sx $RPM_BUILD_ROOT/%{prefix}/bin/sgml2xml
-mv $RPM_BUILD_ROOT/%{_mandir}/man1/{sx,sgml2xml}.1
 
 # install jade/jade $RPM_BUILD_ROOT/%{prefix}/bin/jade 
-cp %{openjadetop}/openjade-%{version}/dsssl/catalog $RPM_BUILD_ROOT/%{prefix}/share/sgml/%{name}-%{version}/
+cp dsssl/catalog $RPM_BUILD_ROOT/%{_datadir}/sgml/%{name}/
-cp %{openjadetop}/openjade-%{version}/dsssl/dsssl.dtd \
+cp dsssl/{dsssl,style-sheet,fot}.dtd $RPM_BUILD_ROOT/%{_datadir}/sgml/%{name}/
-  %{openjadetop}/openjade-%{version}/dsssl/style-sheet.dtd \
-  %{openjadetop}/openjade-%{version}/dsssl/fot.dtd \
-  $RPM_BUILD_ROOT/%{prefix}/share/sgml/%{name}-%{version}
 
-rm -rf $RPM_BUILD_ROOT/usr/doc/OpenSP
+# add unversioned/versioned catalog and symlink
-rm -rf $RPM_BUILD_ROOT/%{prefix}/share/sgml/%{name}-%{version}/doc
+mkdir -p $RPM_BUILD_ROOT/etc/sgml
+cd $RPM_BUILD_ROOT/etc/sgml
+touch %{name}-%{version}-%{release}.soc
+ln -s %{name}-%{version}-%{release}.soc %{name}.soc
+cd -
 
-# Don't ship Makefiles as doc, since they contain arch-specific
-# stuff (bug #168821).
-rm -f */doc/Makefile */pubtext/Makefile */unicode/Makefile
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+/usr/bin/install-catalog --add /etc/sgml/%{name}-%{version}-%{release}.soc \
+    %{_datadir}/sgml/%{name}/catalog >/dev/null || :
  
-%postun -p /sbin/ldconfig
+%preun
+/usr/bin/install-catalog --remove /etc/sgml/%{name}-%{version}-%{release}.soc \
+    %{_datadir}/sgml/%{name}/catalog /dev/null || :
+
+%postun
+/sbin/ldconfig
 
 %files
 %defattr(-,root,root)
-%doc */doc/ openjade-*/jadedoc/ openjade-*/dsssl/ */pubtext/ */unicode/
+%doc jadedoc/* dsssl/README.jadetex
-%doc --parents */README */COPYING openjade-*/VERSION
+%doc README COPYING VERSION
-%{_bindir}/jade
+%ghost /etc/sgml/%{name}-%{version}-%{release}.soc
-%{_bindir}/openjade
+/etc/sgml/%{name}.soc
-%{_mandir}/*/jade.*
+%{_bindir}/*
-%{_mandir}/*/openjade.*
-
-%files libs
-%defattr(-,root,root)
-%{_libdir}/*.so.*
-%{prefix}/share/sgml
-
-%files tools
-%defattr(-,root,root)
-%{_bindir}/nsgmls
-%{_bindir}/onsgmls
-%{_bindir}/osgmlnorm
-%{_bindir}/ospam
-%{_bindir}/ospcat
-%{_bindir}/ospent
-%{_bindir}/osx
-%{_bindir}/sgml2xml
-%{_bindir}/sgmlnorm
-%{_bindir}/spam
-%{_bindir}/spent
-%{_mandir}/*/nsgmls.*
-%{_mandir}/*/onsgmls.*
-%{_mandir}/*/osgmlnorm.*
-%{_mandir}/*/ospam.*
-%{_mandir}/*/ospent.*
-%{_mandir}/*/osx.*
-%{_mandir}/*/sgml2xml.*
-%{_mandir}/*/sgmlnorm.*
-%{_mandir}/*/spam.*
-%{_mandir}/*/spent.*
-
-%files devel
-%defattr(-,root,root)
-%{_libdir}/*.a
 %{_libdir}/*.so
+%{_libdir}/*.so.*
+%{_mandir}/*/*
+%{_datadir}/sgml/%{name}
 %{_libdir}/*.la
-%{_includedir}/*
 
 %changelog
-* Thu Dec  8 2005 Tim Waugh <twaugh@redhat.com> 1.3.2-17
+* Tue Dec 13 2005 Tim Waugh <twaugh@redhat.com> 1.3.2-20
-- Split into separate packages (bug #60409).
+- Move 'install-catalog --remove' to %%preun section (bug #60409).
-- Don't ship Makefiles as doc, since they contain arch-specific
+
-  stuff (bug #168821).
+* Thu Dec  8 2005 Terje Bless <link@pobox.com> - 1.3.2-19
+- Drop -devel subpackage.
+
+* Sun Dec  4 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.2-18
+- Really BuildRequire opensp-devel.
+- Clean up unneeded build dependencies and configure options.
+- Drop dependency on docbook-dtds.
+- Fix %%post(un) syntax and catalog installation.
+
+* Wed Nov 30 2005 Terje Bless <link@pobox.com> 1.3.2-17
+- Split opensp out into its own package.
+- BuildRequire OpenSP-devel, Require OpenSP.
+- Drop openjade-1.3.1-manpage.patch (it patches opensp, not openjade, and is
+  obsolete with external opensp).
 
 * Tue Mar  1 2005 Tim Waugh <twaugh@redhat.com> 1.3.2-16
 - Rebuilt for new GCC.