From c07082bbbc1bd09fd1f616586313f341c6d6c665 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Jul 27 2018 09:13:35 +0000 Subject: bump to commit 43fee49 and add patch to fix building with meson 0.47+ --- diff --git a/.gitignore b/.gitignore index 29dce11..a93ced4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /gsignond-plugin-oauth-787e8bc.tar.gz /gsignond-plugin-oauth-b36060b.tar.gz +/gsignond-plugin-oauth-43fee49.tar.gz diff --git a/00-fix-meson-047-errors.patch b/00-fix-meson-047-errors.patch new file mode 100644 index 0000000..fb6860d --- /dev/null +++ b/00-fix-meson-047-errors.patch @@ -0,0 +1,12 @@ +diff --git a/docs/meson.build b/docs/meson.build +index 78a345f..765564e 100644 +--- a/docs/meson.build ++++ b/docs/meson.build +@@ -38,7 +38,6 @@ gnome.gtkdoc('gsignond-plugin-' + meson.project_name(), + ], + content_files: content_files, + ignore_headers: private_headers, +- scan_args: ['--rebuild-types'], + install: true + ) + diff --git a/gsignond-plugin-oauth.spec b/gsignond-plugin-oauth.spec index feb29d9..b311beb 100644 --- a/gsignond-plugin-oauth.spec +++ b/gsignond-plugin-oauth.spec @@ -2,19 +2,22 @@ %global srcname gsignond-plugin-oa -%global commit b36060b7b384c8f86d3fba153d7b2b645287df3b +%global commit 43fee492ef84533ea2282a161b2695e0a95eb186 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20171111 +%global commitdate 20180513 Name: gsignond-plugin-oauth Summary: OAuth plugin for gsignond Version: 0 -Release: 0.4.%{commitdate}.git%{shortcommit}%{?dist} +Release: 0.5.%{commitdate}.git%{shortcommit}%{?dist} License: LGPLv2+ URL: https://gitlab.com/accounts-sso/%{srcname} Source0: %{url}/-/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +# This patch is needed to fix building with meson 0.47+ +Patch0: 00-fix-meson-047-errors.patch + BuildRequires: gcc BuildRequires: gtk-doc BuildRequires: meson @@ -47,7 +50,7 @@ This package contains the documentation. %prep -%autosetup -n %{srcname}-%{commit} +%autosetup -n %{srcname}-%{commit} -p1 %build @@ -74,6 +77,10 @@ This package contains the documentation. %changelog +* Fri Jul 27 2018 Fabio Valentini - 0-0.5.20180513.git43fee49 +- Bump to commit 43fee49. +- Add patch to fix building with meson 0.47+. + * Fri Jul 13 2018 Fedora Release Engineering - 0-0.4.20171111.gitb36060b - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index ab56250..37334e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gsignond-plugin-oauth-b36060b.tar.gz) = d0b6cb848b4426d3ceb2e4124682f464adfe98465d350465fbd2fa57f74e57ec76f5467cd9f5ed5563ab0b73d04c444c9011c459aac4cbc02344548ffd6c8123 +SHA512 (gsignond-plugin-oauth-43fee49.tar.gz) = e160c299f7e1aae1660136c593a01c9f1e811c2a0115f21e6188b54fd46ab6c9554cb1d4eb88c21b06a819a46f8a97c04c02a30a007eec91b4ee251b054b59f7