[packages/goldwater] - fix linking dependencies - rel 10

[baggins]

commit 438cd2f32619855541f6a8d83f3b6bc78bc7796e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Aug 6 17:59:19 2013 +0200

    - fix linking dependencies
    - rel 10

 goldwater-link.patch | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 goldwater.spec       |  7 +++--
 2 files changed, 84 insertions(+), 2 deletions(-)
---
diff --git a/goldwater.spec b/goldwater.spec
index f864b2d..239c64a 100644
--- a/goldwater.spec
+++ b/goldwater.spec
@@ -2,7 +2,7 @@ Summary:	Messaging Middleware
 Summary(pl.UTF-8):	Oprogramowanie pośredniczące w komunikacji
 Name:		goldwater
 Version:	1.4.0
-Release:	9
+Release:	10
 License:	GPL
 Group:		Applications
 Source0:	http://www.nfluid.com/download/src/%{name}-%{version}.tgz
@@ -13,6 +13,7 @@ Patch2:		%{name}-soname.patch
 Patch3:		%{name}-pic.patch
 Patch4:		%{name}-make.patch
 Patch5:		%{name}-lvalue.patch
+Patch6:		%{name}-link.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	expat-devel
@@ -81,6 +82,7 @@ Goldwater Messaging Middleware - statyczne biblioteki.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -88,7 +90,8 @@ cp -f /usr/share/automake/config.sub .
 %{__autoconf}
 %configure \
 	cflags=our
