[packages/libgda6] - updated to 6.0.0 as libgda6 - removed obsolete patches - added web patch (build fixes) - db,dbsql,
qboosh
qboosh at pld-linux.org
Sun Feb 7 18:38:48 CET 2021
commit 342bfe43f5fd4dca323dd17d304158b19d2b9ea2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Feb 7 18:39:13 2021 +0100
- updated to 6.0.0 as libgda6
- removed obsolete patches
- added web patch (build fixes)
- db,dbsql,firebird,jdbc,mdb,oracle providers disabled (not ported to new API/packaging)
java-arch.patch | 45 -----
java8.patch | 14 --
libgda5-configure.patch | 22 ---
libgda5-db.patch | 11 --
libgda5-missing.patch | 422 -------------------------------------------
libgda5-oracle.patch | 20 --
libgda5-sqlite.patch | 19 --
libgda5-yelp.patch | 15 --
libgda6-web.patch | 31 ++++
libgda5.spec => libgda6.spec | 323 +++++++++++++--------------------
10 files changed, 161 insertions(+), 761 deletions(-)
---
diff --git a/libgda5.spec b/libgda6.spec
similarity index 64%
rename from libgda5.spec
rename to libgda6.spec
index 4436558..b0ba7c2 100644
--- a/libgda5.spec
+++ b/libgda6.spec
@@ -5,14 +5,16 @@
%bcond_without static_libs # static libraries build
%bcond_without vala # Vala APIs and GdaData C library
# - database plugins:
-%bcond_without dbsql # BerkeleyDB SQL plugin
-%bcond_without firebird # Firebird plugins
-%bcond_without jdbc # JDBC plugin
+%bcond_with db # BerkeleyDB plugin (broken, disabled in sources)
+%bcond_with dbsql # BerkeleyDB SQL plugin (not supported in meson buildsystem)
+%bcond_with firebird # Firebird plugins (not supported in meson buildsystem)
+%bcond_with jdbc # JDBC plugin (disabled in sources)
%bcond_without ldap # LDAP plugin
-%bcond_without mdb # MDB plugin
+%bcond_with mdb # MDB plugin (not supported in meson buildsystem)
%bcond_without mysql # MySQL plugin
-%bcond_with oci # Oracle DB plugin
+%bcond_with oci # Oracle DB plugin (not supported in meson buildsystem)
%bcond_without pgsql # PostgreSQL plugin
+%bcond_without sqlcipher # SQLcipher plugin
%ifnarch i486 i586 i686 pentium3 pentium4 athlon %{x8664}
%undefine with_jdbc
@@ -20,26 +22,19 @@
Summary: GNU Data Access library
Summary(pl.UTF-8): Biblioteka GNU Data Access
-Name: libgda5
-Version: 5.2.10
+Name: libgda6
+Version: 6.0.0
Release: 1
License: LGPL v2+/GPL v2+
Group: Libraries
-Source0: https://download.gnome.org/sources/libgda/5.2/libgda-%{version}.tar.xz
-# Source0-md5: e4b5866e78571a70953416d1dc395097
-Patch0: %{name}-configure.patch
-Patch1: %{name}-oracle.patch
-Patch2: %{name}-missing.patch
-Patch3: %{name}-db.patch
-Patch4: %{name}-yelp.patch
-Patch5: java-arch.patch
-Patch6: java8.patch
-Patch8: %{name}-sqlite.patch
+Source0: https://download.gnome.org/sources/libgda/6.0/libgda-%{version}.tar.xz
+# Source0-md5: 2e059e57b0620fb23fc74f3d2bd0fd1f
+Patch0: %{name}-web.patch
URL: https://www.gnome-db.org/
%{?with_firebird:BuildRequires: Firebird-devel}
BuildRequires: autoconf >= 2.68
BuildRequires: automake >= 1:1.11.1
-BuildRequires: db-devel >= 4.7
+%{?with_db:BuildRequires: db-devel >= 4.7}
%{?with_dbsql:BuildRequires: db-sql-devel >= 4.7}
BuildRequires: docbook-dtd412-xml
BuildRequires: gdk-pixbuf2-devel >= 2.0
@@ -75,6 +70,7 @@ BuildRequires: pkgconfig >= 1:0.18
BuildRequires: python3 >= 1:3
BuildRequires: readline-devel >= 5.0
BuildRequires: rpmbuild(macros) >= 1.752
+%{?with_sqlcipher:BuildRequires: sqlcipher-devel >= 3.4}
BuildRequires: sqlite3-devel >= 3.10.2
BuildRequires: tar >= 1:1.22
%{?with_vala:BuildRequires: vala >= 2:0.26.0}
@@ -391,87 +387,38 @@ Plik katalogu oraz ikony libgda dla Glade.
%prep
%setup -q -n libgda-%{version}
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch8 -p1
%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' \
libgda-report/RML/trml2html/trml2html.py \
libgda-report/RML/trml2pdf/trml2pdf.py
%build
-# included version is bash-specific, use system file
-cp -f %{_aclocaldir}/introspection.m4 m4/introspection.m4
-%if %{with jdbc}
-export JAVA_HOME="%{java_home}"
-%ifarch %{ix86}
-export _JAVA_SUFFIX="/lib/i386/server"
-%endif
-%ifarch %{x8664}
-export _JAVA_SUFFIX="/lib/amd64/server"
-%endif
-%endif
-%{__gtkdocize}
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__automake}
-%if %{with jdbc}
-# included getsp.class fails with Sun/Oracle JDK 1.6, regenerate
-javac getsp.java
-%endif
-%configure \
- --disable-silent-rules \
- %{!?with_vala:--disable-vala} \
- --enable-gda-gi \
- --enable-gdaui-gi \
- %{?with_vala:--enable-gdaui-vala} \
- --enable-gtk-doc%{!?with_apidocs:=no} \
- --enable-json \
- %{?with_static_libs:--enable-static} \
- --enable-system-sqlite \
- %{?with_vala:--enable-vala --enable-vala-extensions} \
- --with-bdb=/usr \
- --with-html-dir=%{_gtkdocdir} \
- --with-firebird%{!?with_firebird:=no} \
- --with-java%{!?with_jdbc:=no} \
- --with-libdir-name=%{_lib} \
- --with-mdb%{!?with_mdb:=no} \
- --with-mysql%{!?with_mysql:=no} \
- --with-oracle%{!?with_oci:=no} \
- --with-postgres%{!?with_pgsql:=no}
-
-%{__make} -j1
+%meson build \
+ -Dexperimental=true \
+ -Dgraphviz=true \
+ -Dlibsecret=true \
+ -Dtools=true \
+ -Ddoc=true \
+ %{?with_ldap:-Dldap=true} \
+ -Dweb=true
+
+%ninja_build -C build
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- VALA_VAPIDIR=%{_datadir}/vala/vapi
-
-# modules dlopened by *.so through libgmodule
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgda-5.0/providers/*.{a,la}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgda-5.0/plugins/*.{a,la}
+%ninja_install -C build
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+%py3_comp $RPM_BUILD_ROOT%{_datadir}/libgda-6.0/gda_trml2html
+%py3_comp $RPM_BUILD_ROOT%{_datadir}/libgda-6.0/gda_trml2pdf
+%py3_ocomp $RPM_BUILD_ROOT%{_datadir}/libgda-6.0/gda_trml2html
+%py3_ocomp $RPM_BUILD_ROOT%{_datadir}/libgda-6.0/gda_trml2pdf
-%{!?with_apidocs:rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgda-6.0/*/*.a
-%py_comp $RPM_BUILD_ROOT%{_datadir}/libgda-5.0/gda_trml2html
-%py_comp $RPM_BUILD_ROOT%{_datadir}/libgda-5.0/gda_trml2pdf
-%py_ocomp $RPM_BUILD_ROOT%{_datadir}/libgda-5.0/gda_trml2html
-%py_ocomp $RPM_BUILD_ROOT%{_datadir}/libgda-5.0/gda_trml2pdf
+%{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/{gda-sql,gda-sql-6.0}.1
-%find_lang libgda-5.0
-%find_lang gda-browser --with-gnome
-%find_lang gda-sql --with-gnome
-cat gda-sql.lang >> gda-browser.lang
+%find_lang libgda-6.0
%clean
rm -rf $RPM_BUILD_ROOT
@@ -485,206 +432,196 @@ rm -rf $RPM_BUILD_ROOT
%postun tools
%update_icon_cache hicolor
-%files -f libgda-5.0.lang
+%files -f libgda-6.0.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_bindir}/gda-list-config
-%attr(755,root,root) %{_bindir}/gda-list-config-5.0
-%attr(755,root,root) %{_bindir}/gda-list-server-op
-%attr(755,root,root) %{_bindir}/gda-list-server-op-5.0
-%attr(755,root,root) %{_bindir}/gda-sql
-%attr(755,root,root) %{_bindir}/gda-sql-5.0
-%attr(755,root,root) %{_bindir}/gda-test-connection-5.0
-%attr(755,root,root) %{_libdir}/libgda-5.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgda-5.0.so.4
-%attr(755,root,root) %{_libdir}/libgda-report-5.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgda-report-5.0.so.4
-%attr(755,root,root) %{_libdir}/libgda-xslt-5.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgda-xslt-5.0.so.4
-%{_libdir}/girepository-1.0/Gda-5.0.typelib
-%dir %{_libdir}/libgda-5.0
-%dir %{_libdir}/libgda-5.0/providers
-%dir %{_datadir}/libgda-5.0
-%{_datadir}/libgda-5.0/demo
-%{_datadir}/libgda-5.0/dtd
-%{_datadir}/libgda-5.0/icons
-%{_datadir}/libgda-5.0/pixmaps
-%{_datadir}/libgda-5.0/import_encodings.xml
-%{_datadir}/libgda-5.0/information_schema.xml
-%{_datadir}/libgda-5.0/language-specs
-%{_datadir}/libgda-5.0/server_operation.glade
+%attr(755,root,root) %{_bindir}/gda-list-config-6.0
+%attr(755,root,root) %{_bindir}/gda-list-server-op-6.0
+%attr(755,root,root) %{_bindir}/gda-sql-6.0
+%attr(755,root,root) %{_bindir}/trml2html.py
+%attr(755,root,root) %{_bindir}/trml2pdf.py
+%attr(755,root,root) %{_libdir}/libgda-6.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgda-6.0.so.6
+%attr(755,root,root) %{_libdir}/libgda-report-6.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgda-report-6.0.so.6
+%attr(755,root,root) %{_libdir}/libgda-xslt-6.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgda-xslt-6.0.so.6
+%{_libdir}/girepository-1.0/Gda-6.0.typelib
+%dir %{_libdir}/libgda-6.0
+%dir %{_libdir}/libgda-6.0/providers
+%dir %{_datadir}/libgda-6.0
+# FIXME: examples
+%{_datadir}/libgda-6.0/demo
+%{_datadir}/libgda-6.0/dtd
+%{_datadir}/libgda-6.0/gda-sql
+%{_datadir}/libgda-6.0/information_schema.xml
# used by libgda-report
-%{_datadir}/libgda-5.0/gda_trml2html
-%{_datadir}/libgda-5.0/gda_trml2pdf
-%dir %{_sysconfdir}/libgda-5.0
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libgda-5.0/config
-%{_sysconfdir}/libgda-5.0/sales_test.db
-%{_mandir}/man1/gda-sql-5.0.1*
-%{_mandir}/man1/gda-sql.1*
+%{_datadir}/libgda-6.0/gda_trml2html
+%{_datadir}/libgda-6.0/gda_trml2pdf
+%{_mandir}/man1/gda-sql-6.0.1*
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgda-5.0.so
-%attr(755,root,root) %{_libdir}/libgda-report-5.0.so
-%attr(755,root,root) %{_libdir}/libgda-xslt-5.0.so
-%{_datadir}/gir-1.0/Gda-5.0.gir
-%{_includedir}/libgda-5.0
-%{_pkgconfigdir}/libgda-5.0.pc
-%{_pkgconfigdir}/libgda-bdb-5.0.pc
-%{?with_dbsql:%{_pkgconfigdir}/libgda-bdbsql-5.0.pc}
-%{?with_firebird:%{_pkgconfigdir}/libgda-firebird-5.0.pc}
-%{?with_jdbc:%{_pkgconfigdir}/libgda-jdbc-5.0.pc}
-%{?with_ldap:%{_pkgconfigdir}/libgda-ldap-5.0.pc}
-%{?with_mdb:%{_pkgconfigdir}/libgda-mdb-5.0.pc}
-%{?with_mysql:%{_pkgconfigdir}/libgda-mysql-5.0.pc}
-%{?with_oci:%{_pkgconfigdir}/libgda-oracle-5.0.pc}
-%{?with_pgsql:%{_pkgconfigdir}/libgda-postgres-5.0.pc}
-%{_pkgconfigdir}/libgda-report-5.0.pc
-%{_pkgconfigdir}/libgda-sqlcipher-5.0.pc
-%{_pkgconfigdir}/libgda-sqlite-5.0.pc
-%{_pkgconfigdir}/libgda-xslt-5.0.pc
-%{_pkgconfigdir}/libgda-web-5.0.pc
+%attr(755,root,root) %{_libdir}/libgda-6.0.so
+%attr(755,root,root) %{_libdir}/libgda-report-6.0.so
+%attr(755,root,root) %{_libdir}/libgda-xslt-6.0.so
+%{_datadir}/gir-1.0/Gda-6.0.gir
+%dir %{_includedir}/libgda-6.0
+%{_includedir}/libgda-6.0/libgda
+%{_includedir}/libgda-6.0/libgda-report
+%{_includedir}/libgda-6.0/providers
+%{_pkgconfigdir}/libgda-6.0.pc
+%{_pkgconfigdir}/libgda-capi-6.0.pc
+%{_pkgconfigdir}/libgda-models-6.0.pc
+%{_pkgconfigdir}/libgda-report-6.0.pc
+%{_pkgconfigdir}/libgda-xslt-6.0.pc
+# providers
+%{?with_db:%{_pkgconfigdir}/libgda-bdb-6.0.pc}
+%{?with_dbsql:%{_pkgconfigdir}/libgda-bdbsql-6.0.pc}
+%{?with_firebird:%{_pkgconfigdir}/libgda-firebird-6.0.pc}
+%{?with_jdbc:%{_pkgconfigdir}/libgda-jdbc-6.0.pc}
+%{?with_ldap:%{_pkgconfigdir}/libgda-ldap-6.0.pc}
+%{?with_mdb:%{_pkgconfigdir}/libgda-mdb-6.0.pc}
+%{?with_mysql:%{_pkgconfigdir}/libgda-mysql-6.0.pc}
+%{?with_oci:%{_pkgconfigdir}/libgda-oracle-6.0.pc}
+%{?with_pgsql:%{_pkgconfigdir}/libgda-postgres-6.0.pc}
+%{?with_sqlcipher:%{_pkgconfigdir}/libgda-sqlcipher-6.0.pc}
+%{_pkgconfigdir}/libgda-sqlite-6.0.pc
+%{_pkgconfigdir}/libgda-web-6.0.pc
%if %{with static_libs}
%files static
%defattr(644,root,root,755)
-%{_libdir}/libgda-5.0.a
-%{_libdir}/libgda-report-5.0.a
-%{_libdir}/libgda-xslt-5.0.a
+%{_libdir}/libgda-6.0.a
+%{_libdir}/libgda-report-6.0.a
+%{_libdir}/libgda-xslt-6.0.a
%endif
%if %{with vala}
%files -n vala-libgda5
%defattr(644,root,root,755)
-%{_datadir}/vala/vapi/libgda-5.0.vapi
+%{_datadir}/vala/vapi/libgda-6.0.deps
+%{_datadir}/vala/vapi/libgda-6.0.vapi
%endif
%files ui
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/gdaui-demo-5.0
-%attr(755,root,root) %{_libdir}/libgda-ui-5.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgda-ui-5.0.so.4
-%attr(755,root,root) %{_libdir}/libgda-5.0/plugins/libgda-ui-plugins.so
-%dir %{_libdir}/libgda-5.0/plugins
-%{_libdir}/libgda-5.0/plugins/gdaui-*.xml
-%{_libdir}/girepository-1.0/Gdaui-5.0.typelib
-%{_datadir}/libgda-5.0/ui
+%attr(755,root,root) %{_bindir}/org.gnome.gda.Demoui
+%attr(755,root,root) %{_libdir}/libgda-ui-6.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgda-ui-6.0.so.6
+%attr(755,root,root) %{_libdir}/libgda-6.0/plugins/libgda-ui-plugins-libgda-6.0.so
+%dir %{_libdir}/libgda-6.0/plugins
+%{_libdir}/girepository-1.0/Gdaui-6.0.typelib
+%{_datadir}/libgda-6.0/ui
%files ui-devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgda-ui-5.0.so
-%{_datadir}/gir-1.0/Gdaui-5.0.gir
-%{_pkgconfigdir}/libgda-ui-5.0.pc
+%attr(755,root,root) %{_libdir}/libgda-ui-6.0.so
+%{_includedir}/libgda-6.0/libgda-ui
+%{_datadir}/gir-1.0/Gdaui-6.0.gir
+%{_pkgconfigdir}/libgda-ui-6.0.pc
%if %{with static_libs}
%files ui-static
%defattr(644,root,root,755)
-%{_libdir}/libgda-ui-5.0.a
+%{_libdir}/libgda-ui-6.0.a
%endif
%if %{with vala}
%files -n vala-libgda5-ui
%defattr(644,root,root,755)
-%{_datadir}/vala/vapi/libgda-ui-5.0.vapi
+%{_datadir}/vala/vapi/libgdaui-6.0.vapi
%endif
%if %{with apidocs}
%files apidocs
%defattr(644,root,root,755)
-%{_gtkdocdir}/gda-browser
-%{_gtkdocdir}/libgda-5.0
+%{_gtkdocdir}/libgda-6.0
+%{_gtkdocdir}/libgdaui-6.0
+%{_datadir}/devhelp/books/Gda-6.0
+%{_datadir}/devhelp/books/Gdaui-6.0
%endif
+%if %{with db}
%files provider-db
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgda-5.0/providers/libgda-bdb.so
-%{_datadir}/libgda-5.0/bdb_specs_*.xml
+%attr(755,root,root) %{_libdir}/libgda-6.0/providers/libgda-bdb-6.0.so
+%endif
%if %{with dbsql}
%files provider-dbsql
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgda-5.0/providers/libgda-bdbsql.so
-%{_datadir}/libgda-5.0/bdbsql_specs_*.xml
+%attr(755,root,root) %{_libdir}/libgda-6.0/providers/libgda-bdbsql-6.0.so
%endif
%if %{with firebird}
%files provider-firebird
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgda-5.0/providers/libgda-firebird-client.so
-%{_datadir}/libgda-5.0/firebird_specs_*.xml
+%attr(755,root,root) %{_libdir}/libgda-6.0/providers/libgda-firebird-client-6.0.so
%endif
%if %{with jdbc}
%files provider-jdbc
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/gda-list-jdbc-providers-5.0
-%attr(755,root,root) %{_libdir}/libgda-5.0/providers/libgda-jdbc.so
-%{_libdir}/libgda-5.0/providers/gdaprovider-5.0.jar
-%{_datadir}/libgda-5.0/jdbc_specs_*.xml
+%attr(755,root,root) %{_bindir}/gda-list-jdbc-providers-6.0
+%attr(755,root,root) %{_libdir}/libgda-6.0/providers/libgda-jdbc-6.0.so
+%{_libdir}/libgda-6.0/providers/gdaprovider-6.0.jar
%endif
%if %{with ldap}
%files provider-ldap
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgda-5.0/providers/libgda-ldap.so
-%{_datadir}/libgda-5.0/ldap_specs_*.xml
+%attr(755,root,root) %{_libdir}/libgda-6.0/providers/libgda-ldap-6.0.so
%endif
%if %{with mdb}
%files provider-mdb
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgda-5.0/providers/libgda-mdb.so
-%{_datadir}/libgda-5.0/mdb_specs_*.xml
+%attr(755,root,root) %{_libdir}/libgda-6.0/providers/libgda-mdb-6.0.so
%endif
%if %{with mysql}
%files provider-mysql
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgda-5.0/providers/libgda-mysql.so
-%{_datadir}/libgda-5.0/mysql_specs_*.xml
+%attr(755,root,root) %{_libdir}/libgda-6.0/providers/libgda-mysql-6.0.so
%endif
%if %{with oci}
%files provider-oracle
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgda-5.0/providers/libgda-oracle.so
-%{_datadir}/libgda-5.0/oracle_specs_*.xml
+%attr(755,root,root) %{_libdir}/libgda-6.0/providers/libgda-oracle-6.0.so
%endif
%if %{with pgsql}
%files provider-postgres
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgda-5.0/providers/libgda-postgres.so
-%{_datadir}/libgda-5.0/postgres_specs_*.xml
+%attr(755,root,root) %{_libdir}/libgda-6.0/providers/libgda-postgres-6.0.so
%endif
+%if %{with sqlcipher}
%files provider-sqlcipher
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgda-5.0/providers/libgda-sqlcipher.so
-%{_datadir}/libgda-5.0/sqlcipher_specs_*.xml
+%attr(755,root,root) %{_libdir}/libgda-6.0/providers/libgda-sqlcipher-6.0.so
+%endif
%files provider-sqlite
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgda-5.0/providers/libgda-sqlite.so
-%{_datadir}/libgda-5.0/sqlite_specs_*.xml
+%attr(755,root,root) %{_libdir}/libgda-6.0/providers/libgda-sqlite-6.0.so
%files provider-web
%defattr(644,root,root,755)
%doc providers/web/README
-%attr(755,root,root) %{_libdir}/libgda-5.0/providers/libgda-web.so
-%{_datadir}/libgda-5.0/php
-%{_datadir}/libgda-5.0/web
-%{_datadir}/libgda-5.0/web_specs_*.xml
+%attr(755,root,root) %{_libdir}/libgda-6.0/providers/libgda-web-6.0.so
-%files tools -f gda-browser.lang
+%files tools
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/gda-browser-5.0
-%attr(755,root,root) %{_bindir}/gda-control-center-5.0
-%{_datadir}/appdata/gda-browser-5.0.appdata.xml
-%{_desktopdir}/gda-browser-5.0.desktop
-%{_desktopdir}/gda-control-center-5.0.desktop
-%{_pixmapsdir}/gda-browser-5.0.png
-%{_iconsdir}/hicolor/*/apps/gda-control-center.png
+%attr(755,root,root) %{_bindir}/org.gnome.gda.Browser
+%attr(755,root,root) %{_bindir}/gda-control-center-6.0
+%{_datadir}/metainfo/org.gnome.gda.Browser.appdata.xml
+%{_desktopdir}/org.gnome.gda.Browser.desktop
+%{_pixmapsdir}/org.gnome.gda.Browser.png
+%{_iconsdir}/hicolor/512x512/apps/org.gnome.gda.Browser.png
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.gda.Browser.svg
%if %{with glade}
%files glade
diff --git a/java-arch.patch b/java-arch.patch
deleted file mode 100644
index 0cf94bd..0000000
--- a/java-arch.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- libgda-5.2.1/getsp.java~ 2013-10-19 14:35:27.000000000 +0200
-+++ libgda-5.2.1/getsp.java 2013-12-01 10:06:13.393710066 +0100
-@@ -10,7 +10,8 @@
- }
- else if (args[0].compareTo("-libs")==0) {
- String prefix="-L";
-- if (args.length>1) prefix=args[1];
-+ String suffix="/lib/amd64/server";
-+ if (args.length>1) suffix=args[1];
-
- // we're not using StringTokenizer in case the JVM is very crude
- int i=0,j,k=0;
-@@ -25,7 +27,6 @@
- while (i<=j) {
- if (i==j || lp.charAt(i)==ps) {
- String lib=lp.substring(k,i);
-- String suffix="/lib/amd64/server";
- k=i+1;
- if (lib.compareTo(".")!=0)
- r=(r==null)?(prefix+lib+suffix):(r+" "+prefix+lib+suffix);
-@@ -50,7 +51,9 @@
-
- if (r!=null) System.out.println(r);
- } else if (args[0].compareTo("-ldpath")==0) {
-- String lp1=System.getProperty("java.home")+"/lib/amd64/server";
-+ String suffix="/lib/amd64/server";
-+ if (args.length>1) suffix=args[1];
-+ String lp1=System.getProperty("java.home")+suffix;
- String lp2=System.getProperty("java.library.path");
- System.out.println(lp1+":"+lp2);
- }
---- libgda-5.2.9/m4/java.m4.orig 2019-07-02 19:34:15.673428245 +0200
-+++ libgda-5.2.9/m4/java.m4 2019-07-02 19:36:58.065881823 +0200
-@@ -221,9 +221,9 @@
- JAVA_LD_PATH=
- ;;
- *)
-- RUN_JAVA(JAVA_LIBS, [-classpath ${srcdir} getsp -libs])
-+ RUN_JAVA(JAVA_LIBS, [-classpath ${srcdir} getsp -libs ${_JAVA_SUFFIX}])
- JAVA_LIBS="${JAVA_LIBS} -L${JAVA_HOME}/lib/server -ljvm"
-- RUN_JAVA(JAVA_LD_PATH, [-classpath ${srcdir} getsp -ldpath])
-+ RUN_JAVA(JAVA_LD_PATH, [-classpath ${srcdir} getsp -ldpath ${_JAVA_SUFFIX}])
- ;;
- esac
- # note that we actually don't test JAVA_LIBS - we hope that the detection
diff --git a/java8.patch b/java8.patch
deleted file mode 100644
index c3397ae..0000000
--- a/java8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- libgda-5.2.4/m4/java.m4~ 2016-05-05 18:28:46.000000000 +0200
-+++ libgda-5.2.4/m4/java.m4 2016-05-05 18:39:44.169761450 +0200
-@@ -175,6 +175,11 @@
- JTYPE="Sun JRE 1.7"
- JFLAGS="-Xlint:unchecked -Xlint:deprecation"
- ;;
-+ JRE1.8.*)
-+ try_java=true
-+ JTYPE="Sun JRE 1.8"
-+ JFLAGS="-Xlint:unchecked -Xlint:deprecation"
-+ ;;
- JREgcj-4*)
- try_java=true
- JTYPE="GCJ"
diff --git a/libgda5-configure.patch b/libgda5-configure.patch
deleted file mode 100644
index e0d0afb..0000000
--- a/libgda5-configure.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- libgda-4.2.1/m4/mdbtools.m4 2010-11-10 19:08:10.000000000 +0100
-+++ libgda-4.2.1.new//m4/mdbtools.m4 2010-11-14 19:05:43.126773908 +0100
-@@ -136,7 +136,7 @@
- for d in $mdb_test_dir
- do
- AC_MSG_CHECKING([for MDB Tools files in $d])
-- if test -f $d/include/mdbtools.h -a -f $d/$mdb_loclibdir/libmdb$mdb_libext -o -f $d/include/mdbtools.h -a -f $d/$mdb_loclibdir/libmdb.a
-+ if test -f $d/include/mdb/mdbtools.h -a -f $d/$mdb_loclibdir/libmdb$mdb_libext -o -f $d/include/mdb/mdbtools.h -a -f $d/$mdb_loclibdir/libmdb.a
- then
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I$d/include $mdb_glib_cflags"
-@@ -155,8 +155,8 @@
- if test x$mdbdir != x
- then
- AC_MSG_RESULT([found])
-- MDB_CFLAGS=-I${mdbdir}/include
-- MDB_LIBS="-L${mdbdir}/$mdb_loclibdir -lmdb"
-+ MDB_CFLAGS=-I${mdbdir}/include/mdb
-+ MDB_LIBS="-lmdb"
- break
- else
- AC_MSG_RESULT([not found])
diff --git a/libgda5-db.patch b/libgda5-db.patch
deleted file mode 100644
index 8f1c668..0000000
--- a/libgda5-db.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgda-5.2.9/m4/bdb.m4.orig 2019-03-18 01:56:22.000000000 +0100
-+++ libgda-5.2.9/m4/bdb.m4 2019-07-02 20:48:51.682512956 +0200
-@@ -128,7 +128,7 @@
- do
- bdbdir=""
- AC_MSG_CHECKING([for Berkeley DB files in $d])
-- for version in "" 6.0 5.3 5.1 5.0 4.9 4.8 4.7
-+ for version in "" 6.1 6.0 5.3 5.1 5.0 4.9 4.8 4.7
- do
- if test $platform_win32 = yes
- then
diff --git a/libgda5-missing.patch b/libgda5-missing.patch
deleted file mode 100644
index de9dfb6..0000000
--- a/libgda5-missing.patch
+++ /dev/null
@@ -1,422 +0,0 @@
---- libgda-5.2.0/tools/help/C/gda-sql-help.xml.orig 1970-01-01 01:00:00.000000000 +0100
-+++ libgda-5.2.0/tools/help/C/gda-sql-help.xml 2013-11-16 10:27:41.669203270 +0100
-@@ -0,0 +1,419 @@
-+<?xml version="1.0"?>
-+<gda-sql-help>
-+ <!-- "." command -->
-+ <command name="">
-+ <shortdescription>
-+ </shortdescription>
-+ <usage>
-+ <synopsis>.</synopsis>
-+ <comment></comment>
-+ </usage>
-+ <example>
-+ <synopsis>.</synopsis>
-+ <comment></comment>
-+ </example>
-+ </command>
-+
-+ <!-- ".bind" command -->
-+ <command name="bind">
-+ <shortdescription>Bind connections or datasets into a single new one (allowing SQL commands to be executed across multiple connections and/or datasets).
-+ </shortdescription>
-+ <usage>
-+ <synopsis>.bind @CNC NAME@ @OBJ NAME@ [@OBJ NAME@ ...]</synopsis>
-+ <comment>creates a new connection named @CNC_NAME@, which binds data from each of the named object
-+ (@OBJ NAME@). If a named object is a connection, then all the tables in the named connection
-+ are bound (in a schema named after the connection name) and if a named object is a dataset,
-+ the dataset is bound as a table (named after the dataset's name).</comment>
-+ </usage>
-+ <example>
-+ <synopsis>.bind attached c0 c1 ds1</synopsis>
-+ <comment>creates the "attached" connection where all the tables from connection "c1" are mapped to the "c1" schema, all the tables from connection "c2" are mapped to the "c2" schema, and the "ds1"
-+ dataset is mapped to the "ds1" table.</comment>
-+ </example>
-+ </command>
-+
-+ <!-- ".c" command -->
-+ <command name="c">
-+ <shortdescription>Opens a new connection or lists opened connections</shortdescription>
-+ <usage>
-+ <synopsis>.c [[@CNC_NAME@] [@DSN@|@CONNECTION STRING@]]</synopsis>
-+ <comment>Opens a new connection, named @CNC_NAME@ using either a DSN name (use the ".l" command to list all declared DSN), or a connection string (use the ".lp" command to list database providers and see which argument their connection string accepts).</comment>
-+ <comment>If only a connection name is passed as argument, then the named connection becomes the current active connection. As a side note, using "~" as a connection name will switch to a (new or already opened) connection which contains the meta data for the active connection.</comment>
-+ <comment>If no connection name is specified, then this command lists all the opened connections</comment>
-+ </usage>
-+ <example>
-+ <synopsis>.c SalesTest</synopsis>
-+ <synopsis>.c ht htsql_demo.db</synopsis>
-+ <synopsis>.c</synopsis>
-+ <raw> List of opened connections
-+Name | Provider | DSN or connection string | Username
-+----------+----------+--------------------------------------------------+---------
-+ht | SQLite | DB_DIR=.;EXTRA_FUNCTIONS=TRUE;DB_NAME=htsql_demo |
-+SalesTest | SQLite | SalesTest |
-+(2 rows)</raw>
-+ <comment>This example opens two SQLite connections, named "ht" and "st"</comment>
-+ </example>
-+
-+ <example>
-+ <synopsis>.c ~</synopsis>
-+ <synopsis>.d</synopsis>
-+ <raw>Schema | Name | Type | Owner
-+-------+----------------------------------+------------+------
-+main | __declared_fk | BASE TABLE |
-+main | _all_types | VIEW |
-+main | _attributes | BASE TABLE |
-+[...]
-+(32 rows)</raw>
-+ <comment>This command switches to the connection containing the currently active connection's meta data, the ".d" command displays all the tables and views of the current active connection.</comment>
-+ </example>
-+
-+ <example>
-+ <synopsis>.c</synopsis>
-+ <comment>This command lists all opened connections (including the meta data connections)</comment>
-+ <raw> List of opened connections
-+Name | Provider | DSN or connection string
-+-----+----------+--------------------------------------------------------------------------------------------
-+ht | SQLite | DB_DIR=.;EXTRA_FUNCTIONS=TRUE;DB_NAME=htsql_demo
-+st | SQLite | SalesTest
-+~st | SQLite | DB_DIR=/home/vivien/.local/share/libgda;DB_NAME=gda-sql-SalesTest
-+~ht | SQLite | DB_DIR=/home/vivien/.local/share/libgda;DB_NAME=gda-sql-ab1b5c41e024d87d739797e820dadb05d26
-+(4 rows)</raw>
-+ </example>
-+ </command>
-+
-+ <!-- ".l" command -->
-+ <command name="l">
-+ <shortdescription>List all defined data source (DSN), or named DSN's attributes.
-+ </shortdescription>
-+ <usage>
-+ <synopsis>.l [@DSN@]</synopsis>
-+ <comment>If no @DSN@ argument is specified, then lists all the DSN, otherwise gives information about the specified DSN</comment>
-+ </usage>
-+ <example>
-+ <synopsis>.l</synopsis>
-+ <raw> DSN list
-+DSN | Description | Provider
-+----------+--------------------------------------+-----------
-+mysales | | MySQL
-+pgsales | | PostgreSQL
-+SalesTest | Test database for a sales department | SQLite
-+(3 rows)</raw>
-+ </example>
-+
-+ <example>
-+ <synopsis>.l mysales</synopsis>
-+ <raw> DSN 'mysales' description
-+Attribute | Value
-+---------------+------------------
-+DSN name | mysales
-+Provider | MySQL
-+Description |
-+Parameters | HOST: gda
-+ DB_NAME: test1
-+Authentication | USERNAME: gdauser
-+System DSN? | No
-+(6 rows)</raw>
-+ <comment>The output above shows that the "mysales" DSN uses a MySQL server, hosted on the "gda" machine, for the database "test1", and that the username will be "gdauser"</comment>
-+ </example>
-+ </command>
-+
-+ <!-- ".lp" command -->
-+ <command name="lp">
-+ <shortdescription>List all installed database providers (or named one's attributes)
-+ </shortdescription>
-+ <usage>
-+ <synopsis>.lp [@PROVIDER@]</synopsis>
-+ <comment>Shows information about database providers installed, or about a specific database provider if specified. Use this information to create connection strings</comment>
-+ </usage>
-+ <example>
-+ <synopsis>.lp</synopsis>
-+ <raw> Installed providers list
-+Provider | Description
-+--------------+------------------------------------------------------------------------------------
-+BDBSql | Provider for BDB SQL databases
-+Berkeley-DB | Provider for Berkeley databases
-+Firebird | Provider for Firebird databases
-+FirebirdEmbed | Provider for embedded Firebird databases
-+Ldap | Provider for database where tables are based on data contained in an LDAP directory
-+MSAccess | Provider for Microsoft Access files
-+MySQL | Provider for MySQL databases
-+Oracle | Provider for Oracle databases
-+PostgreSQL | Provider for PostgreSQL databases
-+SQLCipher | Provider for SQLCipher
-+SQLite | Provider for SQLite databases
-+Web | Provider for web server proxies
-+(12 rows)</raw>
-+ <synopsis>.lp MySQL</synopsis>
-+ <raw> Provider 'MySQL' description
-+Attribute | Value
-+---------------+-----------------------------------------------------------------------------------------------
-+Provider | MySQL
-+Description | Provider for MySQL databases
-+DSN parameters | DB_NAME: Database name. The name of a database to connect to (string),
-+ HOST: Database server. Host on which the database server is running (string),
-+ PORT: Port. Database server port (int),
-+ UNIX_SOCKET: UNIX Socket. Full path of the UNIX socket to use when connecting locally (string)
-+ USE_SSL: Require SSL. Whether or not to use SSL to establish the connection (boolean),
-+ COMPRESS: Compress. Use compression protocol (boolean)
-+Authentication | USERNAME (string),
-+ PASSWORD (string)
-+File | /usrlib/libgda-5.0/providers/libgda-mysql.so
-+(5 rows)</raw>
-+ <comment>This output shows all the arguments accepted by the MySQL provider (DB_NAME, HOST, PORT, ...)</comment>
-+ </example>
-+ </command>
-+
-+ <!-- ".pivot" command -->
-+ <command name="pivot">
-+ <shortdescription>Performs a statistical analysis on the data from SELECT, using ROW_FIELDS and COLUMN_FIELDS criteria and optionally DATA_FIELDS for the data.</shortdescription>
-+ <usage>
-+ <synopsis>. at SELECT@ @ROW_FIELDS@ [@COLUMN_FIELDS@ [@DATA_FIELDS@ ...]]</synopsis>
-+ <comment>The @SELECT@ defines the data set to perform summarization on.</comment>
-+ <comment></comment>
-+ <comment>The @ROW_FIELDS@ defines the fields from the data set from which each individual value will
-+ yield to a row in the analysis (it can be any valid selectable SQL expression on the data
-+ set's fields); multiple expressions can be provided, separated by commas (forming a valid SQL
-+ expression). In this case a row will be created for each combination of values of each of
-+ the expression.
-+ </comment>
-+ <comment></comment>
-+ <comment>The @COLUMN_FIELDS@ defines the fields from the data set from which each individual value
-+ will yield to a column in the analysis. Its syntax is similar to the @ROW_FIELDS@ one. If not
-+ specified (or if specified as a single dash ("-") caracter), then only one column will be
-+ created. Note that, if the @DATA_FIELDS@ argument is specified each column created from the
-+ @COLUMN_FIELDS@ will in fact lead to the creation of as many @DATA_FIELDS@ arguments pro‐
-+ vided.
-+ </comment>
-+ <comment></comment>
-+ <comment>The @DATA_FIELDS@ arguments are entirely optional and indicates the way data summarization is
-+ done for each pair of (row,column) values (the default is to count occurrences). The syntax
-+ for each @DATA_FIELDS@ argument is: [aggregate]@SQL_expression@, where the aggregate part is
-+ optional and, if present must be among [SUM], [COUNT], [AVG], [MIN] or [MAX], and the SQL
-+ expression is a valid selectable SQL expression of the data set's fields.
-+ </comment>
-+ </usage>
-+ <example>
-+ <comment>Suppose for these example that we have a table named "student" where students of schools are
-+ are listed (this example comes from the HTSQL tutorial database, see http://htsql.org/doc/tutorial.html).
-+ Part of this table's contents is the following:
-+ </comment>
-+ <raw>name | gender | dob | school_code | program_code | start_date
-+--------------------+--------+------------+-------------+--------------+-----------
-+Linda Wright | f | 1988-10-03 | ns | umth | 2007-08-15
-+Beth Thompson | f | 1988-01-24 | ns | gmth | 2007-08-15
-+Sheri Sanchez | f | 1985-05-14 | edu | gedu | 2007-08-15
-+John Stone | m | 1984-01-28 | bus | pbusad | 2007-08-15
-+Helen Johnson | f | 1986-02-03 | eng | ucompsci | 2007-08-15
-+Anna Carroll | f | 1985-03-29 | edu | gedu | 2007-08-15
-+Carol Walden | f | 1988-04-09 | ns | uphys | 2007-08-15</raw>
-+
-+ <synopsis>.pivot "select * from student" gender</synopsis>
-+ <comment>The output will show one line per gender and will show the number of students for each gender
-+ </comment>
-+ <raw>gender |
-+-------+----
-+f | 284
-+m | 172
-+(2 rows)</raw>
-+ </example>
-+
-+ <example>
-+ <synopsis>pivot "select name, gender, strftime ('%Y', dob) as year_of_birth from student order by year_of_birth" gender year_of_birth</synopsis>
-+ <comment>This example displays, by gender of students, the number of students for each year where
-+ at least one student is born</comment>
-+ <raw>gender | 1982 | 1983 | 1984 | 1985 | 1986 | 1987 | 1988 | 1989 | 1990 | 1991 | 1992
-+-------+------+------+------+------+------+------+------+------+------+------+-----
-+m | 11 | 26 | 39 | 50 | 30 | 13 | 3 | | | |
-+f | | | | 12 | 38 | 36 | 56 | 61 | 33 | 37 | 11
-+(2 rows)</raw>
-+ </example>
-+
-+ <example>
-+ <synopsis>.pivot "select name, gender, strftime ('%Y', dob) as year_of_birth from student order by year_of_birth" year_of_birth gender</synopsis>
-+ <comment>This example displays the same information as the one above, but with one row per year</comment>
-+ <raw>year_of_birth | m | f
-+--------------+----+---
-+1982 | 11 |
-+1983 | 26 |
-+1984 | 39 |
-+1985 | 50 | 12
-+1986 | 30 | 38
-+1987 | 13 | 36
-+1988 | 3 | 56
-+1989 | | 61
-+1990 | | 33
-+1991 | | 37
-+1992 | | 11
-+(11 rows)</raw>
-+ </example>
-+
-+ <example>
-+ <synopsis>.pivot "select name, gender, strftime ('%Y', dob) as year_of_birth, school_code from student order by year_of_birth" year_of_birth school_code</synopsis>
-+ <comment>This example is similar to the one above, but replaces the gender by the school_code for the columns</comment>
-+ <raw>year_of_birth | art | bus | edu | eng | la | ns | ph
-+--------------+-----+-----+-----+-----+----+----+---
-+1982 | 11 | | | | | |
-+1983 | 18 | 8 | | | | |
-+1984 | 15 | 18 | 6 | | | |
-+1985 | 16 | 18 | 18 | 10 | | |
-+1986 | 2 | 12 | 23 | 17 | 14 | |
-+1987 | | 2 | 16 | 16 | 12 | 3 |
-+1988 | | | 6 | 14 | 14 | 22 | 3
-+1989 | | | | 5 | 22 | 13 | 21
-+1990 | | | | | 10 | 7 | 16
-+1991 | | | | | | 16 | 21
-+1992 | | | | | | | 11
-+(11 rows)</raw>
-+ </example>
-+
-+ <example>
-+ <synopsis>.pivot "select school_code, program_code, julianday(Date('now')) - julianday(start_date) as days from vs;" program_code - [avg]days</synopsis>
-+ <comment>This example displays, for each program code, the average number of days since the course
-+ was started</comment>
-+ <raw>program_code | avg_days
-+-------------+------------
-+umth | 1163.153846
-+gmth | 1106.923077
-+gedu | 1180.909091
-+pbusad | 1134.846154
-+ucompsci | 1186.583333
-+uphys | 1206.777778
-+psci | 1156.125000
-+uspan | 1137.800000
-+[...]
-+(39 rows)</raw>
-+ </example>
-+
-+ <example>
-+ <synopsis>.pivot "select school_code, program_code, (julianday(Date('now')) - julianday(start_date))::int as days from vs;" program_code school_code [max]days</synopsis>
-+ <comment>This example is similar to the one above, but it shows the maximum number of days since the course was started, and is split in columns by school code</comment>
-+ <raw>program_code | ns[max_days] | edu[max_days] | bus[max_days] | eng[max_days] | la[max_days] | ph[max_days] | art[max_days]
-+-------------+--------------+---------------+---------------+---------------+--------------+--------------+--------------
-+umth | 1613 | | | | | |
-+gmth | 1613 | | | | | |
-+gedu | | 1613 | | | | |
-+pbusad | | | 1613 | | | |
-+ucompsci | | | | 1613 | | |
-+uphys | 1613 | | | | | |
-+psci | | 1613 | | | | |
-+uspan | | | | | 1613 | |
-+[...]
-+(39 rows)</raw>
-+ </example>
-+ </command>
-+
-+ <!-- ".set" command -->
-+ <command name="set">
-+ <shortdescription>Set or show internal parameter, or list all if no parameter specified
-+ </shortdescription>
-+ <usage>
-+ <synopsis>.set [@NAME@ [@VALUE@|_null_]]</synopsis>
-+ <comment>Use this command to define or re-define variables which can later be used in stataments. Use the ".unset" command to undefine a variable. If you want set a variable to the SQL NULL, then use the "_null_" constant value.</comment>
-+ </usage>
-+ <example>
-+ <synopsis>.set ID 23</synopsis>
-+ <synopsis>.set ID</synopsis>
-+ <comment>This example defines the ID variabe (beware, case sensitive) ID to 23. Later you can then run a query like "SELECT * FROM customers WHERE id=##ID::int"</comment>
-+ </example>
-+ </command>
-+
-+ <!-- LDAP section -->
-+ <section name="LDAP">
-+ <usage>
-+ <comment>
-+ The following commands allow you to manipulate LDAP entries directly, and are thus only available for LDAP
-+ connections. Once you have a search result you are interested into keeping, you can create a table out of it
-+ using the syntax below, and then access to the data like any normal other table using SQL commands on that table.
-+ </comment>
-+ <synopsis>CREATE LDAP TABLE @table name@ [BASE=@base DN@] [FILTER=@LDAP filter@] [ATTRIBUTES=@LDAP attributes@] [SCOPE=@search scope@]</synopsis>
-+ </usage>
-+ <example>
-+ <synopsis>CREATE LDAP TABLE someusers FILTER='(cn=*le*)' ATTRIBUTES='cn,mail' SCOPE='SUBTREE';</synopsis>
-+ <comment>This example defines a table named "someusers" for the "(cn=*le*)" search filter, using a subtree scope;
-+ the table will have 3 columns: the DN, cn and mail</comment>
-+ </example>
-+ <usage>
-+ <comment>Other commands to manipulate LDAP tables are DROP and DESCRIBE commands:</comment>
-+ <synopsis>DROP [LDAP] TABLE @table name@;</synopsis>
-+ <synopsis>DESCRIBE LDAP TABLE @table name@;</synopsis>
-+ </usage>
-+ <example>
-+ <synopsis>DESCRIBE LDAP TABLE someusers;</synopsis>
-+ <raw>Paramètre │ Valeur
-+───────────┼──────────
-+BASE │
-+FILTER │ (cn=*le*)
-+ATTRIBUTES │ cn,mail
-+SCOPE │ SUBTREE
-+(4 rows)</raw>
-+ </example>
-+ </section>
-+
-+ <!-- ".ldap_attributes" command -->
-+ <option name="ldap_attributes">
-+ <shortdescription>Defines the list of attributes taken into account by LDAP commands
-+ </shortdescription>
-+ <usage>
-+ <synopsis>.option ldap_attributes [attribute,[attribute],...]</synopsis>
-+ <comment>Use this option to specify or display which attributes the LDAP commands operate on</comment>
-+ <comment>The attributes list is a CVS separated list of individual LDAP attributes, for example "cn,uid,email"</comment>
-+ <comment>LDAP allows some attributes to be multi valued (e.g. the "objectClass" attribute). When dealing with multi
-+ valued attributes, the default behaviour is to return an error for the corresponding value. This default behaviour can
-+ be changed by specifying a modifier among "CVS" (values are listed in a CVS syntax), "*" (each row is duplicated with
-+ each value of the attribute), "1" (only the 1st value of the attribute is shown), "CONCAT" (all the values are
-+ made into a string, separated by newlines) or "NULL" (a NULL value is used).
-+ </comment>
-+ </usage>
-+ <example>
-+ <synopsis>.option ldap_attributes cn,objectClass::*</synopsis>
-+ <comment>Define the attibutes as "cn" and "objectClass", and because "objectClass" is generally multi valued,
-+ specify that a new row be created in the output for each value of "objectClass" for each entry</comment>
-+ </example>
-+ </option>
-+
-+ <!-- ".ldap_search" command -->
-+ <command name="ldap_search">
-+ <shortdescription>Search LDAP entries using a filter and various criteria
-+ </shortdescription>
-+ <usage>
-+ <synopsis>.ldap_search @filter@ [@base|onelevel|subtree@ [@base DN@]]</synopsis>
-+ <comment>The @filter@ argument is the only mandatory and has to be a valid LDAP filter expression. The
-+ other arguments, if present are in order the search scope (among "base", "onelevel" and "subtree"), and the
-+ base DN (which is the starting point of the search)</comment>
-+ <comment>The results of the search will be a table where the first column is the DN of the entry, and
-+ the other columns are mapped to the LDAP attributes (see the "ldap_attributes" option)</comment>
-+ <comment>LDAP filters must respect the RFC 2254 (see http://www.faqs.org/rfcs/rfc2254.html) and what the
-+ actual LDAP server understands. Note that if the outer most opening and cloding parenthesis are omitted, they
-+ will be automatically added. Examples of LDAP search filter are: "(objectClass=*)" to fetch all objects,
-+ "(&(objectClass=inetOrgPerson)(!cn=tom))" to fetch all persons except "tom". Operators are: "=" for equal,
-+ "~=" for approximately equal "<=" ">=" for lexicographically less than or equal and greater than or equal
-+ respectively, "&", "|" and "!" for the AND, OR and NOT logical operators respectively.</comment>
-+ <comment>Note that the "ldap_dn" option defines the behaviour of the "Distinguished name" column
-+ (use the ".option" command to change the option value). The possible values for this option are: "dn" (default
-+ behaviour), "rdn" (the DN is replaced by the RND) and "none" (the DN column is not shown).</comment>
-+ </usage>
-+ <example>
-+ <synopsis>.option ldap_attributes cn,uid,mail</synopsis>
-+ <synopsis>.ldap_search cn=* onelevel "ou=People,dc=example,dc=gnome-db"</synopsis>
-+ <comment></comment>
-+ <raw>Distinguished name | cn | uid | mail
-+------------------------------------------------+--------------------+------------+-----------------------
-+uid=abarnes,ou=People,dc=example,dc=gnome-db | Anne-Louise Barnes | abarnes | abarnes at example.com
-+uid=abergin,ou=People,dc=example,dc=gnome-db | Andy Bergin | abergin | abergin at example.com
-+uid=achassin,ou=People,dc=example,dc=gnome-db | Ashley Chassin | achassin | achassin at example.com
-+[...]
-+(150 rows)</raw>
-+ </example>
-+ </command>
-+
-+ <!-- DATA section -->
-+ <section name="DATA">
-+ <usage>
-+ <comment>
-+ The following commands allow you to keep dataset results you have obtained, and to reuse them at a later time.
-+ Everytime a resultset is returned by a command, it can be imediately used as a dataset named "_".
-+ </comment>
-+ </usage>
-+ </section>
-+
-+</gda-sql-help>
diff --git a/libgda5-oracle.patch b/libgda5-oracle.patch
deleted file mode 100644
index 713d0ed..0000000
--- a/libgda5-oracle.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgda-5.2.2/m4/oracle.m4.orig 2013-10-19 14:35:27.000000000 +0200
-+++ libgda-5.2.2/m4/oracle.m4 2014-06-01 15:03:32.355170450 +0200
-@@ -127,7 +127,7 @@
- LIBS="$LIBS -L$d/$oracle_loclibdir -lm -loci"
- else
- CFLAGS="$CFLAGS -I$d/include -I$d/include/oracle/client -I$d/rdbms/demo -I${ORACLE_HOME}/rdbms/public -I${ORACLE_HOME}/plsql/public -I$d/network/public"
-- LIBS="$LIBS -L$d/$oracle_loclibdir -lm -ldl -lnnz11 -lclntsh"
-+ LIBS="$LIBS -L$d/$oracle_loclibdir -lm -ldl -lclntsh"
- fi
- AC_LINK_IFELSE([AC_LANG_SOURCE([
- #include <oci.h>
-@@ -150,7 +150,7 @@
- ORACLE_LIBS="-L${oracledir}/$oracle_loclibdir -lm -loci"
- else
- ORACLE_CFLAGS="-I${oracledir}/include -I${oracledir}/include/oracle/client -I${oracledir}/rdbms/demo -I${ORACLE_HOME}/rdbms/public -I${ORACLE_HOME}/plsql/public -I${oracledir}/network/public"
-- ORACLE_LIBS="-L${oracledir}/$oracle_loclibdir -lm -ldl -lnnz11 -lclntsh"
-+ ORACLE_LIBS="-L${oracledir}/$oracle_loclibdir -lm -ldl -lclntsh"
- fi
- break
- else
diff --git a/libgda5-sqlite.patch b/libgda5-sqlite.patch
deleted file mode 100644
index eda2910..0000000
--- a/libgda5-sqlite.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- libgda-5.2.4/libgda/sqlite/gda-sqlite-pstmt.h~ 2015-06-12 22:05:14.000000000 +0200
-+++ libgda-5.2.4/libgda/sqlite/gda-sqlite-pstmt.h 2016-10-18 22:45:26.179827250 +0200
-@@ -24,12 +24,16 @@
- #ifdef STATIC_SQLITE
- #include "sqlite-src/sqlite3.h"
- #else
-+ #ifdef WITH_BDBSQLITE
-+ #include <dbsql.h>
-+ #else
- # ifdef HAVE_SQLITE
- # include <sqlite3.h>
- # else
- # include "sqlite-src/sqlite3.h"
- #endif
- #endif
-+#endif
-
- G_BEGIN_DECLS
-
diff --git a/libgda5-yelp.patch b/libgda5-yelp.patch
deleted file mode 100644
index 72cf7a5..0000000
--- a/libgda5-yelp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- libgda-5.2.0/tools/help/Makefile.am.orig 2013-10-19 14:35:31.000000000 +0200
-+++ libgda-5.2.0/tools/help/Makefile.am 2013-11-16 11:22:24.609065479 +0100
-@@ -1,9 +1,8 @@
- @YELP_HELP_RULES@
-
--DOC_ID = gda-sql
--DOC_NOCHECK = yes
-+HELP_ID = gda-sql
-
--DOC_PAGES = \
-+HELP_FILES = \
- gda-sql-help.xml
-
--DOC_LINGUAS =
-+HELP_LINGUAS =
diff --git a/libgda6-web.patch b/libgda6-web.patch
new file mode 100644
index 0000000..8244aa2
--- /dev/null
+++ b/libgda6-web.patch
@@ -0,0 +1,31 @@
+--- libgda-6.0.0/providers/web/meson.build.orig 2021-02-01 01:29:25.249770600 +0100
++++ libgda-6.0.0/providers/web/meson.build 2021-02-02 21:34:20.349000100 +0100
+@@ -100,7 +100,7 @@
+ c_args: [
+ '-include',
+ join_paths(gda_top_build, 'config.h'),
+- ],
++ ] + c_args,
+ link_args: [
+ '-Wl,--export-dynamic',
+ ],
+--- libgda-6.0.0/providers/web/libmain.c.orig 2021-02-01 01:29:25.249770600 +0100
++++ libgda-6.0.0/providers/web/libmain.c 2021-02-02 21:37:06.051435747 +0100
+@@ -81,7 +81,7 @@
+ gchar *ret, *dir;
+
+ dir = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, NULL);
+- ret = gda_server_provider_load_file_contents (module_path, dir, "web_specs_dsn.xml");
++ ret = gda_server_provider_load_resource_contents ("web", "web_specs_dsn.xml");
+ g_free (dir);
+ if (ret)
+ return ret;
+@@ -95,7 +95,7 @@
+ gchar *ret, *dir;
+
+ dir = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, NULL);
+- ret = gda_server_provider_load_file_contents (module_path, dir, "web_specs_auth.xml");
++ ret = gda_server_provider_load_resource_contents ("web", "web_specs_auth.xml");
+ g_free (dir);
+ if (ret)
+ return ret;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libgda6.git/commitdiff/342bfe43f5fd4dca323dd17d304158b19d2b9ea2
More information about the pld-cvs-commit
mailing list