diff --git a/.gitignore b/.gitignore index 5193c2c..426067e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /gpick-0.2.5-2c8266a.tar.gz /gpick-0.2.5-569ee0f.tar.gz /gpick-0.2.5-78e110e.tar.gz +/gpick-0.2.6rc1.tar.gz diff --git a/gpick.spec b/gpick.spec index 01a3eca..0f4fe4a 100644 --- a/gpick.spec +++ b/gpick.spec @@ -1,21 +1,20 @@ -%global commit 78e110e1380a5f9bc9f86d3c53e5ed0274253071 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global date 20170217 +#%%global commit nil +#%%global shortcommit %%(c=%%{commit}; echo ${c:0:7}) +#%%global date 20170217 Name: gpick -Version: 0.2.5 -Release: 21.%{date}git%{?dist} +Version: 0.2.6 +Release: 0.rc1%{?date:.%{date}git}%{?dist} Summary: Advanced color picker License: BSD URL: http://gpick.org -# To get tarball from github -# wget https://github.com/thezbyg/gpick/archive/569ee0f165b689825efd0cb7da1695beb7f8aa9b/gpick-0.2.5-569ee0f.tar.gz -%{!?shortcommit: -Source: https://github.com/thezbyg/%{name}/archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz} %{?shortcommit: -Source: https://github.com/thezbyg/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz} +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} +Patch: enable_gtk3.patch BuildRequires: boost-devel BuildRequires: desktop-file-utils @@ -25,21 +24,25 @@ BuildRequires: libappstream-glib BuildRequires: libcurl-devel BuildRequires: pkgconfig(lua) BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: ragel BuildRequires: scons +%if 0%{?fedora} < 28 # Regression on other arches with F26 mass rebuild # Temporarily exclude them # https://bugzilla.redhat.com/show_bug.cgi?id=1419949 ExcludeArch: ppc64 ppc64le aarch64 armv7hl s390x +%endif %description Advanced color picker %prep -#%%setup -q -n %%{name}_%%{version} -%autosetup -n %{name}-%{commit} +%{?shortcommit: +%autosetup -n %{name}-%{name}-%{commit}} +%{!?shortcommit: +%autosetup -n %{name}-%{name}-%{version}rc1} mkdir .git # Delete external libraries and only use system dependencies to build GPick @@ -57,11 +60,10 @@ export CXXFLAGS="%{optflags}" export LDFLAGS="%{optflags}" scons install DESTDIR=%{buildroot}/%{_prefix} -cp -v share/appdata/%{name}.appdata.xml %{buildroot}/%{_datadir}/appdata/ %check -desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop -appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml +desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %find_lang %{name} %files -f %{name}.lang @@ -89,6 +91,10 @@ fi /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sun Aug 20 2017 Luya Tshimbalanga - 0.2.6-0.rc1 +- Update to 2.6rc1 +- Enable GTK3 support + * Fri Aug 18 2017 Luya Tshimbalanga - 0.2.5-21.20170217git - Rebuilt for boost - Exclude s390x arch diff --git a/sources b/sources index fc092ef..0b5a648 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gpick-0.2.5-78e110e.tar.gz) = ee85351d5ff776bea6d17b30cc04ca9b4ed5307950412a958a28f742544a7557adc0a3475d00416b9b74839b7ef6749d6854f462e02c765a5cb3887e62abe270 +SHA512 (gpick-0.2.6rc1.tar.gz) = 10b34f6ac8c528deecf0ce44e3c0786b47c78878e4f350947f27ae7eb9f884ca44b77a726a4954d33a452e704b494b63eb79eb95630abe80016f2cbd6234531f