From caa02dbdef3751c1790ad965a062bcb87fdccaca Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 11 Jun 2021 18:45:27 +0200 Subject: [PATCH] - added soname patch (fix messed sonames) - ldconfig for -ui - release 2 --- libgda6-soname.patch | 52 ++++++++++++++++++++++++++++++++++++++++++++ libgda6.spec | 7 +++++- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 libgda6-soname.patch diff --git a/libgda6-soname.patch b/libgda6-soname.patch new file mode 100644 index 0000000..6b05f84 --- /dev/null +++ b/libgda6-soname.patch @@ -0,0 +1,52 @@ +--- libgda-6.0.0/libgda/meson.build.orig 2021-02-01 01:29:25.121580000 +0100 ++++ libgda-6.0.0/libgda/meson.build 2021-06-11 18:28:23.665679350 +0200 +@@ -342,8 +342,8 @@ + libgda = library( + 'gda-'+project_api_version, + libgda_source_all+valacs, +- soversion : LT_VERSION+'.'+LT_AGE+'.'+LT_REVISION, +- version : LT_VERSION, ++ version : LT_VERSION+'.'+LT_AGE+'.'+LT_REVISION, ++ soversion : LT_VERSION, + dependencies : libgda_deps, + c_args : [ + libgda_cargs, +--- libgda-6.0.0/libgda-report/meson.build.orig 2021-02-01 01:29:25.069502600 +0100 ++++ libgda-6.0.0/libgda-report/meson.build 2021-06-11 18:28:45.042230210 +0200 +@@ -30,8 +30,8 @@ + libgda_report = library( + 'gda-report-'+project_api_version, + libgda_report_sources, +- soversion : LT_VERSION+'.'+LT_AGE+'.'+LT_REVISION, +- version : LT_VERSION, ++ version : LT_VERSION+'.'+LT_AGE+'.'+LT_REVISION, ++ soversion : LT_VERSION, + dependencies : [libgda_dep, + gdkpixbuf_dep, + inc_libgda_reporth_dep, +--- libgda-6.0.0/libgda-ui/meson.build.orig 2021-02-01 01:29:25.093538300 +0100 ++++ libgda-6.0.0/libgda-ui/meson.build 2021-06-11 18:28:55.305507942 +0200 +@@ -135,8 +135,8 @@ + + libgdaui = library('gda-ui-'+project_api_version, + libgda_ui_sources_all, +- soversion : LT_VERSION+'.'+LT_AGE+'.'+LT_REVISION, +- version : LT_VERSION, ++ version : LT_VERSION+'.'+LT_AGE+'.'+LT_REVISION, ++ soversion : LT_VERSION, + dependencies: [ + libgda_ui_deps, + inc_rooth_dep +--- libgda-6.0.0/libgda-xslt/meson.build.orig 2021-02-01 01:29:25.093538300 +0100 ++++ libgda-6.0.0/libgda-xslt/meson.build 2021-06-11 18:29:04.372125491 +0200 +@@ -17,8 +17,8 @@ + libgda_xslt = library( + 'gda-xslt-'+project_api_version, + libgda_xslt_sources, +- soversion : LT_VERSION+'.'+LT_AGE+'.'+LT_REVISION, +- version : LT_VERSION, ++ version : LT_VERSION+'.'+LT_AGE+'.'+LT_REVISION, ++ soversion : LT_VERSION, + dependencies : [libgda_dep, + libxslt_dep, + inc_libgda_xslth_dep, diff --git a/libgda6.spec b/libgda6.spec index 71af1e4..88e2521 100644 --- a/libgda6.spec +++ b/libgda6.spec @@ -24,12 +24,13 @@ Summary: GNU Data Access library Summary(pl.UTF-8): Biblioteka GNU Data Access Name: libgda6 Version: 6.0.0 -Release: 1 +Release: 2 License: LGPL v2+/GPL v2+ Group: Libraries Source0: https://download.gnome.org/sources/libgda/6.0/libgda-%{version}.tar.xz # Source0-md5: 2e059e57b0620fb23fc74f3d2bd0fd1f Patch0: %{name}-web.patch +Patch1: %{name}-soname.patch URL: https://www.gnome-db.org/ %{?with_firebird:BuildRequires: Firebird-devel} BuildRequires: autoconf >= 2.68 @@ -387,6 +388,7 @@ Plik katalogu oraz ikony libgda dla Glade. %prep %setup -q -n libgda-%{version} %patch0 -p1 +%patch1 -p1 %{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' \ libgda-report/RML/trml2html/trml2html.py \ @@ -426,6 +428,9 @@ rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%post ui -p /sbin/ldconfig +%postun ui -p /sbin/ldconfig + %post tools %update_icon_cache hicolor -- 2.44.0