commit b41abf310f85c710dffaba5e1bf10d8ae369d897
Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Sun Jan 3 13:43:06 2021 +0900
Update to the latest git
.gitignore | 1 +
cairo-dock-freeworld.spec | 28 ++++++++++++++++++++++++----
sources | 2 +-
3 files changed, 26 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e416979..9a05ef7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
cairo-dock-3.4.1.tar.gz
+/cairo-dock-3.4.1-20201103git0836f5d.tar.gz
diff --git a/cairo-dock-freeworld.spec b/cairo-dock-freeworld.spec
index 1c5b145..9930c9f 100644
--- a/cairo-dock-freeworld.spec
+++ b/cairo-dock-freeworld.spec
@@ -1,17 +1,28 @@
%global urlver 3.4
-%global mainver 3.4.0
+%global mainver 3.4.0
%global plugin_least_ver 3.4.0
+%global use_git 1
+%global gitdate 20201103
+%global githash 0836f5d1c3e18be0995320175b8bf21d28264a10
+%global shorthash %(c=%{githash} ; echo ${c:0:7})
+
+%global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}}
+%global mainrel 11
+
Name: cairo-dock-freeworld
Version: 3.4.1
-Release: 10%{?dist}
+Release: %{mainrel}%{?use_git:.%{gitdate}git%{shorthash}}%{?dist}
Summary: Light eye-candy fully themable animated dock
License: GPLv3+
URL:
http://glx-dock.org/
-#Source0:
http://launchpad.net/cairo-dock-core/%{urlver}/%{mainver}/+download/cairo...
+%if 0%{?use_git} >= 1
+Source0:
https://github.com/Cairo-Dock/cairo-dock-core/archive/%{githash}/cairo-do...
+%else
Source0:
https://github.com/Cairo-Dock/cairo-dock-core/archive/%{version}/cairo-do...
+%endif
Source1: cairo-dock-freeworld-oldchangelog
BuildRequires: cmake
@@ -54,8 +65,11 @@ This package contains library files for %{name}.
%prep
-#%%setup -q -n cairo-dock-%%{version}
+%if 0%{?use_git} >= 1
+%setup -q -n cairo-dock-core-%{githash}
+%else
%setup -q -n cairo-dock-core-%{version}
+%endif
## permission
# %%_fixperms cannot fix permissions completely here
@@ -74,6 +88,9 @@ sed -i.stat \
-e 's|\${MSGFMT_EXECUTABLE}|\${MSGFMT_EXECUTABLE} --statistics|' \
po/CMakeLists.txt
+# Modify version forcely
+sed -i CMakeLists.txt -e '\@set (VERSION @s|VERSION.*|VERSION
"%{version}")|'
+
%build
rm -f CMakeCache.txt
%cmake -B . -DCMAKE_SKIP_RPATH:BOOL=ON .
@@ -126,6 +143,9 @@ install -cpm 644 \
%{_libdir}/%{name}/libgldi.so.3*
%changelog
+* Sun Jan 3 2021 Mamoru TASAKA <mtasaka(a)fedoraproject.org> -
3.4.1-11.20201103git0836f5d
+- Update to the latest git
+
* Mon Aug 17 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> -
3.4.1-10
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index a8601cf..27d0df3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-63285f2744a76354cea9cc4c012b3c11 cairo-dock-3.4.1.tar.gz
+SHA512 (cairo-dock-3.4.1-20201103git0836f5d.tar.gz) =
647b09b545b8734ad2d2495b70344491d8f2eabd3411582c4615721ed924beb645aed73a516ca862ff08ac334c6fa9a08c6f0b4028537182d49f367af8847ed4