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

fixed more missing dependencies in libostyle.so and libospgrove.so

Browse Source
This commit is contained in:
Ondrej Vasik 2007-07-23 14:40:37 +00:00
parent 60e38410ee
commit c3ec180c72
2 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
openjade-deplibs.patch
View File

@ -1,8 +1,40 @@
--- openjade-1.3.2/grove/Makefile.sub.deplibs 2006-07-10 16:35:38.000000000 +0100 diff -urNp openjade-1.3.2/grove/Makefile.sub devel/grove/Makefile.sub
+++ openjade-1.3.2/grove/Makefile.sub 2006-07-10 16:35:46.000000000 +0100 --- 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 @@ @@ -1,4 +1,4 @@
LTVERSION=0:1:0 LTVERSION=0:1:0
LIB=ogrove LIB=ogrove
-DEPLIBS=-lm -DEPLIBS=-lm
+DEPLIBS=-lm -lstdc++ +DEPLIBS=-lm -lstdc++
OBJS=Node.o LocNode.o 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 \

6
openjade.spec
View File

@ -1,7 +1,7 @@
Summary: A DSSSL implementation Summary: A DSSSL implementation
Name: openjade Name: openjade
Version: 1.3.2 Version: 1.3.2
Release: 28%{?dist} Release: 29%{?dist}
Prereq: sgml-common >= 0.5 Prereq: sgml-common >= 0.5
Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz
Patch0: openjade-ppc64.patch Patch0: openjade-ppc64.patch
@ -90,6 +90,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/sgml/%{name}-%{version} %{_datadir}/sgml/%{name}-%{version}
%changelog %changelog
* Mon Jul 23 2007 Ondrej Vasik <ovasik@redhat.com> 1.3.2-29
- improved dependent libs patch (bug #237500)
- same done for libospgrove.so
* Fri Feb 9 2007 Tim Waugh <twaugh@redhat.com> 1.3.2-28 * Fri Feb 9 2007 Tim Waugh <twaugh@redhat.com> 1.3.2-28
- Don't ship .so or .la files (bug #203635). - Don't ship .so or .la files (bug #203635).
- Added dist tag to release. - Added dist tag to release.