From e2bf73a0e03e51d2f4f224ad23687fc17417cb67 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Thu, 1 Jul 2021 11:22:40 -0700 Subject: [PATCH] local build --- .gitignore | 1 + changelog | 27 +++++++++ gpick.spec | 170 +++-------------------------------------------------- sources | 2 +- 4 files changed, 38 insertions(+), 162 deletions(-) create mode 100644 changelog diff --git a/.gitignore b/.gitignore index 745d1ee..3aeba00 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /include.patch /gpick-0.2.6rc1-016f5e2.tar.gz /gpick-0.2.6.tar.gz +/gpick-0.2.6-0e858d3.tar.gz diff --git a/changelog b/changelog new file mode 100644 index 0000000..341ebc9 --- /dev/null +++ b/changelog @@ -0,0 +1,27 @@ +* Tue Jan 26 2021 Fedora Release Engineering - 0.2.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Jan 22 2021 Jonathan Wakely - 0.2.6-2 +- Rebuilt for Boost 1.75 + +* Mon Dec 28 2020 Luya Tshimbalanga - 0.2.6-1 +- Update to 0.2.6 + +* Wed Sep 30 2020 Luya Tshimbalanga - 0.2.6-0.rc1.20200513git.1 +- Update to git snapshot 20200513 + +* Wed Sep 23 2020 Jeff Law - 0.2.6-0.rc1.20181011git.2.5 +- Use cmake_in_source_build to fix FTBFS due to recent cmake macro changes + +* Sat Aug 01 2020 Fedora Release Engineering - 0.2.6-0.rc1.20181011git.2.4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.2.6-0.rc1.20181011git.2.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu May 28 2020 Jonathan Wakely - 0.2.6-0.rc1.20181011git.2.2 +- Rebuilt for Boost 1.73 + +* Wed Jan 29 2020 Fedora Release Engineering - 0.2.6-0.rc1.20181011git.2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/gpick.spec b/gpick.spec index 06b7665..231f6c8 100644 --- a/gpick.spec +++ b/gpick.spec @@ -1,18 +1,17 @@ -%define __cmake_in_source_build 1 -#%%global commit 016f5e2eaf5550fb90441ac0add5c7d2d1e3c687 -#%%global shortcommit %%(c=%%{commit}; echo ${c:0:7}) -#%%global date 20200513 +%global commit 0e858d33fd28d98d2689d0ebb92c975729a9f7bc +%global shortcommit %%(c=%%{commit}; echo ${c:0:7}) +%global date 20210528 Name: gpick Version: 0.2.6 -Release: 3%{?date:.%{date}git}%{?dist} +Release: %autorelease -b 4 -s %{date}git%{shortcommit} Summary: Advanced color picker License: BSD URL: http://gpick.org %{?shortcommit: -Source: https://github.com/thezbyg/%{name}/archive/%{commit}/%{name}-%{version}rc1-%{shortcommit}.tar.gz} +Source: https://github.com/thezbyg/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz} %{!?shortcommit: Source: https://github.com/thezbyg/%{name}/archive/%{name}-%{version}.tar.gz#/%{name}-%{version}.tar.gz} @@ -21,7 +20,7 @@ BuildRequires: boost-devel BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: gcc-c++ -BuildRequires: gettext-devel +BuildRequires: gettext BuildRequires: libappstream-glib BuildRequires: make BuildRequires: pkgconfig(dbus-glib-1) @@ -36,13 +35,6 @@ BuildRequires: ragel %description Advanced color picker -%package libs -Summary: Libraries for %{name} - -%description libs -The %{name}-libs package contains shared library for %{name}. - - %prep %{?shortcommit: %autosetup -p1 -n %{name}-%{commit}} @@ -57,7 +49,6 @@ echo "INTERNAL_LUA=False" >> user-config.py echo "LOCALEDIR=\"%{_datadir}/locale\"" >> user-config.py %build -#scons %%{?_smp_mflags} CFLAGS="%%{optflags}" CXXFLAGS="%%{optflags}" LDFLAGS="%%{optflags}" %cmake \ -DCFLAGS="%{optflags} -Wl,--as-needed" \ -DCXXFLAGS="%%{optflags} -Wl,--as-needed --std=c++17" \ @@ -68,8 +59,8 @@ echo "LOCALEDIR=\"%{_datadir}/locale\"" >> user-config.py %cmake_install # copy libraries -mkdir -p %{buildroot}%{_libdir} -cp -p %{_builddir}/%name-%{name}-%{version}/*.so %{buildroot}%{_libdir} +#mkdir -p %%{buildroot}%%{_libdir} +#cp -p %%{_builddir}/%%{name}-%%{version}/*.so %%{buildroot}%%{_libdir} %check desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop @@ -87,148 +78,5 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_mandir}/man1/%{name}.1.* -%files libs -%{_libdir}/*.so - %changelog -* Tue Jan 26 2021 Fedora Release Engineering - 0.2.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Jan 22 2021 Jonathan Wakely - 0.2.6-2 -- Rebuilt for Boost 1.75 - -* Mon Dec 28 2020 Luya Tshimbalanga - 0.2.6-1 -- Update to 0.2.6 - -* Wed Sep 30 2020 Luya Tshimbalanga - 0.2.6-0.rc1.20200513git.1 -- Update to git snapshot 20200513 - -* Wed Sep 23 2020 Jeff Law - 0.2.6-0.rc1.20181011git.2.5 -- Use cmake_in_source_build to fix FTBFS due to recent cmake macro changes - -* Sat Aug 01 2020 Fedora Release Engineering - 0.2.6-0.rc1.20181011git.2.4 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0.2.6-0.rc1.20181011git.2.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu May 28 2020 Jonathan Wakely - 0.2.6-0.rc1.20181011git.2.2 -- Rebuilt for Boost 1.73 - -* Wed Jan 29 2020 Fedora Release Engineering - 0.2.6-0.rc1.20181011git.2.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Sep 23 2019 Luya Tshimbalanga - 0.2.6-0.rc1.20181011git.2 -- Clean up files -- Patch to include string C header due to gcc 10+ -- Drop ExcludeArch - -* Thu Jul 25 2019 Fedora Release Engineering - 0.2.6-0.rc1.20181011git.1.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 22 2019 Luya Tshimbalanga - 0.2.6-0.rc1.20181011git.1 -- Add missing libraries - -* Sun Feb 17 2019 Luya Tshimbalanga - 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 - 0.2.6-0.rc1.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Jan 30 2019 Jonathan Wakely - 0.2.6-0.rc1.3 -- Rebuilt for Boost 1.69 - -* Fri Jul 13 2018 Fedora Release Engineering - 0.2.6-0.rc1.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 0.2.6-0.rc1.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* 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 - -* Wed Aug 02 2017 Fedora Release Engineering - 0.2.5-20.20170217git -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.2.5-19.20170217git -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Luya Tshimbalanga - 0.2.5-18.20170217git -- Latest git snapshot -- Clean up spec -- Set ExcludeArch for ppc64 ppc64le aarch64 armv7hl - -* Fri Feb 10 2017 Fedora Release Engineering - 0.2.5-17.20160613git569ee0f -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Jun 13 2016 Luya Tshimbalanga - 0.2.5-16.20160613git569ee0f -- Latest upstream git snapshot -- Dropped downstream appdata -- Added ragel,libcurl and libappstream-lib as dependency - -* Wed Feb 03 2016 Fedora Release Engineering - 0.2.5-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jan 15 2016 Jonathan Wakely - 0.2.5-14 -- Rebuilt for Boost 1.60 - -* Thu Aug 27 2015 Jonathan Wakely - 0.2.5-13 -- Rebuilt for Boost 1.59 - -* Wed Jul 29 2015 Fedora Release Engineering - 0.2.5-12 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 0.2.5-11 -- rebuild for Boost 1.58 - -* Wed Jun 17 2015 Fedora Release Engineering - 0.2.5-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 0.2.5-9 -- Rebuilt for GCC 5 C++11 ABI change - -* Thu Mar 26 2015 Richard Hughes - 0.2.5-8 -- Add an AppData file for the software center - -* Mon Jan 26 2015 Petr Machata - 0.2.5-7 -- Rebuild for boost 1.57.0 - -* Sat Aug 16 2014 Fedora Release Engineering - 0.2.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.2.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 23 2014 Petr Machata - 0.2.5-4 -- Rebuild for boost 1.55.0 - -* Sat Aug 03 2013 Fedora Release Engineering - 0.2.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jul 30 2013 Petr Machata - 0.2.5-2 -- Rebuild for boost 1.54.0 - -* Wed May 15 2013 Tom Callaway - 0.2.5-1 -- update to 0.2.5, lua 5.2 - -* Sat Apr 13 2013 Luya Tshimbalanga - 0.2.4-4 -- Updated spec based Packaging review (rhbz #913367) - -* Wed Feb 20 2013 Luya Tshimbalanga - 0.2.4-2 -- Adherance to Fedora Packaging guideline - -* Sat Sep 01 2012 Alexis Lameire - 0.2.4-1 -- initial release - +%autochangelog diff --git a/sources b/sources index 40f6a94..35623e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gpick-0.2.6.tar.gz) = 85f4d0978915e0c0b6e412d619a28af62a43547d39c4b97d8dddc4024f9d8b339f09e91f70d929073ebbad7a6e008e174aa76fdc611008ba269dedb403ed6867 +SHA512 (gpick-0.2.6-0e858d3.tar.gz) = 9fca4549b78f63b1748f3409a5360a5faff6259d35341a63be965ad712d22a51632a36024cefcf2152db257075851a6b6b9330f7f52b04804530ef9e290e1266