-%{__make}
+
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/goldwater-link.patch b/goldwater-link.patch
new file mode 100644
index 0000000..46b8226
--- /dev/null
+++ b/goldwater-link.patch
@@ -0,0 +1,79 @@
+--- goldwater-1.4.0/guardian/Makefile.in~	2013-08-06 17:47:27.742543216 +0200
++++ goldwater-1.4.0/guardian/Makefile.in	2013-08-06 17:48:46.200101141 +0200
+@@ -17,7 +17,7 @@
+ CC = @CC@
+ CFLAGS = @CFLAGS@ -D_SVID_SOURCE @LOCAL_CFLAGS@ -c $(ALLINC)
+ 
+-LFLAG   = -L../gwlib -L at PXLBASE@/lib -lgwtx -lgwdm -lpxtra @LOCAL_LDFLAGS@
++LFLAG   = -L../gwlib -L at PXLBASE@/lib -lgwtx -lgwdm -lpxtra -luuid @LOCAL_LDFLAGS@
+ 
+ OBJS = $(addprefix $(OBJ)/,$(OBJF))
+ 
+--- goldwater-1.4.0/admin/Makefile.in~	2013-08-06 17:47:27.742543216 +0200
++++ goldwater-1.4.0/admin/Makefile.in	2013-08-06 17:49:40.337382411 +0200
+@@ -33,7 +33,7 @@
+ ALLINC  = -I. -I.. -I../gwlib -I at PXLBASE@/include
+ CFLAGS = @CFLAGS@ -D_SVID_SOURCE @LOCAL_CFLAGS@ -DBUILDTARGET='"@BUILDTARGET@"' -c $(ALLINC)
+ 
+-LFLAG   = -L../gwlib -L at PXLBASE@/lib -L/lib @LOCAL_LDFLAGS@ -lgwtx -lpxtra -lreadline
++LFLAG   = -L../gwlib -L at PXLBASE@/lib -L/lib @LOCAL_LDFLAGS@ -lgwtx -lpxtra -lreadline -luuid
+ 
+ OBJS = $(addprefix $(OBJ)/,$(OBJF))
+ 
+--- goldwater-1.4.0/dombridge/Makefile.in~	2013-08-06 17:47:27.742543216 +0200
++++ goldwater-1.4.0/dombridge/Makefile.in	2013-08-06 17:50:05.414333662 +0200
+@@ -18,7 +18,7 @@
+ ALLINC  = -I. -I../gwlib -I../netengine -I at PXLBASE@/include
+ CFLAGS = @CFLAGS@ -D_SVID_SOURCE @LOCAL_CFLAGS@ -c $(ALLINC)
+ 
+-LFLAG   = -L../gwlib -L at PXLBASE@/lib -L../netengine -lgwneng -lgwtx -lgwdm -lpxtra @LOCAL_LDFLAGS@
++LFLAG   = -L../gwlib -L at PXLBASE@/lib -L../netengine -lgwneng -lgwtx -lgwdm -lpxtra @LOCAL_LDFLAGS@ -luuid
+ 
+ OBJS = $(addprefix $(OBJ)/,$(OBJF))
+ 
+--- goldwater-1.4.0/netserver/Makefile.in~	2013-08-06 17:47:27.742543216 +0200
++++ goldwater-1.4.0/netserver/Makefile.in	2013-08-06 17:50:55.494901803 +0200
+@@ -18,7 +18,7 @@
+ ALLINC  = -I. -I../gwlib -I../netengine -I../dombridge -I at PXLBASE@/include
+ CFLAGS = @CFLAGS@ -D_SVID_SOURCE @LOCAL_CFLAGS@ -c $(ALLINC)
+ 
+-LFLAG   = -L../gwlib -L../netengine -L at PXLBASE@/lib -lgwneng -lgwtx -lgwdm -lpxtra @LOCAL_LDFLAGS@
++LFLAG   = -L../gwlib -L../netengine -L at PXLBASE@/lib -lgwneng -lgwtx -lgwdm -lpxtra @LOCAL_LDFLAGS@ -luuid
+ 
+ OBJS = $(addprefix $(OBJ)/,$(OBJF))
+ 
+--- goldwater-1.4.0/gwlib/Makefile.in~	2013-08-06 17:52:37.536058614 +0200
++++ goldwater-1.4.0/gwlib/Makefile.in	2013-08-06 17:54:58.234318616 +0200
+@@ -117,17 +117,17 @@
+ 	ln -sf $@.$(VER_MAJOR).$(VER_MINOR) $@.$(VER_MAJOR)
+ 	ln -sf $@.$(VER_MAJOR).$(VER_MINOR) $@
+ 
+-$(BSLIBSO): $(OBJS) 
++$(BSLIBSO): $(OBJS) $(GWLIBSO)
+ 	@echo Creating shared library $(BSLIBSO)
+ 	@rm -f $@
+-	$(CC) -shared -o$@.$(VER_MAJOR).$(VER_MINOR) -Wl,-soname=$@.$(VER_MAJOR) $(OBJSBS) -L$(PXLIBDIR) -lpxtra
++	$(CC) -shared -o$@.$(VER_MAJOR).$(VER_MINOR) -Wl,-soname=$@.$(VER_MAJOR) $(OBJSBS) -L$(PXLIBDIR) -lpxtra -L./ -lgwtx
+ 	ln -sf $@.$(VER_MAJOR).$(VER_MINOR) $@.$(VER_MAJOR)
+ 	ln -sf $@.$(VER_MAJOR).$(VER_MINOR) $@
+ 
+-$(DOMLIBSO): $(OBJS) 
++$(DOMLIBSO): $(OBJS) $(GWLIBSO)
+ 	@echo Creating shared library $(DOMLIBSO)
+ 	@rm -f $@
+-	$(CC) -shared -o$@.$(VER_MAJOR).$(VER_MINOR) -Wl,-soname=$@.$(VER_MAJOR) $(OBJSDOM) -L$(PXLIBDIR) -lpxtra
++	$(CC) -shared -o$@.$(VER_MAJOR).$(VER_MINOR) -Wl,-soname=$@.$(VER_MAJOR) $(OBJSDOM) -L$(PXLIBDIR) -lpxtra -L./ -lgwtx
+ 	ln -sf $@.$(VER_MAJOR).$(VER_MINOR) $@.$(VER_MAJOR)
+ 	ln -sf $@.$(VER_MAJOR).$(VER_MINOR) $@
+ 
+--- goldwater-1.4.0/netengine/Makefile.in~	2013-08-06 17:56:41.968825447 +0200
++++ goldwater-1.4.0/netengine/Makefile.in	2013-08-06 17:58:36.480119670 +0200
+@@ -59,7 +59,7 @@
+ $(CSENGINESO): $(OBJS) 
+ 	@echo Creating shared library $(CSENGINESO)
+ 	@rm -f $@
+-	$(CC) -shared -o$@.$(VER_MAJOR).$(VER_MINOR) -Wl,-soname=$@.$(VER_MAJOR) $(OBJS) -L$(PXLIBDIR) -lpxtra
++	$(CC) -shared -o$@.$(VER_MAJOR).$(VER_MINOR) -Wl,-soname=$@.$(VER_MAJOR) $(OBJS) -L$(PXLIBDIR) -lpxtra  -L../gwlib -lgwtx
+ 	ln -sf $@.$(VER_MAJOR).$(VER_MINOR) $@.$(VER_MAJOR)
+ 	ln -sf $@.$(VER_MAJOR).$(VER_MINOR) $@
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/goldwater.git/commitdiff/438cd2f32619855541f6a8d83f3b6bc78bc7796e