20181011 snapshot

Switch to cmake for build
Add OpenThread dependency for build requirement
Use pkgconfig for expat dependency
Use new macro for metainfo directort
Drop patch
Drop no longer needed posttrans
This commit is contained in:
Luya Tshimbalanga 2019-02-17 01:29:28 -08:00
parent 27e22745a7
commit e3240cd86e
3 changed files with 34 additions and 21 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@
/gpick-0.2.5-78e110e.tar.gz
/gpick-0.2.6rc1.tar.gz
/enable_gtk3.patch
/gpick-0.2.6rc1-3b17cf9.tar.gz

View File

@ -1,10 +1,10 @@
#%%global commit nil
#%%global shortcommit %%(c=%%{commit}; echo ${c:0:7})
#%%global date 20170217
%global commit 3b17cf9e8b8514bdf16c49ca970e6f47da34e6ae
%global shortcommit %%(c=%%{commit}; echo ${c:0:7})
%global date 20181011
Name: gpick
Version: 0.2.6
Release: 0.rc1%{?date:.%{date}git}%{?dist}.4
Release: 0.rc1%{?date:.%{date}git}%{?dist}
Summary: Advanced color picker
License: BSD
@ -14,24 +14,26 @@ URL: http://gpick.org
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: gcc-c++
BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: expat-devel
BuildRequires: gcc-c++
BuildRequires: gettext-devel
BuildRequires: libappstream-glib
BuildRequires: libcurl-devel
BuildRequires: OpenThreads-devel
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(lua)
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: ragel
BuildRequires: scons
# Regression on other arches with F26 mass rebuild
# Temporarily exclude them
# https://bugzilla.redhat.com/show_bug.cgi?id=1419949
# https://bugzilla.redhat.com/show_bug.cgi?id=1419949
ExcludeArch: ppc64 ppc64le aarch64 armv7hl s390x
%description
@ -39,9 +41,9 @@ Advanced color picker
%prep
%{?shortcommit:
%autosetup -n %{name}-%{name}-%{commit}}
%autosetup -n %{name}-%{commit}}
%{!?shortcommit:
%autosetup -n %{name}-%{name}-%{version}rc1}
%autosetup -n %{name}-%{version}rc1}
mkdir .git
# Delete external libraries and only use system dependencies to build GPick
@ -51,35 +53,46 @@ echo "INTERNAL_LUA=False" >> user-config.py
echo "LOCALEDIR=\"%{_datadir}/locale\"" >> user-config.py
%build
scons %{?_smp_mflags} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" LDFLAGS="%{optflags}"
#scons %%{?_smp_mflags} CFLAGS="%%{optflags}" CXXFLAGS="%%{optflags}" LDFLAGS="%%{optflags}"
%cmake \
-DCFLAGS="%{optflags} -Wl,--as-needed" \
-DCXXFLAGS="%%{optflags} -Wl,--as-needed" \
-DLDFLAGS="%%{optflags} -Wl,--as-needed"
%make_build
%install
export CFLAGS="%{optflags}"
export CXXFLAGS="%{optflags}"
export LDFLAGS="%{optflags}"
scons install DESTDIR=%{buildroot}/%{_prefix}
%make_install
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml
%find_lang %{name}
%files -f %{name}.lang
%doc %{_docdir}/%{name}/copyright
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/appdata/%{name}.appdata.xml
%{_metainfodir}/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_mandir}/man1/%{name}.1.*
%changelog
* Sun Feb 17 2019 Luya Tshimbalanga <luya@fedoraproject.org> - 0.2.6-0.rc1.20181011git
- 20181011 snapshot
- Switch to cmake for build
- Add OpenThread dependency for build requirement
- Use pkgconfig for expat dependency
- Use new macro for metainfo directort
- Drop patch
- Drop no longer needed posttrans
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.6-0.rc1.4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Wed Jan 30 2019 Jonathan Wakely <jwakely@redhat.com> - 0.2.6-0.rc1git}.3
* Wed Jan 30 2019 Jonathan Wakely <jwakely@redhat.com> - 0.2.6-0.rc1.3
- Rebuilt for Boost 1.69
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.6-0.rc1.2

View File

@ -1,2 +1 @@
SHA512 (gpick-0.2.6rc1.tar.gz) = 10b34f6ac8c528deecf0ce44e3c0786b47c78878e4f350947f27ae7eb9f884ca44b77a726a4954d33a452e704b494b63eb79eb95630abe80016f2cbd6234531f
SHA512 (enable_gtk3.patch) = 8f4cb4962bdcf58f55a3ff445c15ab3940646e85ddc0d29dccfa1574f34d7bcaed7d0ea81749a35a756c764f79f3f179d87c0c86f7c434a737ef8cad038457e0
SHA512 (gpick-0.2.6rc1-3b17cf9.tar.gz) = 756a3a669d6f3d7c912dd9c502417958807e8b1614ef5549f6b589841b8ea4dd8c5d99e2b0d81cdd0aef861e99704c3b3137c394527c09f8ace3bd46dd9267e3