Update to 0.2.6

.gitignore

@@ -8,3 +8,5 @@
 /enable_gtk3.patch
 /gpick-0.2.6rc1-3b17cf9.tar.gz
 /include.patch
+/gpick-0.2.6rc1-016f5e2.tar.gz
+/gpick-0.2.6.tar.gz

gpick.spec

@@ -1,11 +1,11 @@
 %define __cmake_in_source_build 1
-%global commit 3b17cf9e8b8514bdf16c49ca970e6f47da34e6ae
-%global shortcommit %%(c=%%{commit}; echo ${c:0:7})
-%global date 20181011
+#%%global commit 016f5e2eaf5550fb90441ac0add5c7d2d1e3c687
+#%%global shortcommit %%(c=%%{commit}; echo ${c:0:7})
+#%%global date 20200513
 
 Name:		gpick
 Version:	0.2.6
-Release:	0.rc1%{?date:.%{date}git}.2%{?dist}.5
+Release:	1%{?date:.%{date}git}%{?dist}
 Summary:	Advanced color picker
 
 License:	BSD
@@ -14,11 +14,11 @@ URL:		http://gpick.org
 %{?shortcommit:
 Source:		https://github.com/thezbyg/%{name}/archive/%{commit}/%{name}-%{version}rc1-%{shortcommit}.tar.gz}
 %{!?shortcommit:
-Source:		https://github.com/thezbyg/%{name}/archive/%{name}-%{version}rc1.tar.gz#/%{name}-%{version}rc1.tar.gz}
+Source:		https://github.com/thezbyg/%{name}/archive/%{name}-%{version}.tar.gz#/%{name}-%{version}.tar.gz}
 
 # This patch addresses the changes from GCC 10+ 
 # eliminating header indirection
-Patch:		include.patch
+# Patch:		include.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	boost-devel
@@ -27,14 +27,15 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	gcc-c++
 BuildRequires:	gettext-devel
 BuildRequires:	libappstream-glib
-BuildRequires:	libcurl-devel
-BuildRequires:	OpenThreads-devel
-BuildRequires:	pkgconfig(expat)
-BuildRequires:	pkgconfig(lua)
+BuildRequires:  make
 BuildRequires:	pkgconfig(dbus-glib-1)
+BuildRequires:	pkgconfig(expat)
 BuildRequires:	pkgconfig(gtk+-3.0)
+BuildRequires:	pkgconfig(libcurl)
+BuildRequires:	pkgconfig(lua)
+BuildRequires:	pkgconfig(openthreads)
 BuildRequires:	ragel
-BuildRequires: make
+
 
 %description
 Advanced color picker
@@ -50,7 +51,7 @@ The %{name}-libs package contains shared library for %{name}.
 %{?shortcommit:
 %autosetup -p1 -n %{name}-%{commit}}
 %{!?shortcommit:
-%autosetup -p1 -n %{name}-%{version}rc1}
+%autosetup -n %name-%{name}-%{version}}
 mkdir .git
 
 # Delete external libraries and only use system dependencies to build GPick
@@ -63,16 +64,16 @@ echo "LOCALEDIR=\"%{_datadir}/locale\"" >> user-config.py
 #scons %%{?_smp_mflags} CFLAGS="%%{optflags}" CXXFLAGS="%%{optflags}" LDFLAGS="%%{optflags}"
 %cmake \
 	-DCFLAGS="%{optflags} -Wl,--as-needed" \
-	-DCXXFLAGS="%%{optflags} -Wl,--as-needed" \
+	-DCXXFLAGS="%%{optflags} -Wl,--as-needed --std=c++17" \
 	-DLDFLAGS="%%{optflags} -Wl,--as-needed"
-%make_build
+%cmake_build
 
 %install
-%make_install
+%cmake_install
 
 # copy libraries
 mkdir -p %{buildroot}%{_libdir}
-cp -p %{_builddir}/%{name}-%{commit}/*.so %{buildroot}%{_libdir}
+cp -p %{_builddir}/%name-%{name}-%{version}/*.so %{buildroot}%{_libdir}
 
 %check
 desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -94,6 +95,12 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat
 %{_libdir}/*.so
 
 %changelog
+* Mon Dec 28 2020 Luya Tshimbalanga <luya@fedoraproject.org> - 0.2.6-1
+- Update to 0.2.6
+
+* Wed Sep 30 2020 Luya Tshimbalanga <luya@fedoraproject.org> - 0.2.6-0.rc1.20200513git.1
+- Update to git snapshot 20200513
+
 * Wed Sep 23 2020 Jeff Law <law@redhat.com> - 0.2.6-0.rc1.20181011git.2.5
 - Use cmake_in_source_build to fix FTBFS due to recent cmake macro changes
 

sources

@@ -1,2 +1 @@
-SHA512 (gpick-0.2.6rc1-3b17cf9.tar.gz) = 756a3a669d6f3d7c912dd9c502417958807e8b1614ef5549f6b589841b8ea4dd8c5d99e2b0d81cdd0aef861e99704c3b3137c394527c09f8ace3bd46dd9267e3
-SHA512 (include.patch) = d9a63e2db39f2aaa5ee5a98bfba29148c7c23a882abeabbbe099b34fbbae704bf085d127ea45f362e5a0979ec1457bda431428f91e892552280d79254eab52cf
+SHA512 (gpick-0.2.6.tar.gz) = 85f4d0978915e0c0b6e412d619a28af62a43547d39c4b97d8dddc4024f9d8b339f09e91f70d929073ebbad7a6e008e174aa76fdc611008ba269dedb403ed6867