OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/unixODBC?expand=0&rev=4

unixODBC-2.2.12-dlopen.patch

@@ -1,11 +0,0 @@
---- libltdl/ltdl.c
-+++ libltdl/ltdl.c
-@@ -1107,7 +1107,7 @@
-      lt_user_data loader_data;
-      const char *filename;
- {
--  lt_module   module   = dlopen (filename, LT_GLOBAL | LT_LAZY_OR_NOW);
-+  lt_module   module   = dlopen (filename, LT_LAZY_OR_NOW);
- 
-   if (!module)
-     {

unixODBC-gui-qt.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 13 15:45:51 CEST 2008 - nadvornik@suse.cz
+
+- dropped the dlopen patch, it no longer matches
+
 -------------------------------------------------------------------
 Wed Nov 15 16:54:03 CET 2006 - anosek@suse.cz
 

unixODBC-gui-qt.spec

@@ -2,9 +2,16 @@
 # spec file for package unixODBC-gui-qt (Version 2.2.12)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -14,7 +21,7 @@
 Name:           unixODBC-gui-qt
 BuildRequires:  qt3-devel
 Version:        2.2.12
-Release:        140
+Release:        197
 Summary:        ODBC Configuration  Utility, Data Source Browser, and ODBC Test Tool based
 License:        GPL v2 or later
 Url:            http://www.unixodbc.org/
@@ -29,8 +36,6 @@ Patch5:         unixODBC-iaddr.patch
 Patch6:         unixODBC-nonvoid.patch
 Patch7:         unixODBC-gccwarnings.patch
 Patch8:         unixODBC-%{version}-dm.patch
-# this is applied in %%build
-Patch9:         unixODBC-%{version}-dlopen.patch
 Patch10:        unixODBC-%{version}-libodbcinst-exports.patch
 Patch11:        unixODBC-%{version}-flex.patch
 Patch12:        unixODBC-%{version}-ctracing.patch
@@ -54,7 +59,6 @@ Authors:
 %patch6
 %patch7
 #patch8 -p1
-# %%patch9 is in %%build
 %patch10
 %patch11
 %patch12
@@ -64,7 +68,6 @@ install -m 644 %{S:1} .
 export -n LANG LINGUAS LC_ALL
 rm -rf libltdl
 LIBTOOLIZE="libtoolize --ltdl" autoreconf --force --install
-patch -p0 <"%{P:9}"
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" 
 ./configure \
 	    --prefix=%{_prefix} \
@@ -120,6 +123,8 @@ rm -rf "$RPM_BUILD_ROOT"
 %exclude /usr/include/uodbc_extras.h
 
 %changelog
+* Mon Oct 13 2008 nadvornik@suse.cz
+- dropped the dlopen patch, it no longer matches
 * Wed Nov 15 2006 anosek@suse.cz
 - fixed compiler warning: variable is used before its value is set
   [#218998] (ctracing.patch)

unixODBC.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 13 15:33:25 CEST 2008 - nadvornik@suse.cz
+
+- dropped the dlopen patch, it no longer matches
+
 -------------------------------------------------------------------
 Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de
 

unixODBC.spec

@@ -2,9 +2,16 @@
 # spec file for package unixODBC (Version 2.2.12)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -14,7 +21,7 @@
 Name:           unixODBC
 BuildRequires:  gcc-c++
 Version:        2.2.12
-Release:        84
+Release:        119
 Summary:        ODBC driver manager with some drivers included
 License:        GPL v2 or later; LGPL v2.1 or later
 Url:            http://www.unixodbc.org/
@@ -32,8 +39,6 @@ Patch5:         unixODBC-iaddr.patch
 Patch6:         unixODBC-nonvoid.patch
 Patch7:         unixODBC-gccwarnings.patch
 Patch8:         unixODBC-%{version}-dm.patch
-# this is applied in %%build
-Patch9:         unixODBC-%{version}-dlopen.patch
 Patch10:        %{name}-%{version}-libodbcinst-exports.patch
 Patch11:        %{name}-%{version}-flex.patch
 Patch12:        %{name}-%{version}-sqp.patch
@@ -77,7 +82,6 @@ Authors:
 %patch6
 %patch7
 #patch8 -p1
-# %%patch9 is in %%build
 %patch10
 %patch11
 %patch12
@@ -88,7 +92,6 @@ install -m 644 %{S:1} .
 export -n LANG LINGUAS LC_ALL
 rm -rf libltdl
 LIBTOOLIZE="libtoolize --ltdl" autoreconf --force --install
-patch -p0 <"%{P:9}"
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" 
 ./configure \
 	    --prefix=%{_prefix} \
@@ -154,6 +157,8 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_libdir}/unixODBC/*.la
 
 %changelog
+* Mon Oct 13 2008 nadvornik@suse.cz
+- dropped the dlopen patch, it no longer matches
 * Thu Apr 10 2008 ro@suse.de
 - added baselibs.conf file to build xxbit packages
   for multilib support