From 5cec98446d7b407866a05f29dfdde921b5d56d90 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Tue, 14 Jul 2015 07:54:16 +0200 Subject: [PATCH] update to 1.10.1 release --- .gitignore | 1 + mate-settings-daemon.spec | 49 +++++++++++++++++++++++++++++++-------- sources | 2 +- 3 files changed, 41 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 4482635..b6cd43f 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /mate-settings-daemon-1.9.6.tar.xz /mate-settings-daemon-1.9.90.tar.xz /mate-settings-daemon-1.10.0.tar.xz +/mate-settings-daemon-1.10.1.tar.xz diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec index 2632951..4bdfb1c 100644 --- a/mate-settings-daemon.spec +++ b/mate-settings-daemon.spec @@ -1,15 +1,33 @@ +# 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.10 + +# 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} + Name: mate-settings-daemon -Version: 1.10.0 -Release: 2%{?dist} +Version: %{branch}.1 +%if 0%{?rel_build} +Release: 1%{?dist} +%else +Release: 0.1%{?git_rel}%{?dist} +%endif Summary: MATE Desktop settings daemon License: GPLv2+ URL: http://mate-desktop.org -Source0: http://pub.mate-desktop.org/releases/1.9/%{name}-%{version}.tar.xz - -# To generate tarball -# wget http://git.mate-desktop.org/%%{name}/snapshot/%%{name}-{_internal_version}.tar.xz -O %%{name}-%%{version}.git%%{_internal_version}.tar.xz -#Source0: http://raveit65.fedorapeople.org/Mate/git-upstream/%{name}-%{version}.git%{_internal_version}.tar.xz +# 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}} BuildRequires: dbus-glib-devel BuildRequires: dconf-devel @@ -50,7 +68,15 @@ various parameters of a MATE session and the applications that run under it. %prep -%setup -q +%setup -q%{!?rel_build:n %{name}-%{commit}} + +%if 0%{?rel_build} +#NOCONFIGURE=1 ./autogen.sh +%else # 0%{?rel_build} +# for snapshots +# needed for git snapshots +NOCONFIGURE=1 ./autogen.sh +%endif # 0%{?rel_build} %build %configure \ @@ -111,7 +137,7 @@ fi %{_datadir}/mate-settings-daemon %{_datadir}/glib-2.0/schemas/org.mate.*.xml %{_datadir}/polkit-1/actions/org.mate.settingsdaemon.datetimemechanism.policy -%{_mandir}/man1/mate-settings-daemon.1.* +%{_mandir}/man1/* %files devel %{_includedir}/mate-settings-daemon @@ -119,6 +145,9 @@ fi %changelog +* Tue Jul 14 2015 Wolfgang Ulbrich - 1.10.1.1 +- update to 1.10.1 release + * Wed Jun 17 2015 Fedora Release Engineering - 1.10.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild @@ -128,7 +157,7 @@ fi * Thu Feb 26 2015 Wolfgang Ulbrich - 1.9.90-1 - update to 1.9.90 release -* Wed Jan 20 2015 Wolfgang Ulbrich - 1.9.6-1 +* Wed Jan 21 2015 Wolfgang Ulbrich - 1.9.6-1 - update to 1.9.6 release * Thu Nov 20 2014 Wolfgang Ulbrich - 1.9.5-1 diff --git a/sources b/sources index 698395f..19b28bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -884029951adde0b2a4b07b6d563acdce mate-settings-daemon-1.10.0.tar.xz +8543bb862d370647cd99079c4755eabf mate-settings-daemon-1.10.1.tar.xz