rpms/openjade
5
0
Fork 0
Code Issues Pull Requests Releases Activity

do not require OpenSP libosp.la file for build(#485114)

Browse Source
This commit is contained in:
Ondrej Vasik 2009-02-13 12:42:02 +00:00
parent 8c320c241c
commit 2a24612a64
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openjade-nola.patch Normal file
View File

@ -0,0 +1,12 @@
diff -urNp openjade-1.3.2-orig/jade/Makefile.sub openjade-1.3.2/jade/Makefile.sub
--- openjade-1.3.2-orig/jade/Makefile.sub 2002-11-15 23:46:50.000000000 +0100
+++ openjade-1.3.2/jade/Makefile.sub 2009-02-13 11:52:30.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

15
openjade.spec
View File

@ -1,12 +1,13 @@
Summary: A DSSSL implementation
Name: openjade
Version: 1.3.2
Release: 31%{?dist}
Release: 32%{?dist}
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
Patch3: openjade-nola.patch
License: BSD
Group: Applications/Text
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -30,6 +31,7 @@ XML, RTF, TeX, MIF (FrameMaker), SGML, or XML.
%patch0 -p1
%patch1 -p1
%patch2 -p1 -b .deplibs
%patch3 -p1 -b .nola
%build
@ -51,7 +53,7 @@ find $RPM_BUILD_ROOT -name '*.la' | \
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
# 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}/
@ -71,7 +73,7 @@ rm -rf $RPM_BUILD_ROOT
/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 || :
@ -90,16 +92,19 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/sgml/%{name}-%{version}
%changelog
* Thu Sep 25 2008 Ondrej Vasik <ovasik@redhat.com> 1.3.2-32
- do not require OpenSP libosp.la file for build(#485114)
* Mon Feb 11 2008 Ondrej Vasik <ovasik@redhat.com> 1.3.2-31
- gcc43 rebuild
* Mon Aug 27 2007 Ondrej Vasik <ovasik@redhat.com> 1.3.2-30
- changed license tag to BSD
- rebuilt for F8
- rebuilt for F8
* Mon Jul 23 2007 Ondrej Vasik <ovasik@redhat.com> 1.3.2-29
- improved dependent libs patch (bug #237500)
- same done for libospgrove.so
- same done for libospgrove.so
* Fri Feb 9 2007 Tim Waugh <twaugh@redhat.com> 1.3.2-28
- Don't ship .so or .la files (bug #203635).