diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec index ebdf80b0b7725bc80f80cc8917c3a2fcf7dbad95..43c1b6cec8a9057ab91fc3d2e51af12d17ea8979 100644 --- a/mate-settings-daemon.spec +++ b/mate-settings-daemon.spec @@ -1,6 +1,3 @@ -# 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 @@ -9,25 +6,23 @@ %global bootstrap 0 # Settings used for build from snapshots. -%{!?rel_build:%global commit 83fe1f587f5c6328b10a899a880275d79bf88921} -%{!?rel_build:%global commit_date 20141215} -%{!?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 83fe1f587f5c6328b10a899a880275d79bf88921 +%global commit_date 20141215 +%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: mate-settings-daemon Version: %{branch}.1 -Release: 2 +Release: 3 Summary: MATE Desktop settings daemon License: GPLv2+ URL: http://mate-desktop.org # for downloading the tarball use 'spectool -g -R mate-settings-daemon.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 # from upstream # https://github.com/mate-desktop/mate-settings-daemon/commit/babfbd3 @@ -83,19 +78,7 @@ various parameters of a MATE session and the applications that run under it. %prep -%if 0%{?rel_build} %autosetup -p1 -%else -%autosetup -n %{name}-%{commit} -p1 -%endif - -%if 0%{?rel_build} -#NOCONFIGURE=1 ./autogen.sh -%else -# for snapshots -# needed for git snapshots -NOCONFIGURE=1 ./autogen.sh -%endif %build %configure \ @@ -145,6 +128,9 @@ desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/mate-settings-dae %changelog +*Wed Dec 11 2024 lijian1 - 1.26.1-3 +- remove no use code + * Mon Oct 21 2024 yueyaoqiang - 1.26.1-2 - add patches from 1.22