packages: rc-scripts/rc-scripts.spec - rel 4; fix static linking with glib2

[arekm]

Author: arekm                        Date: Fri Feb 11 07:59:41 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; fix static linking with glib2

---- Files affected:
packages/rc-scripts:
   rc-scripts.spec (1.344 -> 1.345) 

---- Diffs:

================================================================
Index: packages/rc-scripts/rc-scripts.spec
diff -u packages/rc-scripts/rc-scripts.spec:1.344 packages/rc-scripts/rc-scripts.spec:1.345
--- packages/rc-scripts/rc-scripts.spec:1.344	Fri Feb 11 08:31:34 2011
+++ packages/rc-scripts/rc-scripts.spec	Fri Feb 11 08:59:36 2011
@@ -10,7 +10,7 @@
 Summary(tr.UTF-8):	inittab ve /etc/rc.d dosyaları
 Name:		rc-scripts
 Version:	0.4.3.8
-Release:	3
+Release:	4
 License:	GPL v2
 Group:		Base
 Source0:	ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
@@ -120,7 +120,8 @@
 %configure \
 	--with-localedir=%{localedir}
 %{__make} \
-	%{!?with_static:ppp_watch_LDADD="-lglib-2.0" ppp_watch_DEPENDENCIES=}
+	%{?with_static:ppp_watch_LDADD="-Wl,-static $(pkg-config --libs --static glib-2.0) -Wl,-Bdynamic" ppp_watch_DEPENDENCIES=} \
+	%{!?with_static:ppp_watch_LDADD="$(pkg-config --libs glib-2.0)" ppp_watch_DEPENDENCIES=}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -129,7 +130,8 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	%{!?with_static:ppp_watch_LDADD="-lglib-2.0" ppp_watch_DEPENDENCIES=}
+	%{?with_static:ppp_watch_LDADD="-Wl,-static $(pkg-config --libs --static glib-2.0) -Wl,-Bdynamic" ppp_watch_DEPENDENCIES=} \
+	%{!?with_static:ppp_watch_LDADD="$(pkg-config --libs glib-2.0)" ppp_watch_DEPENDENCIES=}
 
 for i in 0 1 2 3 4 5 6; do
 	install -d $RPM_BUILD_ROOT/etc/rc.d/rc$i.d
@@ -367,6 +369,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.345  2011/02/11 07:59:36  arekm
+- rel 4; fix static linking with glib2
+
 Revision 1.344  2011/02/11 07:31:34  arekm
 - rel 3; net-tools no longer required - needed tools are in hostname.spec which is now required
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts.spec?r1=1.344&r2=1.345&f=u