packages: libjingle/libjingle.spec, libjingle/bashism.patch (NEW) - use pat...
glen
glen at pld-linux.org
Thu Jan 6 17:26:04 CET 2011
Author: glen Date: Thu Jan 6 16:26:04 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- use patch to be sure correct changes are made
---- Files affected:
packages/libjingle:
libjingle.spec (1.20 -> 1.21) , bashism.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/libjingle/libjingle.spec
diff -u packages/libjingle/libjingle.spec:1.20 packages/libjingle/libjingle.spec:1.21
--- packages/libjingle/libjingle.spec:1.20 Thu Jan 6 11:50:07 2011
+++ packages/libjingle/libjingle.spec Thu Jan 6 17:25:59 2011
@@ -26,6 +26,7 @@
Patch12: 64bittypes.patch
Patch13: qname-threadsafe.patch
# /fedora patches
+Patch100: bashism.patch
BuildRequires: alsa-lib-devel
BuildRequires: autoconf
BuildRequires: automake
@@ -102,8 +103,7 @@
%patch12 -p1
%patch13 -p1
-# bashism
-sed 's/\([A-Z]*\)+=\(.*\)/\1="$\1 \2"/' -i configure.ac
+%patch100 -p1
%build
%{__libtoolize}
@@ -175,6 +175,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.21 2011/01/06 16:25:59 glen
+- use patch to be sure correct changes are made
+
Revision 1.20 2011/01/06 10:50:07 glen
- up to 0.5.1, with fedora patches to build
================================================================
Index: packages/libjingle/bashism.patch
diff -u /dev/null packages/libjingle/bashism.patch:1.1
--- /dev/null Thu Jan 6 17:26:04 2011
+++ packages/libjingle/bashism.patch Thu Jan 6 17:25:59 2011
@@ -0,0 +1,13 @@
+--- libjingle-0.5.1/configure.ac~ 2011-01-06 12:51:25.358586443 +0200
++++ libjingle-0.5.1/configure.ac 2011-01-06 12:51:00.286053622 +0200
+@@ -48,8 +48,8 @@
+ AC_SUBST(OPENSSL_LIBS)
+ AC_DEFINE(SSL_USE_OPENSSL, 1, [Using OpenSSL])
+ AC_DEFINE(FEATURE_ENABLE_SSL, 1, [SSL Enabled])
+- CPPFLAGS+="$OPENSSL_CFLAGS"
+- LDFLAGS+="$OPENSSL_LIBS"
++ CPPFLAGS="$CPPFLAGS "$OPENSSL_CFLAGS""
++ LDFLAGS="$LDFLAGS "$OPENSSL_LIBS""
+ else
+ AC_DEFINE(HAVE_OPENSSL_SSL_H, 0, [Did not find openssl/ssl.h])
+ fi
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libjingle/libjingle.spec?r1=1.20&r2=1.21&f=u
More information about the pld-cvs-commit
mailing list