rpms/gambas/F-12 gambas-1.0.19-use-system-ltdl.patch, NONE, 1.1 gambas.spec, 1.38, 1.39

Sat Feb 13 04:12:17 UTC 2010

Author: spot

Update of /cvs/pkgs/rpms/gambas/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25998/F-12

Modified Files:
	gambas.spec 
Added Files:
	gambas-1.0.19-use-system-ltdl.patch 
Log Message:
use system ltdl

gambas-1.0.19-use-system-ltdl.patch:
 Makefile.am            |    2 +-
 acinclude.m4           |    2 +-
 configure.in           |    3 +--
 reconf                 |    8 --------
 src/comp/gbi.c         |    2 --
 src/exec/gbx_library.c |    1 -
 6 files changed, 3 insertions(+), 15 deletions(-)

--- NEW FILE gambas-1.0.19-use-system-ltdl.patch ---
diff -up gambas-1.0.19/acinclude.m4.ltdl gambas-1.0.19/acinclude.m4
--- gambas-1.0.19/acinclude.m4.ltdl	2010-02-12 09:42:25.444764692 -0500
+++ gambas-1.0.19/acinclude.m4	2010-02-12 09:44:14.493639852 -0500
@@ -2365,7 +2365,7 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
   "") enable_ltdl_convenience=yes
       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
   esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+  LIBLTDL="-ldl -lltdl"
   LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
   # For backwards non-gettext consistent compatibility...
   INCLTDL="$LTDLINCL"
diff -up gambas-1.0.19/configure.in.ltdl gambas-1.0.19/configure.in
--- gambas-1.0.19/configure.in.ltdl	2010-02-12 09:40:42.897763666 -0500
+++ gambas-1.0.19/configure.in	2010-02-12 09:40:42.908765485 -0500
@@ -11,8 +11,6 @@ AC_INIT(src/share/gambas.h)
 
 AM_MAINTAINER_MODE
 
-AC_CONFIG_SUBDIRS(libltdl)
-
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(gambas, 1.0.19)
 
@@ -91,6 +89,7 @@ dnl ---- Checks for libraries
 
 AC_CHECK_LIB(m, main, echo -n)
 AC_CHECK_LIB(z, main, echo -n)
+AC_CHECK_LIB(ltdl, main, echo -n)
 
 C_LIB=-lc
 
diff -up gambas-1.0.19/Makefile.am.ltdl gambas-1.0.19/Makefile.am
--- gambas-1.0.19/Makefile.am.ltdl	2010-02-12 09:40:42.886763871 -0500
+++ gambas-1.0.19/Makefile.am	2010-02-12 09:40:42.908765485 -0500
@@ -1,4 +1,4 @@
-SUBDIRS = libltdl src
+SUBDIRS = src
 EXTRA_DIST = TODO reconf app examples spec help debian README README.*
 ##AUTOMAKE_OPTIONS = dist-bzip2
 
diff -up gambas-1.0.19/reconf.ltdl gambas-1.0.19/reconf
--- gambas-1.0.19/reconf.ltdl	2003-12-29 08:16:04.000000000 -0500
+++ gambas-1.0.19/reconf	2010-02-12 09:40:42.908765485 -0500
@@ -8,11 +8,3 @@ autoconf
 #acconfig
 autoheader
 automake -a
-
-cd libltdl
-
-aclocal
-autoconf
-#acconfig
-autoheader
-automake -a
diff -up gambas-1.0.19/src/comp/gbi.c.ltdl gambas-1.0.19/src/comp/gbi.c
--- gambas-1.0.19/src/comp/gbi.c.ltdl	2010-02-12 09:40:42.906781084 -0500
+++ gambas-1.0.19/src/comp/gbi.c	2010-02-12 09:40:42.908765485 -0500
@@ -458,8 +458,6 @@ bool analyze(const char *path)
   if (_verbose)
     fprintf(stderr, "Loading: %s\n", path);
 
-  lt_dlopen_flag = RTLD_LAZY; /* | RTLD_GLOBAL;*/
-
   if (access(path, F_OK))
     error2(path, "not found");
   
diff -up gambas-1.0.19/src/exec/gbx_library.c.ltdl gambas-1.0.19/src/exec/gbx_library.c
--- gambas-1.0.19/src/exec/gbx_library.c.ltdl	2004-10-27 11:26:16.000000000 -0400
+++ gambas-1.0.19/src/exec/gbx_library.c	2010-02-12 09:40:42.908765485 -0500
@@ -500,7 +500,6 @@ PUBLIC void LIBRARY_load(LIBRARY *lib)
     return;
 
   #ifdef USE_LTDL
-    lt_dlopen_flag = RTLD_LAZY;
     lib->handle = lt_dlopenext(lib->path);
   #else
     lib->handle = dlopen(lib->path, RTLD_LAZY);
diff -up gambas-1.0.19/src/lib/net/doc/configure.in.ltdl gambas-1.0.19/src/lib/net/doc/configure.in


Index: gambas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas/F-12/gambas.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- gambas.spec	24 Jul 2009 23:28:41 -0000	1.38
+++ gambas.spec	13 Feb 2010 04:12:17 -0000	1.39
@@ -1,7 +1,7 @@
 Name:		gambas
 Summary: 	IDE based on a basic interpreter with object extensions
 Version: 	1.0.19
-Release: 	11%{?dist}
+Release: 	12%{?dist}
 License: 	GPL+
 Group: 		Development/Tools
 URL: 		http://gambas.sourceforge.net/
@@ -11,6 +11,7 @@ BuildRequires:	kdelibs3-devel, automake,
 BuildRequires:	mysql-devel, postgresql-devel, sqlite-devel, libX11-devel
 BuildRequires:	desktop-file-utils, gettext-devel, curl-devel, libXext-devel
 BuildRequires:	qt-devel, bzip2-devel, libxslt-devel, libxml2-devel
+BuildRequires:	libtool-ltdl-devel
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 # Code is not 64 bit clean.
@@ -24,6 +25,7 @@ Patch2:		gambas-1.0.6-noopt.patch
 Patch3:		gambas-1.0.11-desktopfix.patch
 Patch4:		gambas-1.0.13-gettextfix.patch
 Patch5:		gambas-1.0.16-64bit.patch
+Patch6:		gambas-1.0.19-use-system-ltdl.patch
 
 %description
 Gambas is a free development environment based on a Basic interpreter
@@ -212,7 +214,10 @@ Requires:	%{name}-runtime = %{version}-%
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1 -b .ltdl
 
+# We're using the system copy.
+rm -rf libltdl/
 
 %build
 # Gambas can't deal with -Wp,-D_FORTIFY_SOURCE=2
@@ -243,8 +248,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 # rm -rf $RPM_BUILD_ROOT%{_libdir}/gambas/*.la
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+mkdir -p $RPM_BUILD_ROOT%{_includedir}
 install -m0644 ./app/gambas/.icon/32.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/gambas.png
-install src/share/gambas.h $RPM_BUILD_ROOT/%{_includedir}
+install src/share/gambas.h $RPM_BUILD_ROOT%{_includedir}
 
 desktop-file-install --vendor fedora			\
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications	\
@@ -422,6 +428,9 @@ fi
 %{_datadir}/gambas/info/gb.xml.libxml.xslt.*
 
 %changelog
+* Fri Feb 12 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.19-12
+- use system ltdl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.19-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

