rpms/openjade/devel openjade-deplibs.patch, 1.1, 1.2 openjade.spec, 1.40, 1.41

[Ondrej Vasik (ovasik)]

Author: ovasik

Update of /cvs/extras/rpms/openjade/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22416

Modified Files:
	openjade-deplibs.patch openjade.spec 
Log Message:
fixed more missing dependencies in libostyle.so and libospgrove.so

openjade-deplibs.patch:

Index: openjade-deplibs.patch
===================================================================
RCS file: /cvs/extras/rpms/openjade/devel/openjade-deplibs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openjade-deplibs.patch	10 Jul 2006 16:14:21 -0000	1.1
+++ openjade-deplibs.patch	23 Jul 2007 14:40:37 -0000	1.2
@@ -1,8 +1,40 @@
---- openjade-1.3.2/grove/Makefile.sub.deplibs	2006-07-10 16:35:38.000000000 +0100
-+++ openjade-1.3.2/grove/Makefile.sub	2006-07-10 16:35:46.000000000 +0100
+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 \


Index: openjade.spec
===================================================================
RCS file: /cvs/extras/rpms/openjade/devel/openjade.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- openjade.spec	9 Feb 2007 11:54:51 -0000	1.40
+++ openjade.spec	23 Jul 2007 14:40:37 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: A DSSSL implementation
 Name: openjade
 Version: 1.3.2
-Release: 28%{?dist}
+Release: 29%{?dist}
 Prereq: sgml-common >= 0.5
 Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz
 Patch0: openjade-ppc64.patch
@@ -90,6 +90,10 @@
 %{_datadir}/sgml/%{name}-%{version}
 
 %changelog
+* Mon Jul 23 2007 Ondrej Vasik <ovasik at redhat.com> 1.3.2-29
+- improved dependent libs patch (bug #237500)
+- same done for libospgrove.so 
+
 * Fri Feb  9 2007 Tim Waugh <twaugh at redhat.com> 1.3.2-28
 - Don't ship .so or .la files (bug #203635).
 - Added dist tag to release.