From ca2e848c01267997475face69cf2e9b9ae4f2db4 Mon Sep 17 00:00:00 2001 From: yueyaoqiang Date: Mon, 21 Oct 2024 17:10:34 +0800 Subject: [PATCH] remove no use code --- marco.spec | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/marco.spec b/marco.spec index 0f96a29..052e308 100644 --- a/marco.spec +++ b/marco.spec @@ -1,29 +1,24 @@ -# Conditional for release and snapshot builds. Uncomment for release-builds. -%global rel_build 1 - # This is needed, because src-url contains branched part of versioning-scheme. %global branch 1.26 # Settings used for build from snapshots. -%{!?rel_build:%global commit 62a708d461e08275d6b85985f5fa13fa8fbc85f7} -%{!?rel_build:%global commit_date 20131212} -%{!?rel_build:%global shortcommit %(c=%{commit};echo ${c:0:7})} -%{!?rel_build:%global git_ver git%{commit_date}-%{shortcommit}} -%{!?rel_build:%global git_rel .git%{commit_date}.%{shortcommit}} -%{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz} +%global commit 62a708d461e08275d6b85985f5fa13fa8fbc85f7 +%global commit_date 20131212 +%global shortcommit %(c=%{commit};echo ${c:0:7}) +%global git_ver git%{commit_date}-%{shortcommit} +%global git_rel .git%{commit_date}.%{shortcommit} +%global git_tar %{name}-%{version}-%{git_ver}.tar.xz Name: marco Version: %{branch}.1 -Release: 2 +Release: 3 Summary: MATE Desktop window manager License: LGPLv2+ and GPLv2+ URL: http://mate-desktop.org # for downloading the tarball use 'spectool -g -R marco.spec' # Source for release-builds. -%{?rel_build:Source0: http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz} -# Source for snapshot-builds. -%{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}} +Source0: http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz Patch0: 0001-change-workspace-titlebar-and-font-and-composite.patch Patch1: 0002-fix-disabled-Alt-F1-to-popop-mate-menu.patch @@ -73,18 +68,7 @@ Development files for marco %prep -%if 0%{?rel_build} %autosetup -p1 -%else -%autosetup -n %{name}-%{commit} -p1 -%endif - -%if 0%{?rel_build} -#NOCONFIGURE=1 ./autogen.sh -%else # 0%{?rel_build} -# needed for git snapshots -NOCONFIGURE=1 ./autogen.sh -%endif # 0%{?rel_build} %build %configure --disable-static \ @@ -152,6 +136,9 @@ desktop-file-install \ %changelog +* Mon Oct 21 2024 yueyaoqiang - 1.26.1-3 +- remove no use code + * Mon Aug 26 2024 yueyaoqiang - 1.26.1-2 - sync patches from 1.24 -- Gitee