packages: libldb/libldb.spec, libldb/version-script.patch (NEW) - workaroun...

[glen]

Author: glen                         Date: Sat Oct  1 21:23:24 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- workaround for ! not understood in version script

---- Files affected:
packages/libldb:
   libldb.spec (1.1 -> 1.2) , version-script.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libldb/libldb.spec
diff -u packages/libldb/libldb.spec:1.1 packages/libldb/libldb.spec:1.2
--- packages/libldb/libldb.spec:1.1	Sat Oct  1 23:22:02 2011
+++ packages/libldb/libldb.spec	Sat Oct  1 23:23:19 2011
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+# TODO
+# - really fix the version script error (version-script.patch)
 %define		talloc_version	2.0.5
 %define		tdb_version		1.2.9
 %define		tevent_version	0.9.12
@@ -11,6 +13,7 @@
 URL:		http://ldb.samba.org/
 Source0:	http://samba.org/ftp/ldb/ldb-%{version}.tar.gz
 # Source0-md5:	61145ad9cfe017ce4fca5cbc77b9552b
+Patch0:		version-script.patch
 BuildRequires:	autoconf
 BuildRequires:	docbook-style-xsl
 BuildRequires:	libtalloc-devel >= %{talloc_version}
@@ -71,6 +74,7 @@
 
 %prep
 %setup -q -n ldb-%{version}
+%patch0 -p1
 
 %build
 # note: configure in fact is waf call
@@ -163,5 +167,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2011/10/01 21:23:19  glen
+- workaround for ! not understood in version script
+
 Revision 1.1  2011/10/01 21:22:02  glen
 - new, based on fedora spec

================================================================
Index: packages/libldb/version-script.patch
diff -u /dev/null packages/libldb/version-script.patch:1.1
--- /dev/null	Sat Oct  1 23:23:25 2011
+++ packages/libldb/version-script.patch	Sat Oct  1 23:23:19 2011
@@ -0,0 +1,35 @@
+gcc-6:4.6.1-4.x86_64 somewhy does not handle ! in version script
+remove for now
+
+/usr/bin/ld: error: /home/users/glen/rpm/BUILD.x86_64-linux/ldb-1.1.0/bin/default/ldb.vscript:317:3: syntax error, unexpected '!', expecting STRING or QUOTED_STRING or EXTERN
+
+LDB_1.1.0 {
+    global:
+        !ldb_*module_ops;
+        !ldb_*backend_ops;
+        ldb_*;
+    local: *;
+};
+
+#--- ldb-1.1.0/bin/default/ldb.vscript~	2011-10-02 00:06:24.000000000 +0300
+#+++ ldb-1.1.0/bin/default/ldb.vscript	2011-10-02 00:09:04.052371675 +0300
+#@@ -314,8 +314,6 @@
+# 
+# LDB_1.1.0 {
+# 	global:
+#-		!ldb_*module_ops;
+#-		!ldb_*backend_ops;
+# 		ldb_*;
+# 	local: *;
+# };
+--- ldb-1.1.0/wscript~	2011-04-21 15:42:04.000000000 +0300
++++ ldb-1.1.0/wscript	2011-10-02 00:11:31.109153772 +0300
+@@ -123,7 +123,7 @@
+             # the current modules, not the installed ones
+             modules_dir = os.path.join(os.getcwd(), 'bin/modules/ldb')
+ 
+-        abi_match = '!ldb_*module_ops !ldb_*backend_ops ldb_*'
++        abi_match = 'ldb_*'
+ 
+         bld.SAMBA_LIBRARY('ldb',
+                           COMMON_SRC + ' ' + LDB_MAP_SRC,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libldb/libldb.spec?r1=1.1&r2=1.2&f=u