From 108e0bb43ef594f34f2744621f51fa430e861b1c3b7f15a3529bf01af3c8d354 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 17 Jan 2008 23:02:20 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openjade?expand=0&rev=3 --- openjade-1.3.2-shared.patch | 13 +++++ openjade.changes | 5 ++ openjade.spec | 96 +++++++++++++++++++------------------ 3 files changed, 68 insertions(+), 46 deletions(-) create mode 100644 openjade-1.3.2-shared.patch diff --git a/openjade-1.3.2-shared.patch b/openjade-1.3.2-shared.patch new file mode 100644 index 0000000..ecfb147 --- /dev/null +++ b/openjade-1.3.2-shared.patch @@ -0,0 +1,13 @@ +Index: jade/Makefile.sub +=================================================================== +--- jade/Makefile.sub.orig 2002-11-15 23:46:50.000000000 +0100 ++++ jade/Makefile.sub 2008-01-13 22:43:28.000000000 +0100 +@@ -4,7 +4,7 @@ OBJS=jade.o SgmlFOTBuilder.o RtfFOTBuild + INCLUDE=-I$(srcdir)/../grove -I$(srcdir)/../spgrove -I$(srcdir)/../style + # XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a \ + # ../lib/libosp.a +-XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a $(splibdir)/libosp.a ++XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a $(splibdir)/libosp.so + GENSRCS=JadeMessages.h HtmlMessages.h RtfMessages.h TeXMessages.h \ + HtmlFOTBuilder_inst.cxx RtfFOTBuilder_inst.cxx TeXFOTBuilder_inst.cxx \ + TransformFOTBuilder_inst.cxx MifMessages.h MifFOTBuilder_inst.cxx diff --git a/openjade.changes b/openjade.changes index 05820f5..6ca0a4e 100644 --- a/openjade.changes +++ b/openjade.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 14 13:32:27 CET 2008 - crrodriguez@suse.de + +- fix build to build with recent versions of opensp + ------------------------------------------------------------------- Fri Feb 9 08:49:48 CET 2007 - aj@suse.de diff --git a/openjade.spec b/openjade.spec index d017c0c..b7f1cb0 100644 --- a/openjade.spec +++ b/openjade.spec @@ -1,7 +1,7 @@ # # spec file for package openjade (Version 1.3.2) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -13,9 +13,9 @@ Name: openjade BuildRequires: gcc-c++ opensp-devel License: X11/MIT Group: Productivity/Publishing/SGML -Autoreqprov: on +AutoReqProv: on Version: 1.3.2 -Release: 247 +Release: 295 Summary: DSSSL Engine for SGML Documents Source: http://switch.dl.sourceforge.net/sourceforge/openjade/openjade-1.3.2.tar.bz2 Source1: jade_style-sheet.dtd @@ -24,20 +24,20 @@ Patch: openjade-1.3.1-autoconf.dif Patch3: http://www.astro.gla.ac.uk/users/norman/distrib/openjade-1.3-starlink-0.1.patch Patch4: openjade-1.3.2-makefile.patch Patch5: valid_fo_patch2.gz +Patch6: openjade-1.3.2-shared.patch # Conflicts: jade_dsl Obsoletes: jade_dsl Provides: jade jade_dsl Requires: opensp BuildRoot: %{_tmppath}/%{name}-%{version}-build -URL: http://openjade.sourceforge.net/ +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 -the ISO/IEC 10179:1996 standard DSSSL language (Document Style, -Semantics, and Specification Language); pronounce it "dissl"--it rhymes -with whistle. +the ISO/IEC 10179:1996 standard DSSSL (Document Style, Semantics, and +Specification Language); pronounce it "dissl"--it rhymes with whistle. It has back-ends for SGML, RTF, MIF, TeX, and HTML. @@ -63,7 +63,7 @@ Authors: %package devel Summary: DSSSL Engine (development package) Group: Productivity/Publishing/SGML -Requires: openjade +Requires: %{name} = %{version} %description devel Libraries and includes to compile applications that use the OpenJade @@ -91,6 +91,7 @@ Authors: %define sgml_dir %{_datadir}/sgml %define sgml_dir_pkg %{sgml_dir}/%{name} %define sgml_var_dir /var/lib/sgml + %prep %setup -q # -n %{name}-1.3.2-rc2 @@ -99,6 +100,7 @@ cp %{S:2} README.SuSE %patch -b .autoconf # %setup -n jade-1.2.1 -b 1 -T -D %patch4 -p 1 -b .makefile +%patch6 %build # export CXXFLAGS='-O' @@ -116,16 +118,14 @@ autoconf --force # # not using autoconf, because we don't have Makefile.am and that is # # the only way to pass flags to aclocal called by autoreconf # autoreconf --force --install -I config -./configure --prefix=%{_prefix} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ +%configure --disable-static --with-gnu-ld --with-pic \ --datadir=%{sgml_dir}/openjade \ --enable-splibdir=%_libdir \ --enable-http \ --enable-mif \ --enable-default-catalog="CATALOG:/etc/sgml/catalog:%{sgml_dir}/CATALOG" # [ -r jade/openjade.orig ] && mv jade/openjade.orig jade/openjade -make +%{__make} %{?jobs:-j%jobs} # # now start building the debug version # mv jade/openjade jade/openjade.orig # zcat %{P:5} | patch -s -p 1 @@ -134,7 +134,6 @@ make # mv jade/openjade.orig jade/openjade %install -[ "$RPM_BUILD_ROOT" != "" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT %{INSTALL_DIR} $RPM_BUILD_ROOT%{_libdir} \ $RPM_BUILD_ROOT%{sgml_dir}/%{name} \ $RPM_BUILD_ROOT%{_includedir}/%{name} @@ -204,14 +203,17 @@ cp -a jadedoc html echo "\ README.SuSE OpenJade documentation (html)" > index.html +grep -r include %{buildroot}%{_includedir} %post +/sbin/ldconfig if [ -x %{regcat} ]; then %{regcat} -a %{sgml_dir}/CATALOG.%{name} >/dev/null 2>&1 fi exit 0 %postun +/sbin/ldconfig if [ "$1" = "0" -a -x %{regcat} ]; then %{regcat} -r %{sgml_dir}/CATALOG.%{name} >/dev/null 2>&1 fi @@ -246,98 +248,100 @@ rm -fr $RPM_BUILD_ROOT %defattr(-, root, root) %{_includedir}/%{name} %{_libdir}/lib*.so -%{_libdir}/*a +%exclude %{_libdir}/*a -%changelog -n openjade -* Fri Feb 09 2007 - aj@suse.de +%changelog +* Mon Jan 14 2008 crrodriguez@suse.de +- fix build to build with recent versions of opensp +* Fri Feb 09 2007 aj@suse.de - Add defattr. -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Wed Sep 21 2005 - ke@suse.de +* Wed Sep 21 2005 ke@suse.de - openjade-1.3.2-spgrove-makefile-fix.patch: Remove misleading link specifications; thanks for hints to Dirk Mueller. -* Mon Oct 06 2003 - kukuk@suse.de +* Mon Oct 06 2003 kukuk@suse.de - Remove sgml-skel from needed for build -* Wed May 21 2003 - ke@suse.de +* Wed May 21 2003 ke@suse.de - Install jade manpage properly [# 26995]; reported by Tomas Kouba. - Use %%postun and remove actalog entry on update only. -* Mon May 12 2003 - ro@suse.de +* Mon May 12 2003 ro@suse.de - run libtoolize -* Mon Feb 17 2003 - ke@suse.de +* Mon Feb 17 2003 ke@suse.de - Remove aclocal.m4 and missing before calling aclocal; reported by Olaf Hering. -* Thu Feb 06 2003 - ke@suse.de +* Thu Feb 06 2003 ke@suse.de - Register CATALOG.openjade in /etc/sgml/catalog; reported by Marcus Meissner. -* Thu Jan 30 2003 - ke@suse.de +* Thu Jan 30 2003 ke@suse.de - Stop providing the jade_dsl compatibility link in /usr/share/sgml. - Add README.SuSE: it explains how to create the link if wanted. -* Mon Dec 02 2002 - ke@suse.de +* Mon Dec 02 2002 ke@suse.de - Update to 1.3.2: * Minor fixes to MIF backend. * Correct typo in definition of "attribute" in builtin.dsl. * Fix quoted of ampersand in XML/SGML transformations. -* Wed Nov 27 2002 - ke@suse.de +* Wed Nov 27 2002 ke@suse.de - Link against %%_libdir. -* Tue Nov 26 2002 - ke@suse.de +* Tue Nov 26 2002 ke@suse.de - Update to version 1.3.2rc2. - Make opensp/opensp-devel a package on its own; provide openjade-devel as a subpackage. - Provide compatibility links with jade_dsl (these links will go away on SuSE Linux 9.0). -* Mon Nov 11 2002 - ke@suse.de +* Mon Nov 11 2002 ke@suse.de - Create subpackage opensp-devel (from opensp). - Fix various jade_dsl compatibility issues. -* Fri Nov 08 2002 - ke@suse.de +* Fri Nov 08 2002 ke@suse.de - Prepare package as the default DSSSL engine on SuSE Linux, replacing jade_dsl; provide links for compatibility. - Create subpackage 'opensp'. - Add, but don't activate valid_fo_patch2.gz, provided by N. Lundblad, Peter. -* Wed Aug 21 2002 - ke@suse.de +* Wed Aug 21 2002 ke@suse.de - Rename 'sx' man page to 's2x' resp. 'osgml2xml'. - Don't install files under /usr/share/sgml conflicting with jade_dsl. -* Mon Aug 19 2002 - ke@suse.de +* Mon Aug 19 2002 ke@suse.de - Install man pages; reported by Ian Castle [# 18047]. -* Fri Jun 21 2002 - ke@suse.de +* Fri Jun 21 2002 ke@suse.de - openjade-dtddecl-warning.diff: Remove DTDDECL warning (cf. jade_dsl). - Add convenience links again (take over from jade_dsl) [# 4413]. -* Fri Apr 19 2002 - ro@suse.de +* Fri Apr 19 2002 ro@suse.de - work around linking problem with undefined Options::Options[in-charge](int, char* const*, char const*) -* Tue Apr 09 2002 - ro@suse.de +* Tue Apr 09 2002 ro@suse.de - build with latest automake/autoconf -* Mon Feb 11 2002 - schwab@suse.de +* Mon Feb 11 2002 schwab@suse.de - Remove workaround for ia64. - Simplify config cleanup a bit. -* Mon Feb 11 2002 - ke@suse.de +* Mon Feb 11 2002 ke@suse.de - Update to version 1.3.1 (thus most of our config and build patches are superfluous): - Improve Tex back end; table processing works by far better now. - Fopr more info cf. release notes in the documentation directory. - Don't apply latex back end patch. -* Tue Jun 12 2001 - schwab@suse.de +* Tue Jun 12 2001 schwab@suse.de - Use namespaces with gcc 3.0. - Fix configure script. -* Wed May 09 2001 - mfabian@suse.de +* Wed May 09 2001 mfabian@suse.de - bzip2 sources -* Wed Feb 21 2001 - mmj@suse.de +* Wed Feb 21 2001 mmj@suse.de - Fixed to build on S/390 (yes, I know it's ugly so if someone have a cleaner solution, let me know) -* Mon Jan 29 2001 - ke@suse.de +* Mon Jan 29 2001 ke@suse.de - Apply latex backend patch. - Use more rpm macros. -* Sun Dec 10 2000 - schwab@suse.de +* Sun Dec 10 2000 schwab@suse.de - Fix visibility bugs. -* Thu Nov 23 2000 - ke@suse.de +* Thu Nov 23 2000 ke@suse.de - Don't install convenience links (at the moment they are useless) [partially fix for #4413]. -* Wed Nov 15 2000 - ke@suse.de +* Wed Nov 15 2000 ke@suse.de - Add group tag. - Use spec file macros. -* Fri May 12 2000 - schwab@suse.de +* Fri May 12 2000 schwab@suse.de - Fix for ia64. -* Fri Oct 29 1999 - ke@suse.de +* Fri Oct 29 1999 ke@suse.de - Install `builtins.dsl'. -* Mon Oct 25 1999 - ke@suse.de +* Mon Oct 25 1999 ke@suse.de - Initial package: version 1.3 (bug #172 resolved).