From 72ad8c30dde2f739d9d0e279b160dc55095056c2 Mon Sep 17 00:00:00 2001 From: "Graydon, Tracy" Date: Fri, 31 Aug 2012 12:07:35 -0700 Subject: [PATCH 1/1] TIVI-153: add openjade dependency for iputils --- packaging/openjade-1.3.1-nsl.patch | 21 +++ packaging/openjade-deplibs.patch | 40 ++++++ packaging/openjade-ppc64.patch | 27 ++++ packaging/openjade.changes | 278 +++++++++++++++++++++++++++++++++++++ packaging/openjade.spec | 96 +++++++++++++ 5 files changed, 462 insertions(+) create mode 100644 packaging/openjade-1.3.1-nsl.patch create mode 100644 packaging/openjade-deplibs.patch create mode 100644 packaging/openjade-ppc64.patch create mode 100644 packaging/openjade.changes create mode 100644 packaging/openjade.spec diff --git a/packaging/openjade-1.3.1-nsl.patch b/packaging/openjade-1.3.1-nsl.patch new file mode 100644 index 0000000..48d1302 --- /dev/null +++ b/packaging/openjade-1.3.1-nsl.patch @@ -0,0 +1,21 @@ +--- openjade-1.3.1/config/configure.in.lr 2003-09-12 08:03:22.000000000 -0600 ++++ openjade-1.3.1/config/configure.in 2003-09-12 08:03:44.000000000 -0600 +@@ -156,7 +156,6 @@ + then + AC_MSG_RESULT(yes) + AC_DEFINE(SP_HAVE_SOCKET) +- AC_CHECK_LIB(nsl,main,LIBS="$LIBS -lnsl") + AC_CHECK_LIB(socket,main,LIBS="$LIBS -lsocket") + AC_MSG_CHECKING(h_errno in netdb.h) + AC_EGREP_HEADER(h_errno,netdb.h, +--- openjade-1.3.1/configure.lr 2003-09-12 08:35:55.000000000 -0600 ++++ openjade-1.3.1/configure 2003-09-12 08:36:07.000000000 -0600 +@@ -5530,7 +5530,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lnsl $LIBS" ++LIBS="-lXXXnsl $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + #include "confdefs.h" diff --git a/packaging/openjade-deplibs.patch b/packaging/openjade-deplibs.patch new file mode 100644 index 0000000..3466ad7 --- /dev/null +++ b/packaging/openjade-deplibs.patch @@ -0,0 +1,40 @@ +diff -urNp openjade-1.3.2/grove/Makefile.sub devel/grove/Makefile.sub +--- openjade-1.3.2/grove/Makefile.sub 2002-10-20 23:47:24.000000000 +0200 ++++ devel/grove/Makefile.sub 2007-07-23 15:39:23.000000000 +0200 +@@ -1,4 +1,4 @@ + LTVERSION=0:1:0 + LIB=ogrove +-DEPLIBS=-lm ++DEPLIBS=-lm -lstdc++ + OBJS=Node.o LocNode.o +diff -urNp openjade-1.3.2/spgrove/Makefile.sub devel/spgrove/Makefile.sub +--- openjade-1.3.2/spgrove/Makefile.sub 2002-11-15 23:46:50.000000000 +0100 ++++ devel/spgrove/Makefile.sub 2007-07-23 16:06:13.000000000 +0200 +@@ -1,9 +1,10 @@ + LTVERSION=0:1:0 + LIB=ospgrove + INCLUDE=-I$(srcdir)/../grove +-DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \ ++DEPLIBS=$(TOP)/grove/libogrove.la \ ++ -lm -losp -L$(TOP)/grove/.libs \ + -L$(TOP)/lib -L$(TOP)/lib/.libs \ +- $(LIB_THREADS) ++ $(LIB_THREADS) -lstdc++ + OBJS=GroveApp.o GroveBuilder.o SdNode.o + GENSRCS=grove_inst.cxx + +diff -urNp openjade-1.3.2/style/Makefile.sub devel/style/Makefile.sub +--- openjade-1.3.2/style/Makefile.sub 2003-04-18 19:18:10.000000000 +0200 ++++ devel/style/Makefile.sub 2007-07-23 16:08:26.000000000 +0200 +@@ -1,8 +1,8 @@ + LTVERSION=0:1:0 + LIB=ostyle +-DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \ +- -L$(TOP)/lib -L$(TOP)/lib/.libs \ +- -L$(TOP)/spgrove -L$(TOP)/spgrove/.libs ++DEPLIBS=$(TOP)/grove/libogrove.la $(TOP)/spgrove/libospgrove.la \ ++ -lm -losp -L$(TOP)/lib -L$(TOP)/lib/.libs -L$(TOP)/grove/.libs \ ++ -L$(TOP)/spgrove -L$(TOP)/spgrove/.libs -lstdc++ + OBJS=LangObj.o \ + Collector.o \ + DssslApp.o \ diff --git a/packaging/openjade-ppc64.patch b/packaging/openjade-ppc64.patch new file mode 100644 index 0000000..3c05c61 --- /dev/null +++ b/packaging/openjade-ppc64.patch @@ -0,0 +1,27 @@ +--- openjade-1.3.1/Makefile.prog.in.sopwith 2002-01-22 06:57:53.000000000 -0500 ++++ openjade-1.3.1/Makefile.prog.in 2003-02-11 16:59:44.000000000 -0500 +@@ -1,3 +1,4 @@ ++ + # + # Makefile.prog.in - Makerules for bilding programs + # +@@ -11,15 +12,17 @@ + LINKFLAGS = @LINKFLAGS@ + + ALL_LIBS = $(XLIBS) $(LIBS) ++LT_LIBS = $(shell echo $(XLIBS) | sed 's/\.a/.la/g') ++LT_ALL_LIBS = $(shell echo $(ALL_LIBS) | sed 's/\.a/.la/g') + Makefile.lt: +- echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt ++ echo > Makefile.lt + + PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@') + + all: $(PROG) + + $(PROG): $(OBJS) $(COBJS) $(LT_LIBS) +- $(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS) ++ $(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_ALL_LIBS) + + install: $(PROG) + -test -d $(DESTDIR)$(bindir) || \ diff --git a/packaging/openjade.changes b/packaging/openjade.changes new file mode 100644 index 0000000..c4578fd --- /dev/null +++ b/packaging/openjade.changes @@ -0,0 +1,278 @@ +* Fri Aug 31 19:06:40 UTC 2012 - tracy.graydon@intel.com +- TIVI-153: Add as dependency for iputils. imported from MeeGo trunk + +* Mon May 30 2011 Junfeng Dong -1.3.2 +- Add -fpermissive to make it work with gcc 4.6. + +* Mon Feb 11 2008 Ondrej Vasik 1.3.2-31 +- gcc43 rebuild + +* Mon Aug 27 2007 Ondrej Vasik 1.3.2-30 +- changed license tag to BSD +- rebuilt for F8 + +* Mon Jul 23 2007 Ondrej Vasik 1.3.2-29 +- improved dependent libs patch (bug #237500) +- same done for libospgrove.so + +* Fri Feb 9 2007 Tim Waugh 1.3.2-28 +- Don't ship .so or .la files (bug #203635). +- Added dist tag to release. +- Fixed summary. +- Fixed build root. +- Removed prefix tag. + +* Mon Jul 17 2006 Tim Waugh 1.3.2-27 +- Rebuilt. + +* Mon Jul 10 2006 Tim Waugh 1.3.2-26 +- Fix dependent libs for libogrove (bug #198232). + +* Mon Jun 26 2006 Florian La Roche 1.3.2-25 +- add redirection to /dev/null for preun + +* Tue Jun 13 2006 Tim Waugh 1.3.2-24 +- Rebuild against opensp. + +* Fri Feb 10 2006 Jesse Keating - 1.3.2-23.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 1.3.2-23.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Jan 6 2006 Tim Waugh 1.3.2-23 +- Rebuild against new opensp. + +* Mon Dec 19 2005 Tim Waugh 1.3.2-22 +- Fix SOC files. +- Quieten scriptlets. + +* Mon Dec 19 2005 Tim Waugh 1.3.2-21 +- Fix location of catalog. + +* Tue Dec 13 2005 Tim Waugh 1.3.2-20 +- Use --enable-splibdir to prevent ambiguity. +- Move 'install-catalog --remove' to %%preun section (bug #60409). + +* Thu Dec 8 2005 Terje Bless - 1.3.2-19 +- Drop -devel subpackage. + +* Sun Dec 4 2005 Ville Skyttä - 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 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 1.3.2-16 +- Rebuilt for new GCC. + +* Wed Feb 9 2005 Tim Waugh 1.3.2-15 +- Rebuilt. + +* Tue Oct 5 2004 Tim Waugh 1.3.2-14 +- Build requires gettext-devel (bug #134672). + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Mar 19 2004 Tim Waugh 1.3.2-11.2 +- Rebuilt. + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Sat Jan 31 2004 Tim Waugh 1.3.2-10 +- More C++ fixes (for GCC 3.4). + +* Thu Dec 4 2003 Tim Waugh 1.3.2-9 +- No longer need httphost patch. + +* Mon Oct 20 2003 Tim Waugh 1.3.2-8 +- Rebuilt. + +* Tue Sep 23 2003 Florian La Roche 1.3.2-7 +- do not link against -lnsl + +* Thu Aug 7 2003 Tim Waugh 1.3.2-6 +- Rebootstrap to create a libtool that actually works. + +* Wed Aug 6 2003 Tim Waugh 1.3.2-5 +- Rebuilt. + +* Wed Jun 04 2003 Elliot Lee 1.3.2-4 +- rebuilt + +* Thu May 22 2003 Tim Waugh 1.3.2-3 +- Fixes for GCC 3.3. +- Use --parents for %doc. + +* Tue Mar 18 2003 Tim Waugh 1.3.2-2 +- Provide sgml2xml man page (bug #83759). +- Add devel subpackage. + +* Fri Mar 14 2003 Tim Waugh 1.3.2-1 +- OpenSP 1.5, openjade 1.3.2. +- Renumber patches. + +* Thu Feb 13 2003 Elliot Lee 1.3.1-13 +- Add openjade-ppc64.patch + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Jan 7 2003 Jeff Johnson 1.3.1-11 +- don't include -debuginfo files in package. + +* Thu Dec 12 2002 Tim Waugh +- Fix typo in description (bug #79395). + +* Mon Nov 4 2002 Tim Waugh 1.3.1-10 +- Fix DTD retrieval from virtual hosts (bug #77137). + +* Sat Aug 10 2002 Elliot Lee +- rebuilt with gcc-3.2 (we hope) + +* Mon Jul 22 2002 Tim Powers 1.3.1-8 +- rebuild using gcc-3.2-0.1 + +* Fri Jun 21 2002 Tim Powers 1.3.1-7 +- automated rebuild + +* Thu Jun 13 2002 Tim Waugh 1.3.1-6 +- Fix sgmlnorm(1) man page (bug #64136). +- Fix %%files list (bug #64323). + +* Thu May 23 2002 Tim Powers 1.3.1-5 +- automated rebuild + +* Thu Feb 21 2002 Tim Waugh 1.3.1-4 +- Avoid bad triggers. + +* Thu Feb 21 2002 Tim Waugh 1.3.1-3 +- Rebuild in new environment. + +* Mon Jan 28 2002 Tim Waugh 1.3.1-2 +- Ship man pages. + +* Mon Jan 28 2002 Tim Waugh 1.3.1-1 +- 1.3.1. +- Patches no longer needed: decl, strdup, foo, size_t, 31525, indev, + ligature, twosidestartonright. +- Updated lt patch. + +* Mon Jan 14 2002 Tim Waugh 1.3-22 +- Enable build on GCC 3.0 onwards. +- Run libtoolize. + +* Fri Nov 2 2001 Tim Waugh 1.3-21 +- Enable HTTP support. Now a DocBook XML document can be processed by + either xsltproc or openjade. + +* Tue Oct 30 2001 Tim Waugh 1.3-20 +- Apply twosidestartonright patch from Ian Castle. + +* Thu Oct 11 2001 Tim Waugh 1.3-19 +- s/Copyright:/License:/ +- Use %%{_tmppath}. +- Fix up libtool libraries (bug #46212). + +* Wed Sep 12 2001 Tim Powers 1.3-18 +- rebuild with new gcc and binutils + +* Fri Jun 15 2001 Tim Waugh 1.3-17 +- Apply patch from CVS to break up unintentional ligatures (bugs #11497, + #11779) + +* Mon Jun 4 2001 Tim Waugh 1.3-16 +- Apply the iNdev openjade-1.3.patch patch. + +* Tue May 29 2001 Tim Waugh 1.3-15 +- ldconfig (bug #32824). +- Fix up some libtool problems. + +* Fri Apr 27 2001 Bill Nottingham 1.3-14 +- rebuild for C++ exception handling on ia64 +- build with optimization on ia64 + +* Tue Mar 13 2001 Tim Waugh +- Avoid creating bogus TeX output for section headings containing + special characters (#bug 31525). + +* Mon Jan 22 2001 Florian La Roche +- Apply original autoconf patch to s390 s390x only. This patch can + be deleted once s390* uses a current compiler. + +* Thu Jan 19 2001 Tim Waugh +- Don't conflict with stylesheets; require sgml-common >= 0.5 instead. +- Revert autoconf change, as it's still broken. + +* Wed Jan 17 2001 Florian La Roche +- fix this autoconf macro to work on all archs :-) + +* Wed Jan 17 2001 Florian La Roche +- apply patch from Fritz Elfert + - removed explicit stripping + - Added autoconf macro for correctly recognizing if size_t + is unsigned int + +* Tue Jan 16 2001 Tim Waugh +- Default catalog file is /etc/sgml/catalog. + +* Mon Jan 08 2001 Tim Waugh +- Conflict with stylesheets (new-trials location changes). +- /usr/lib/sgml -> /usr/share/sgml/%%{name}-%%{version}. +- Remove %%post and %%postun. + +* Wed Oct 18 2000 Matt Wilson +- rebuilt against g++-2.96-60, fixes jade on alpha + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jul 4 2000 Jakub Jelinek +- Rebuild with new C++ + +* Wed May 31 2000 Matt Wilson +- fix several C++ build problems (declarations) +- build against new libstdc++ + +* Wed May 17 2000 Matt Wilson +- build with -O0 on alpha +- fix -j testing + +* Thu May 5 2000 Bill Nottingham +- openjade is maintained, and actually builds. Let's try that. + +* Thu Mar 9 2000 Bill Nottingham +- this package is way too huge. strip *everything* + +* Mon Feb 21 2000 Matt Wilson +- build with CXXFLAGS="-O2 -ggdb" to work around segfault on alpha + +* Thu Feb 3 2000 Bill Nottingham +- strip binaries + +* Wed Jan 5 2000 Bill Nottingham +- sanitize spec file some + +* Tue Aug 17 1999 Tim Powers +- fixed conflict problem with sgml-tools + +* Sat Jul 17 1999 Tim Powers +- changed buildroot path to /var/tmp +- rebuilt for 6.1 + +* Fri Apr 23 1999 Michael K. Johnson +- quiet scripts + +* Thu Apr 23 1999 Owen Taylor +- Made requires for sgml-common into prereq diff --git a/packaging/openjade.spec b/packaging/openjade.spec new file mode 100644 index 0000000..6719a95 --- /dev/null +++ b/packaging/openjade.spec @@ -0,0 +1,96 @@ +#specfile originally created for Fedora, modified for Moblin Linux +Summary: A DSSSL implementation +Name: openjade +Version: 1.3.2 +Release: 31 +Prereq: sgml-common >= 0.5 +Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz +Patch0: openjade-ppc64.patch +Patch1: openjade-1.3.1-nsl.patch +Patch2: openjade-deplibs.patch +License: BSD +Group: Applications/Text +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Obsoletes: openjade-devel < 1.3.2-17 +Obsoletes: jade +Provides: jade + +BuildRequires: opensp-devel + +%description +OpenJade is an implementation of the ISO/IEC 10179:1996 standard DSSSL +(Document Style Semantics and Specification Language). OpenJade is +based on James Clark's Jade implementation of DSSSL. OpenJade is a +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. + + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 -b .deplibs + + +%build +# >> build pre +export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive" +# << build pre + +%configure --disable-static --datadir=%{_datadir}/sgml/%{name}-%{version} \ + --enable-splibdir=%{_libdir} +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT + +make install install-man DESTDIR=$RPM_BUILD_ROOT + +# Fix up libtool libraries +find $RPM_BUILD_ROOT -name '*.la' | \ + xargs perl -p -i -e "s|-L$RPM_BUILD_DIR[\w/.-]*||g" + +# oMy, othis ois osilly. +ln -s openjade $RPM_BUILD_ROOT/%{_bindir}/jade +echo ".so man1/openjade.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/jade.1 + +# install jade/jade $RPM_BUILD_ROOT/%{prefix}/bin/jade +cp dsssl/catalog $RPM_BUILD_ROOT/%{_datadir}/sgml/%{name}-%{version}/ +cp dsssl/{dsssl,style-sheet,fot}.dtd $RPM_BUILD_ROOT/%{_datadir}/sgml/%{name}-%{version}/ + +# add unversioned/versioned catalog and symlink +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 - + +rm -f $RPM_BUILD_ROOT%{_libdir}/*.so $RPM_BUILD_ROOT%{_libdir}/*.la + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/ldconfig +/usr/bin/install-catalog --add /etc/sgml/%{name}-%{version}-%{release}.soc \ + %{_datadir}/sgml/%{name}-%{version}/catalog >/dev/null 2>/dev/null || : + +%preun +/usr/bin/install-catalog --remove /etc/sgml/%{name}-%{version}-%{release}.soc \ + %{_datadir}/sgml/%{name}-%{version}/catalog >/dev/null 2>/dev/null || : + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root) +%doc jadedoc/* dsssl/README.jadetex +%doc README COPYING VERSION +%ghost /etc/sgml/%{name}-%{version}-%{release}.soc +/etc/sgml/%{name}.soc +%{_bindir}/* +%{_libdir}/*.so.* +%{_mandir}/*/* +%{_datadir}/sgml/%{name}-%{version} + -- 2.7.4