import libgweather-3.28.2-3.el8

This commit is contained in:
CentOS Sources 2021-05-18 02:41:23 -04:00 committed by Andrew Lukoshko
parent c15b088e48
commit 78249ce6a4
2 changed files with 46 additions and 1 deletions

View File

@ -0,0 +1,40 @@
From 88461473c20a6a7e4d61d144de083340d65eb75a Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Wed, 18 Jul 2018 13:50:23 +0200
Subject: [PATCH] build: Don't use a full path inside generated enum header
It causes multilib problems.
---
libgweather/gweather-enum-types.c.tmpl | 2 +-
libgweather/gweather-enum-types.h.tmpl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libgweather/gweather-enum-types.c.tmpl b/libgweather/gweather-enum-types.c.tmpl
index 4430bda8..fe1f7c4d 100644
--- a/libgweather/gweather-enum-types.c.tmpl
+++ b/libgweather/gweather-enum-types.c.tmpl
@@ -7,7 +7,7 @@
/*** END file-header ***/
/*** BEGIN file-production ***/
-/* enumerations from "@filename@" */
+/* enumerations from "@basename@" */
/*** END file-production ***/
/*** BEGIN value-header ***/
diff --git a/libgweather/gweather-enum-types.h.tmpl b/libgweather/gweather-enum-types.h.tmpl
index 3ca19950..d50063da 100644
--- a/libgweather/gweather-enum-types.h.tmpl
+++ b/libgweather/gweather-enum-types.h.tmpl
@@ -14,7 +14,7 @@ G_BEGIN_DECLS
/*** BEGIN file-production ***/
-/* enumerations from "@filename@" */
+/* enumerations from "@basename@" */
/*** END file-production ***/
/*** BEGIN value-header ***/
--
GitLab

View File

@ -1,11 +1,13 @@
Name: libgweather
Version: 3.28.2
Release: 2%{?dist}
Release: 3%{?dist}
Summary: A library for weather information
License: GPLv2+
URL: https://wiki.gnome.org/Projects/LibGWeather
Source0: https://download.gnome.org/sources/libgweather/3.28/%{name}-%{version}.tar.xz
# https://bugzilla.redhat.com/show_bug.cgi?id=1853151
Patch0: libgweather-3.28.2-fix-enum-types-multilib.patch
BuildRequires: gettext
BuildRequires: gtk-doc
@ -70,6 +72,9 @@ developing applications that use %{name}.
%{_datadir}/vala/vapi/gweather-3.0.vapi
%changelog
* Wed Oct 07 2020 David King <dking@redhat.com> - 3.28.2-3
- Fix multilib conflict in enum header (#1853151)
* Thu Aug 09 2018 Debarshi Ray <rishi@fedoraproject.org> - 3.28.2-2
- Fix dangling symbolic link to README.md
Resolves: #1614386