From c7cf06b30e9573ad007eff501dd574827a492165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0abata?= <contyk@redhat.com>
Date: Tue, 10 Apr 2018 21:56:57 +0200
Subject: [PATCH] 0.2.9 bump
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Petr Šabata <contyk@redhat.com>
---
 .gitignore  |  1 +
 girara.spec | 53 +++++++++++++++++++++++++----------------------------
 sources     |  2 +-
 3 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index 220ff47..3314d92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /girara-0.2.5.tar.gz
 /girara-0.2.6.tar.gz
 /girara-0.2.7.tar.gz
+/girara-0.2.9.tar.xz
diff --git a/girara.spec b/girara.spec
index 3abad48..9a586a7 100644
--- a/girara.spec
+++ b/girara.spec
@@ -1,22 +1,21 @@
 Name:              girara
-Version:           0.2.7
-Release:           7%{?dist}
+Version:           0.2.9
+Release:           1%{?dist}
 Summary:           Simple user interface library
 License:           zlib
 URL:               http://pwmt.org/projects/%{name}/
-Source0:           http://pwmt.org/projects/%{name}/download/%{name}-%{version}.tar.gz
+Source0:           http://pwmt.org/projects/%{name}/download/%{name}-%{version}.tar.xz
 BuildRequires:     binutils
-BuildRequires:     coreutils
 BuildRequires:     gcc
 BuildRequires:     gettext
-BuildRequires:     make
-BuildRequires:     pkgconfig
-BuildRequires:     pkgconfig(glib-2.0)
-BuildRequires:     pkgconfig(gtk+-3.0)
-BuildRequires:     pkgconfig(json-c)
-BuildRequires:     pkgconfig(libnotify)
-Requires(post):    glibc
-Requires(postun):  glibc
+BuildRequires:     glib2-devel >= 2.50
+BuildRequires:     gtk3-devel >= 3.20
+BuildRequires:     intltool
+BuildRequires:     json-c-devel
+BuildRequires:     libnotify-devel
+BuildRequires:     meson >= 0.43
+
+%global girara_locales lib%{name}-gtk3-3
 
 %description
 Girara is a library that implements a user interface that focuses on simplicity
@@ -34,31 +33,29 @@ developing applications that use %{name}.
 %setup -q
 
 %build
-CFLAGS='%{optflags}' make %{?_smp_mflags}
+%meson
+%meson_build
 
 %install
-make install DESTDIR=%{buildroot} LIBDIR=%{_libdir}
-chmod +x %{buildroot}/%{_libdir}/libgirara-gtk?.so.2.0
-# fcami - I wish upstream used a consistent naming scheme
-%find_lang lib%{name}-gtk3-2
-mv lib%{name}-gtk3-2.lang %{name}.lang
-rm -f %{buildroot}/%{_libdir}/libgirara-gtk?.a
-
-%files -f  %{name}.lang
+%meson_install
+%find_lang %{girara_locales}
+
+%files -f %{girara_locales}.lang
 %license LICENSE
 %doc AUTHORS README
-%{_libdir}/libgirara-gtk?.so.*
+%{_libdir}/libgirara-gtk3.so.*
 
 %files devel
 %{_includedir}/%{name}/*.h
-%{_libdir}/pkgconfig/girara-gtk?.pc
-%{_libdir}/libgirara-gtk?.so
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%{_libdir}/pkgconfig/girara-gtk3.pc
+%{_libdir}/libgirara-gtk3.so
 
 %changelog
+* Tue Apr 10 2018 Petr Šabata <contyk@redhat.com> - 0.2.9-1
+- 0.2.9 bump
+- Upstream switches to meson
+- Dropping the ldconfig scriptlets as this is aimed at F28+
+
 * Tue Mar 06 2018 Björn Esser <besser82@fedoraproject.org> - 0.2.7-7
 - Rebuilt for libjson-c.so.4 (json-c v0.13.1)
 
diff --git a/sources b/sources
index c1c9092..5f2b653 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (girara-0.2.7.tar.gz) = 4229565b8a5fad1ecbf42e4f3f852644964a7d5c90154dab9b7dcb5ccd5f25731911452472bbeb28927d1e30d4df6ed066926e11c6a73f0fd5740570493a036f
+SHA512 (girara-0.2.9.tar.xz) = 2e04d3c436dc79098676652d8d503c82b9c6f75af92e84b32ee5e41bcaaca38d079eebd9c1cb461789cff4461c1bea2f95a868dd4cd09acb708f30a5044e5c87