Hello community, here is the log from the commit of package libgda for openSUSE:Factory checked in at 2018-01-09 14:55:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgda (Old) and /work/SRC/openSUSE:Factory/.libgda.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libgda" Tue Jan 9 14:55:04 2018 rev:83 rq:562509 version:5.2.4 Changes: -------- --- /work/SRC/openSUSE:Factory/libgda/libgda.changes 2017-12-08 12:57:58.988395566 +0100 +++ /work/SRC/openSUSE:Factory/.libgda.new/libgda.changes 2018-01-09 14:55:12.142150900 +0100 @@ -1,0 +2,16 @@ +Mon Jan 8 12:37:54 UTC 2018 - [email protected] + +- Added patches: + * libgda-jre10.patch: detect JRE 10's version string. + * libgda-5.2.4-nojavah.patch: instead of javah invocation, use + javac's -h option; this bumps build requirement to + java-devel >= 1.8 +- Modified patches: + * libgda-jre18.patch + * libgda-jre9.patch + + Don't patch generated configure, but the source java.m4 file +- Run spec cleaner and add dependency on autoconf, automake and + libtool in order to regenearate the configure and Makefile.in + files. + +------------------------------------------------------------------- New: ---- libgda-5.2.4-nojavah.patch libgda-jre10.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgda.spec ++++++ --- /var/tmp/diff_new_pack.XQKEAg/_old 2018-01-09 14:55:13.022109650 +0100 +++ /var/tmp/diff_new_pack.XQKEAg/_new 2018-01-09 14:55:13.026109462 +0100 @@ -1,7 +1,7 @@ # # spec file for package libgda # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,18 +31,24 @@ Patch2: libgda-jre18.patch # PATCH-FIX-OPENSUSE libgda-jre9.patch [email protected] -- Fix build with JRE 9 (not sent upstream, as it's way too hackish) Patch3: libgda-jre9.patch +# PATCH-FIX-OPENSUSE libgda-jre10.patch [email protected] -- Fix build with JRE 10 (not sent upstream, as it's way too hackish) +Patch4: libgda-jre10.patch +# PATCH-FIX-OPENSUSE libgda-5.2.4-nojavah.patch [email protected] -- Fix build with JRE 10 (not sent upstream, as it's way too hackish) +Patch5: libgda-5.2.4-nojavah.patch # PATCH-FIX-OPENSUSE libgda-utf.patch [email protected] -- Remove some UTF chars from headers, which messes with glib-mkenums inside OBS (needs more debug) Patch500: libgda-utf.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: db-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gobject-introspection-devel BuildRequires: intltool >= 0.40.6 BuildRequires: itstool -BuildRequires: java-devel +BuildRequires: java-devel >= 1.8 BuildRequires: libgcrypt-devel BuildRequires: libopenssl-1_0_0-devel -#!BuildIgnore: openssl +BuildRequires: libtool BuildRequires: mdbtools-devel BuildRequires: mysql BuildRequires: mysql-devel @@ -68,6 +74,7 @@ BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(sqlite3) +#!BuildIgnore: openssl %description GNU Data Access (GDA) is an attempt to provide uniform access to @@ -368,19 +375,22 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 %patch500 -p1 %build +autoreconf -fi export LANG=C.UTF-8 # Patch1 introdcues a --ARCH-- field in getsp, which needs to be replace prior to compilation getspARCH=%{_target_cpu} %ifarch x86_64 getspARCH=amd64 %endif -%ifarch %ix86 +%ifarch %{ix86} getspARCH=i386 %endif -%ifarch %arm +%ifarch %{arm} getspARCH=arm %endif # IcedTea 2.5.0 have ppc64 as libarch for ppc64le @@ -413,7 +423,7 @@ %install # remove error about java bytecode being for something later than java 1.15 -- see http://en.opensuse.org/Java/Packaging/Cookbook export NO_BRP_CHECK_BYTECODE_VERSION=true -%makeinstall +%make_install # X-SuSE-Design is just to make the brp check happy... %suse_update_desktop_file gda-browser-5.0 X-SuSE-Design %suse_update_desktop_file gda-control-center-5.0 @@ -435,25 +445,17 @@ %icon_theme_cache_postun %post 5_0-4 -p /sbin/ldconfig - %postun 5_0-4 -p /sbin/ldconfig - %post ui-5_0-4 -p /sbin/ldconfig - %postun ui-5_0-4 -p /sbin/ldconfig - %post report-5_0-4 -p /sbin/ldconfig - %postun report-5_0-4 -p /sbin/ldconfig - %post xslt-5_0-4 -p /sbin/ldconfig - %postun xslt-5_0-4 -p /sbin/ldconfig %files 5_0-4-lang -f libgda-5.0.lang %files tools -%defattr(-, root, root) %{_bindir}/gda-list-config %{_bindir}/gda-list-server-op %{_bindir}/gda-sql @@ -464,7 +466,6 @@ # the libgda soname, naming scheme is different (5_0-4 for soname, 5_0 # for data files). To be on the safe side, package it separately. # This package contains only files with "5.0" in its name or path. -%defattr(-, root, root) %doc COPYING %{_bindir}/gda-list-config-5.0 %{_bindir}/gda-list-jdbc-providers-5.0 @@ -479,7 +480,6 @@ %exclude %{_datadir}/libgda-5.0/gda_trml2pdf %files ui-5_0-tools -%defattr(-, root, root) %doc %{_datadir}/help/C/gda-browser/ # gda-browser %{_bindir}/gda-browser-5.0 @@ -496,7 +496,6 @@ %{_datadir}/libgda-5.0/pixmaps/gda-control-center*.png %files 5_0-4 -%defattr(-, root, root) %doc AUTHORS COPYING.LIB ChangeLog NEWS README %{_libdir}/libgda-5.0.so.* %dir %{_datadir}/libgda-5.0 @@ -510,11 +509,9 @@ %dir %{_libdir}/libgda-5.0/providers %files -n typelib-1_0-Gda-5_0 -%defattr(-,root,root) %{_libdir}/girepository-1.0/Gda-5.0.typelib %files ui-5_0-4 -%defattr(-,root,root) %{_libdir}/libgda-ui-5.0.so.* %dir %{_datadir}/libgda-5.0/pixmaps %dir %{_datadir}/libgda-5.0/ui @@ -526,29 +523,24 @@ %{_datadir}/libgda-5.0/server_operation.glade %files -n typelib-1_0-Gdaui-5_0 -%defattr(-,root,root) %{_libdir}/girepository-1.0/Gdaui-5.0.typelib %files ui-5_0-plugins -%defattr(-,root,root) %{_libdir}/libgda-5.0/plugins/gdaui-*.xml %{_libdir}/libgda-5.0/plugins/libgda-ui-plugins.so # For syntax highlighting %{_datadir}/libgda-5.0/language-specs/ %files report-5_0-4 -%defattr(-, root, root) # NOTE: This library has the same versioning policy, but depends on libgda-sqlite. %{_datadir}/libgda-5.0/gda_trml2html %{_datadir}/libgda-5.0/gda_trml2pdf %{_libdir}/libgda-report-5.0.so.* %files xslt-5_0-4 -%defattr(-, root, root) %{_libdir}/libgda-xslt-5.0.so.* %files 5_0-devel -%defattr(-, root, root) # NOTE: Files don't conflict with previous version => Use versioned package name %{_includedir}/libgda-5.0/ %{_libdir}/libgda-5.0.so @@ -563,69 +555,58 @@ %{_datadir}/libgda-5.0/demo/ %files 5_0-doc -%defattr(-, root, root) # NOTE: Files don't conflict with previous version => Use versioned package name %{_datadir}/gtk-doc/html/gda-browser/ %{_datadir}/gtk-doc/html/libgda-5.0/ %files 5_0-bdb -%defattr(-, root, root) # NOTE: Files don't conflict with previous version => Use versioned package name %{_libdir}/libgda-5.0/providers/libgda-bdb.so %{_datadir}/libgda-5.0/bdb_*.xml %files 5_0-firebird -%defattr(-, root, root) # NOTE: Files don't conflict with previous version => Use versioned package name %{_libdir}/libgda-5.0/providers/libgda-firebird-client.so %{_datadir}/libgda-5.0/firebird_*.xml %files 5_0-jdbc -%defattr(-, root, root) # NOTE: Files don't conflict with previous version => Use versioned package name %{_libdir}/libgda-5.0/providers/gdaprovider-5.0.jar %{_libdir}/libgda-5.0/providers/libgda-jdbc.so %{_datadir}/libgda-5.0/jdbc_*.xml %files 5_0-ldap -%defattr(-, root, root) # NOTE: Files don't conflict with previous version => Use versioned package name %{_libdir}/libgda-5.0/providers/libgda-ldap.so %{_datadir}/libgda-5.0/ldap_*.xml %files 5_0-mdb -%defattr(-, root, root) # NOTE: Files don't conflict with previous version => Use versioned package name %{_libdir}/libgda-5.0/providers/libgda-mdb.so %{_datadir}/libgda-5.0/mdb_*.xml %files 5_0-mysql -%defattr(-, root, root) # NOTE: Files don't conflict with previous version => Use versioned package name %{_libdir}/libgda-5.0/providers/libgda-mysql.so %{_datadir}/libgda-5.0/mysql_*.xml %files 5_0-postgres -%defattr(-, root, root) # NOTE: Files don't conflict with previous version => Use versioned package name %{_libdir}/libgda-5.0/providers/libgda-postgres.so %{_datadir}/libgda-5.0/postgres_*.xml %files 5_0-sqlcipher -%defattr(-, root, root) # NOTE: Files don't conflict with previous version => Use versioned package name %doc providers/sqlcipher/COPYING.sqlcipher %{_libdir}/libgda-5.0/providers/libgda-sqlcipher.so %{_datadir}/libgda-5.0/sqlcipher_*.xml %files 5_0-sqlite -%defattr(-, root, root) # NOTE: Files don't conflict with previous version => Use versioned package name %{_libdir}/libgda-5.0/providers/libgda-sqlite.so %{_datadir}/libgda-5.0/sqlite_*.xml %files 5_0-web -%defattr(-, root, root) # NOTE: Files don't conflict with previous version => Use versioned package name %{_libdir}/libgda-5.0/providers/libgda-web.so %{_datadir}/libgda-5.0/web_*.xml ++++++ libgda-5.2.4-nojavah.patch ++++++ --- libgda-5.2.4/m4/java.m4 2018-01-08 13:12:26.228444544 +0100 +++ libgda-5.2.4/m4/java.m4 2018-01-08 13:13:52.932444872 +0100 @@ -111,13 +111,11 @@ AC_MSG_CHECKING([if all java programs are found]) AC_PATH_PROGS(JAVA_PROG,java,,${JAVA_PATH}) AC_PATH_PROGS(JAVAC,javac,,${JAVA_PATH}) - AC_PATH_PROGS(JAVAH,javah,,${JAVA_PATH}) AC_PATH_PROGS(JAR,jar,,${JAVA_PATH}) have_all_java=yes if test -z "$JAVA_PROG"; then have_all_java=no; fi if test -z "$JAVAC"; then have_all_java=no; fi - if test -z "$JAVAH"; then have_all_java=no; fi if test -z "$JAR"; then have_all_java=no; fi if test ${have_all_java} = no; then AC_MSG_WARN([one or more Java tools are missing (JRE is not sufficient)]) --- libgda-5.2.4/providers/jdbc/Makefile.am 2018-01-08 13:12:26.180444544 +0100 +++ libgda-5.2.4/providers/jdbc/Makefile.am 2018-01-08 13:16:14.224008270 +0100 @@ -76,7 +76,6 @@ CLEANFILES = $(resources) $(jni_headers): $(jdbcprov_classes) - $(JAVAH) -classpath . -d $(builddir) -force `basename $@ | sed -e 's/\.h$$//'` jdbcprov_jar = gdaprovider-5.0.jar jdbcprov_sources = \ @@ -91,7 +90,7 @@ jdbcprov_DATA = $(jdbcprov_jar) GdaJConnection.class: $(jdbcprov_sources) - $(JAVAC) -cp . $(JFLAGS) -d $(top_builddir)/providers/jdbc $^ + $(JAVAC) -cp . $(JFLAGS) -d $(top_builddir)/providers/jdbc -h $(builddir) $^ $(jdbcprov_jar): $(jdbcprov_classes) $(JAR) cfm $(jdbcprov_jar) $(top_srcdir)/providers/jdbc/MANIFEST.MF *.class ++++++ libgda-jre10.patch ++++++ --- libgda-5.2.4/m4/java.m4 2018-01-08 13:27:17.718276512 +0100 +++ libgda-5.2.4/m4/java.m4 2018-01-08 13:29:09.958276936 +0100 @@ -185,6 +185,11 @@ JTYPE="Sun JRE 9" JFLAGS="-Xlint:unchecked -Xlint:deprecation" ;; + JRE10*) + try_java=true + JTYPE="Sun JRE 10" + JFLAGS="-Xlint:unchecked -Xlint:deprecation" + ;; JREgcj-4*) try_java=true JTYPE="GCJ" ++++++ libgda-jre18.patch ++++++ --- /var/tmp/diff_new_pack.XQKEAg/_old 2018-01-09 14:55:13.078107024 +0100 +++ /var/tmp/diff_new_pack.XQKEAg/_new 2018-01-09 14:55:13.078107024 +0100 @@ -1,6 +1,6 @@ ---- libgda-5.2.2/configure.orig 2014-05-17 14:58:33.206028742 +0200 -+++ libgda-5.2.2/configure 2014-05-17 14:58:45.937790443 +0200 -@@ -23200,6 +23259,11 @@ +--- libgda-5.2.4/m4/java.m4 2018-01-08 13:12:26.228444544 +0100 ++++ libgda-5.2.4/m4/java.m4 2018-01-08 13:25:05.222276012 +0100 +@@ -175,6 +175,11 @@ JTYPE="Sun JRE 1.7" JFLAGS="-Xlint:unchecked -Xlint:deprecation" ;; ++++++ libgda-jre9.patch ++++++ --- /var/tmp/diff_new_pack.XQKEAg/_old 2018-01-09 14:55:13.094106275 +0100 +++ /var/tmp/diff_new_pack.XQKEAg/_new 2018-01-09 14:55:13.094106275 +0100 @@ -1,8 +1,6 @@ -Index: libgda-5.2.4/configure -=================================================================== ---- libgda-5.2.4.orig/configure -+++ libgda-5.2.4/configure -@@ -23570,6 +23570,11 @@ $as_echo_n "checking java compiler versi +--- libgda-5.2.4/m4/java.m4 2018-01-08 13:25:53.682276195 +0100 ++++ libgda-5.2.4/m4/java.m4 2018-01-08 13:26:48.582276402 +0100 +@@ -180,6 +180,11 @@ JTYPE="Sun JRE 1.8" JFLAGS="-Xlint:unchecked -Xlint:deprecation" ;;
