- 3.1.2

- dropped mdb patch (no longer relevant)
- dropped firebird patch (seems applied in another form)
- libgda-virtual.so seems to have disappeared

Changed files:
    libgda3-configure.patch -> 1.2
    libgda3.spec -> 1.10

diff --git a/libgda3-configure.patch b/libgda3-configure.patch
index 43c00f51f0ec9a577f0254f1c0ba78c3033aeea0..4d2b73a8a1269686a094a286dfdb537dc729350e 100644 (file)
--- a/libgda3-configure.patch
+++ b/libgda3-configure.patch
@@ -92,15 +92,23 @@
        fi
  fi
  
-@@ -751,7 +751,7 @@
-       else
-               AC_DEFINE(HAVE_FIREBIRD, 1, [Have FireBird])
+@@ -823,13 +823,13 @@
                FIREBIRD_CFLAGS="-I${firebirddir}/include"
--              FIREBIRD_LIBS="-L${firebirddir}/lib -lgds -ldl -lcrypt"
-+              FIREBIRD_LIBS="-L${libdir} -lgds -ldl -lcrypt"
+               if test -f $firebirddir/lib/libfbembed.so
+               then
+-                      FIREBIRD_LIBS="-L${firebirddir}/lib -lfbembed"
++                      FIREBIRD_LIBS="-L${libdir} -lfbembed"
+               else
+                       if test -f $firebirddir/lib/libfbclient.so
+                       then
+-                              FIREBIRD_LIBS="-L${firebirddir}/lib -lfbclient"
++                              FIREBIRD_LIBS="-L${libdir} -lfbclient"
+                       else
+-                              FIREBIRD_LIBS="-L${firebirddir}/lib -lgds -ldl -lcrypt"
++                              FIREBIRD_LIBS="-L${libdir} -lgds -ldl -lcrypt"
+                       fi
+               fi
        fi
- fi
- 
 @@ -789,7 +789,7 @@
                AC_MSG_WARN(Xbase backend not used)
        else
@@ -114,8 +122,8 @@
        mdbdir=""
        for d in $dir /usr /usr/local /opt/gnome
        do
--              if test -f $d/include/mdbtools.h -a -f $d/$lib/libmdbsql$libext -o -f $d/include/mdbtools.h -a -f $d/$lib/libmdbsql.a
-+              if test -f $d/include/mdb/mdbtools.h -a -f $d/$lib/libmdbsql$libext -o -f $d/include/mdb/mdbtools.h -a -f $d/$lib/libmdbsql.a
+-              if test -f $d/include/mdbtools.h -a -f $d/$lib/libmdb$libext -o -f $d/include/mdbtools.h -a -f $d/$lib/libmdb.a
++              if test -f $d/include/mdb/mdbtools.h -a -f $d/$lib/libmdb$libext -o -f $d/include/mdb/mdbtools.h -a -f $d/$lib/libmdb.a
                then
                        AC_MSG_RESULT(found MDB Tools in $d)
                        mdbdir=$d
@@ -124,9 +132,9 @@
                AC_MSG_WARN(MDB backend not used)
        else
 -              MDB_CFLAGS=-I${mdbdir}/include
--              MDB_LIBS="-L${mdbdir}/lib -lmdb -lmdbsql"
 +              MDB_CFLAGS=-I${mdbdir}/include/mdb
-+              MDB_LIBS="-L${libdir} -lmdb -lmdbsql"
+-              MDB_LIBS="-L${mdbdir}/lib -lmdb"
++              MDB_LIBS="-L${libdir} -lmdb"
                AC_DEFINE(HAVE_MDB, 1, [Have MDB])
  
                save_CFLAGS="$CFLAGS"

diff --git a/libgda3.spec b/libgda3.spec
index 9e29f9a8ee836c9edb63a83e5d9c0f1bbbba2e3d..5e6001fc46edc5c886e91daeded701d1d6388be8 100644 (file)
--- a/libgda3.spec
+++ b/libgda3.spec
@@ -22,15 +22,13 @@
 Summary:       GNU Data Access library
 Summary(pl.UTF-8):   Biblioteka GNU Data Access
 Name:          libgda3
-Version:       3.1.1
+Version:       3.1.2
 Release:       1
 License:       LGPL v2/GPL v2
 Group:         Applications/Databases
 Source0:       http://ftp.gnome.org/pub/gnome/sources/libgda/3.1/libgda-%{version}.tar.bz2
-# Source0-md5: 1e56331d2b69094312f1f011bd45177f
-Patch0:                %{name}-mdb.patch
+# Source0-md5: fe299d264ddeb7fbc36276f74f1abfdc
 Patch1:                %{name}-configure.patch
-Patch2:                %{name}-firebird.patch
 URL:           http://www.gnome-db.org/
 %{?with_firebird:BuildRequires:        Firebird-devel}
 BuildRequires: autoconf >= 2.59
@@ -246,9 +244,7 @@ Pakiet dostarczający dane z xBase (dBase, Clippera, FoxPro) dla GDA.
 
 %prep
 %setup -q -n libgda-%{version}
-%patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %if ! %{with gamin}
 sed -i -e 's#\(PKG_CHECK_MODULES(GAMIN.*\)#dnl \1#g' configure.in
@@ -289,8 +285,6 @@ rm -rf $RPM_BUILD_ROOT
 # rm -f $RPM_BUILD_ROOT%{_providersdir}/*.{a,la}
 rm -f $RPM_BUILD_ROOT%{_providersdir}/*.a
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
-
 %find_lang libgda-3.0
 
 %clean
@@ -305,7 +299,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/gda-config-tool-3.0
 %attr(755,root,root) %{_libdir}/libgda-3.0.so.*.*.*
 %attr(755,root,root) %{_libdir}/libgda-report-3.0.so.*.*.*
-%attr(755,root,root) %{_libdir}/libgda-virtual-3.0.so
+%attr(755,root,root) %{_libdir}/libgda-xslt-3.0.so.*.*.*
+#%attr(755,root,root) %{_libdir}/libgda-virtual-3.0.so
 %attr(755,root,root) %{_libdir}/libgdasql-3.0.so.*.*.*
 %dir %{_libdir}/%{_libgdadir}
 %dir %{_providersdir}
@@ -331,8 +326,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libgdasql-3.0.so
 %{_libdir}/libgda-3.0.la
 %{_libdir}/libgda-report-3.0.la
+%{_libdir}/libgda-xslt-3.0.la
 %{_libdir}/libgdasql-3.0.la
-%{_libdir}/libgda-virtual-3.0.la
+#%{_libdir}/libgda-virtual-3.0.la
 %{_includedir}/libgda-3.0
 %{_pkgconfigdir}/libgda-3.0.pc
 %{_pkgconfigdir}/libgda-*-3.0.pc
@@ -344,8 +340,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libgda-3.0.a
 %{_libdir}/libgda-report-3.0.a
+%{_libdir}/libgda-xslt-3.0.a
 %{_libdir}/libgdasql-3.0.a
-%{_libdir}/libgda-virtual-3.0.a
+#%{_libdir}/libgda-virtual-3.0.a
 %endif
 
 %files provider-db