diff --git a/.gitignore b/.gitignore index e31a1d7..ecb777e 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ libgdata-0.6.4.tar.bz2 /libgdata-0.17.8.tar.xz /libgdata-0.17.9.tar.xz /libgdata-0.17.10.tar.xz +/libgdata-0.17.11.tar.xz diff --git a/libgdata-build-fixes.patch b/libgdata-build-fixes.patch deleted file mode 100644 index a427f51..0000000 --- a/libgdata-build-fixes.patch +++ /dev/null @@ -1,238 +0,0 @@ -From 24aae504e2833e46f3808f38cea60c5e3178e175 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Tue, 25 Jun 2019 22:31:39 +0200 -Subject: [PATCH 1/4] meson: Fix library version - -Setting soversion means the soname ends in '22.4.0' instead of the -expected '22'. So we want the *soversion* to be '22' and the *version* -to be '22.4.0'. - -We only need to set the version as meson can derive the soversion from -it. ---- - gdata/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdata/meson.build b/gdata/meson.build -index 87cb702a..d221800c 100644 ---- a/gdata/meson.build -+++ b/gdata/meson.build -@@ -142,7 +142,7 @@ libgdata_lib = shared_library( - link_args: ldflags, - link_depends: symbol_map, - install: true, -- soversion: gdata_soversion, -+ version: gdata_soversion, - gnu_symbol_visibility: 'default', - ) - --- -2.21.0 - - -From af4195cda796dba6a9285e733c3e356cf6f7a21e Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Tue, 25 Jun 2019 22:31:40 +0200 -Subject: [PATCH 2/4] meson: Fix gettext build - -Set the proper package name for both the code and the MO files. ---- - meson.build | 2 +- - po/meson.build | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 7d2f5254..a11c117b 100644 ---- a/meson.build -+++ b/meson.build -@@ -52,7 +52,7 @@ config_h.set_quoted('VERSION', gdata_version) - # Globally define _GNU_SOURCE and therefore enable the GNU extensions - config_h.set('_GNU_SOURCE', true) - --config_h.set_quoted('GETTEXT_PACKAGE', 'intltest') -+config_h.set_quoted('GETTEXT_PACKAGE', 'gdata') - - gnome = import('gnome') - pkgconfig = import('pkgconfig') -diff --git a/po/meson.build b/po/meson.build -index c5849b6d..082eb58f 100644 ---- a/po/meson.build -+++ b/po/meson.build -@@ -1 +1 @@ --i18n.gettext('libgdata', preset: 'glib') -+i18n.gettext('gdata', preset: 'glib') --- -2.21.0 - - -From be94375e0d164dcc2486e39e7acbace6df12965c Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Tue, 25 Jun 2019 22:31:40 +0200 -Subject: [PATCH 3/4] meson: Use set instead of set10 - -The code uses #ifdef, which tests for definedness, not the define's -value. ---- - meson.build | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/meson.build b/meson.build -index a11c117b..26ac64f8 100644 ---- a/meson.build -+++ b/meson.build -@@ -93,7 +93,7 @@ libsoup_dep = dependency('libsoup-2.4', version: '>= 2.42.0') - gdata_deps += libsoup_dep - # libsoup 2.47.3 is needed for the new SoupServer API; but it contained a bug in - # soup_server_set_ssl_cert_file() which was only fixed in 2.55.90. --config_h.set10('HAVE_LIBSOUP_2_55_90', libsoup_dep.version().version_compare('>= 2.55.90')) -+config_h.set('HAVE_LIBSOUP_2_55_90', libsoup_dep.version().version_compare('>= 2.55.90')) - - # Check for gtk - gtk_dep_req_version = '>= 2.91.2' -@@ -116,7 +116,7 @@ if enable_goa - gdata_deps += goa_dep - gdata_private_deps += dependency('gcr-base-3') - endif --config_h.set10('HAVE_GOA', goa_dep.found()) -+config_h.set('HAVE_GOA', goa_dep.found()) - - # Enable always building tests (default: yes) enable_always_build_tests = get_option('always_build_tests') - # Install test programs (default: no) -@@ -127,7 +127,7 @@ if always_build_tests - libuhttpmock_dep = dependency('libuhttpmock-0.0', version: '>= 0.5.0') - - gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', version: '>= 2.14') -- config_h.set10('HAVE_GDK_PIXBUF', gdk_pixbuf_dep.found()) -+ config_h.set('HAVE_GDK_PIXBUF', gdk_pixbuf_dep.found()) - endif - - check_functions = [ -@@ -143,7 +143,7 @@ check_functions += [ - ] - - foreach func: check_functions -- config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func)) -+ config_h.set('HAVE_' + func.to_upper(), cc.has_function(func)) - endforeach - - check_headers = [ --- -2.21.0 - - -From f3156178498beb6e64b001ed255b064c32682d39 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Tue, 25 Jun 2019 22:31:40 +0200 -Subject: [PATCH 4/4] meson: Fix handling of 'gnome' option - -HAVE_GNOME needs to be defined. Also move the gcr dep from the 'goa' -option. ---- - meson.build | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 26ac64f8..9edfeca2 100644 ---- a/meson.build -+++ b/meson.build -@@ -105,7 +105,12 @@ gtk_dep = dependency( - ) - - # GNOME support, which pulls in gcr-base-3 to provide non-pageable memory --enable_gnome = get_option('gnome') -+gcr_dep = dependency('gcr-base-3', required: get_option('gnome')) -+enable_gnome = gcr_dep.found() -+if enable_gnome -+ gdata_private_deps += dependency('gcr-base-3') -+endif -+config_h.set('HAVE_GNOME', gcr_dep.found()) - - # Check for goa - # GNOME Online Accounts support -- only used if GNOME support is also enabled -@@ -114,7 +119,6 @@ goa_dep = dependency('goa-1.0', version: '>= 3.8', required: get_option('goa')) - enable_goa = goa_dep.found() - if enable_goa - gdata_deps += goa_dep -- gdata_private_deps += dependency('gcr-base-3') - endif - config_h.set('HAVE_GOA', goa_dep.found()) - --- -2.21.0 - -From 0a6899b5d551a81ec7894d007c03f5f77663e775 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= -Date: Wed, 3 Jul 2019 09:37:09 +0200 -Subject: [PATCH 1/3] meson: Reuse of already defined enable gnome variable - ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 9edfeca2..eb6479e3 100644 ---- a/meson.build -+++ b/meson.build -@@ -110,7 +110,7 @@ enable_gnome = gcr_dep.found() - if enable_gnome - gdata_private_deps += dependency('gcr-base-3') - endif --config_h.set('HAVE_GNOME', gcr_dep.found()) -+config_h.set('HAVE_GNOME', enable_gnome) - - # Check for goa - # GNOME Online Accounts support -- only used if GNOME support is also enabled --- -2.21.0 - - -From 11ac4880bb7960fbf5069b95c29b78e771b79805 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= -Date: Wed, 3 Jul 2019 09:38:26 +0200 -Subject: [PATCH 2/3] meson: Remove unused HAVE_GOA define setting - ---- - meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/meson.build b/meson.build -index eb6479e3..d355eda8 100644 ---- a/meson.build -+++ b/meson.build -@@ -120,7 +120,6 @@ enable_goa = goa_dep.found() - if enable_goa - gdata_deps += goa_dep - endif --config_h.set('HAVE_GOA', goa_dep.found()) - - # Enable always building tests (default: yes) enable_always_build_tests = get_option('always_build_tests') - # Install test programs (default: no) --- -2.21.0 - - -From d1c871a1a6c4491899b4434865b5037f13df94ce Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= -Date: Wed, 3 Jul 2019 09:38:57 +0200 -Subject: [PATCH 3/3] meson: Remove unnecessary functions defines - ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index d355eda8..36d8cc1c 100644 ---- a/meson.build -+++ b/meson.build -@@ -146,7 +146,7 @@ check_functions += [ - ] - - foreach func: check_functions -- config_h.set('HAVE_' + func.to_upper(), cc.has_function(func)) -+ cc.has_function(func) - endforeach - - check_headers = [ --- -2.21.0 - diff --git a/libgdata.spec b/libgdata.spec index a12db5f..c225763 100644 --- a/libgdata.spec +++ b/libgdata.spec @@ -1,15 +1,12 @@ Name: libgdata -Version: 0.17.10 -Release: 2%{?dist} +Version: 0.17.11 +Release: 1%{?dist} Summary: Library for the GData protocol License: LGPLv2+ URL: https://wiki.gnome.org/Projects/libgdata Source0: https://download.gnome.org/sources/%{name}/0.17/%{name}-%{version}.tar.xz -# Build fixes backported from upstream -Patch0: libgdata-build-fixes.patch - BuildRequires: gcr-devel BuildRequires: gettext BuildRequires: glib2-devel @@ -84,6 +81,9 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{_datadir}/vala/ %changelog +* Wed Aug 21 2019 Kalev Lember - 0.17.11-1 +- Update to 0.17.11 + * Thu Jul 25 2019 Fedora Release Engineering - 0.17.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 37e4760..843435f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libgdata-0.17.10.tar.xz) = 01f8bb121c402fc0af8e9f12cafba326a87cef6756ced72652890c834fd4f497a060f6455ab66d4af92d9cd34b4d6fdf58033dca0f91bb806c80b60987955c22 +SHA512 (libgdata-0.17.11.tar.xz) = 5abb00e6ebee1010fb6d9eab675e03d94883cac88e42b403a7d750bff73d65d0b35aae5c9e8f17a182819193b4a049ac7e9fc644ad9fa79872924ed5704c8982