Update to gcolor3 2.3.1

3 files changed, 31 insertions, 70 deletions

diff --git a/gcolor3-2.2-appdata_url.patch b/gcolor3-2.2-appdata_url.patch
deleted file mode 100644
index 2ec7ff0..0000000
--- a/gcolor3-2.2-appdata_url.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- data/gcolor3.appdata.xml.in.orig	2016-08-20 16:55:13.000000000 +0200
-+++ data/gcolor3.appdata.xml.in	2017-08-17 10:19:08.047530668 +0200
-@@ -29,17 +29,17 @@
-   </kudos>
-   <screenshots>
-     <screenshot type="default">
--      <image>https://raw.githubusercontent.com/Unia/unia.github.io/hugo/static/images/projects/gcolor3/picker.png</image>
-+      <image>https://raw.githubusercontent.com/Hjdskes/gcolor3/0d41086dd845e3ed01f04511902aae2e84c836f1/picker.png</image>
-       <_caption>The picker and the color palette</_caption>
-     </screenshot>
-     <screenshot>
--      <image>https://raw.githubusercontent.com/Unia/unia.github.io/hugo/static/images/projects/gcolor3/saved.png</image>
-+      <image>https://raw.githubusercontent.com/Hjdskes/gcolor3/0d41086dd845e3ed01f04511902aae2e84c836f1/saved.png</image>
-       <_caption>The list of saved colors</_caption>
-     </screenshot>
-   </screenshots>
--  <url type="homepage">https://unia.github.io/projects/gcolor3/</url>
--  <url type="bugtracker">https://github.com/Unia/gcolor3/issues</url>
--  <url type="help">https://github.com/Unia/gcolor3/issues</url>
-+  <url type="homepage">https://hjdskes.github.io/projects/gcolor3/</url>
-+  <url type="bugtracker">https://github.com/Hjdskes/gcolor3/issues</url>
-+  <url type="help">https://github.com/Hjdskes/gcolor3/issues</url>
-   <developer_name>Jente Hidskes</developer_name>
-   <update_contact>hjdskes_at_gmail.com</update_contact>
-   <translation type="gettext">gcolor3</translation>
diff --git a/gcolor3-2.2-cast_error.patch b/gcolor3-2.2-cast_error.patch
deleted file mode 100644
index d87d5a5..0000000
--- a/gcolor3-2.2-cast_error.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/gcolor3-application.c.orig	2018-06-26 11:46:38.380289447 +0200
-+++ src/gcolor3-application.c	2018-06-26 11:46:41.815303811 +0200
-@@ -36,6 +36,11 @@
- 
- G_DEFINE_TYPE_WITH_PRIVATE (Gcolor3Application, gcolor3_application, GTK_TYPE_APPLICATION);
- 
-+static void destroy(GtkWidget *widget, __attribute__((unused)) gpointer user_data)
-+{
-+  gtk_widget_destroy(widget);
-+}
-+
- static void
- gcolor3_application_action_about (UNUSED GSimpleAction *action,
- 				  UNUSED GVariant      *parameter,
-@@ -77,7 +82,7 @@
- 
- 	windows = gtk_application_get_windows (GTK_APPLICATION (user_data));
- 
--	g_list_foreach (windows, (GFunc) gtk_widget_destroy, NULL);
-+	g_list_foreach (windows, (GFunc) destroy, NULL);
- }
- 
- static GActionEntry app_entries[] = {
diff --git a/gcolor3.spec b/gcolor3.spec
index 8150f82..d0e15eb 100644
--- a/gcolor3.spec
+++ b/gcolor3.spec
@@ -1,15 +1,19 @@
 Name:           gcolor3
-Version:        2.2
-Release:        4%{?dist}
+Version:        2.3.1
+Release:        1%{?dist}
 Summary:        A simple color chooser written in GTK3 (like gcolor2)
 
 License:        GPLv2+
-URL:            https://github.com/Unia/gcolor3
+URL:            https://www.hjdskes.nl/projects/gcolor3/
 
-Source0:        https://github.com/Hjdskes/gcolor3/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Patch0:         gcolor3-2.2-appdata_url.patch
-Patch1:         gcolor3-2.2-cast_error.patch
-BuildRequires:  gnome-common,gtk3-devel >= 3.12.0,intltool,desktop-file-utils,gettext,libappstream-glib
+Source0:        https://gitlab.gnome.org/World/%{name}/-/archive/v%{version}/%{name}-v%{version}.tar.gz
+BuildRequires:  meson
+BuildRequires:  gnome-common
+BuildRequires:  gtk3-devel >= 3.12.0
+BuildRequires:  intltool
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
+BuildRequires:  libappstream-glib
 
 %description
 Gcolor3 is a color selection dialog written in GTK+ 3. It is much alike Gcolor2,
@@ -19,20 +23,18 @@ use an .ini style file to save colors (older versions use the same file as
 Gcolor2).
 
 %prep
-%setup -q
-%patch0
-%patch1
-NOCONFIGURE=1 ./autogen.sh
+%autosetup -n %{name}-v%{version}
 
 %build
-%configure
-%make_build
+%meson
+%meson_build
 
 %install
-%make_install
-%find_lang Gcolor3
-desktop-file-validate %{buildroot}/%{_datadir}/applications/gcolor3.desktop
-appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/gcolor3.appdata.xml
+%meson_install
+
+%find_lang gcolor3
+desktop-file-validate %{buildroot}%{_datadir}/applications/nl.hjdskes.gcolor3.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/nl.hjdskes.gcolor3.appdata.xml
 
 %post
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -46,15 +48,22 @@ fi
 %posttrans
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
-%files -f Gcolor3.lang
-%doc README.md AUTHORS
+%files -f gcolor3.lang
+%doc README.md
 %license LICENSE
 %{_bindir}/gcolor3
-%{_datadir}/appdata/gcolor3.appdata.xml
-%{_datadir}/applications/gcolor3.desktop
-%{_datadir}/icons/hicolor/scalable/apps/gcolor3.svg
+%{_datadir}/applications/nl.hjdskes.gcolor3.desktop
+%{_datadir}/icons/hicolor/scalable/apps/nl.hjdskes.gcolor3.svg
+%{_metainfodir}/nl.hjdskes.gcolor3.appdata.xml
+%{_mandir}/man1/gcolor3.1*
 
 %changelog
+* Mon Sep 03 2018 Timothée Floure <fnux@fedoraproject.org> - 2.3.1-1
+  - New upstream release (2.3.1)
+  - Use meson to build the application
+  - Update project homepage
+  - Update project URL
+
 * Tue Jun 26 2018 Timothée Floure <fnux@fedoraproject.org> - 2.2-5
   - Fix compilation for F28+ (patch1)