diff --git a/mate-applets.spec b/mate-applets.spec index bfb1ce3..393fb67 100644 --- a/mate-applets.spec +++ b/mate-applets.spec @@ -1,11 +1,32 @@ +# 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.7 + +# Settings used for build from snapshots. +%{!?rel_build:%global commit c3b48ea39ab358b45048e300deafaa3f569748ad} +%{!?rel_build:%global commit_date 20140211} +%{!?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-applets -Version: 1.7.1 -Release: 1%{?dist} +Version: %{branch}.2 +#Release: 1%{?dist} +Release: 0.1%{?git_rel}%{?dist} Summary: MATE Desktop panel applets License: GPLv2+ and LGPLv2+ URL: http://mate-desktop.org Source0: http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz +# for downloading the tarball use 'spectool -g -R mate-applets.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}} + #Add patch to fix cpufreq compilation (Thanks Wolfgang) Patch0: cpufreq.patch @@ -40,9 +61,12 @@ Requires: hicolor-icon-theme MATE Desktop panel applets %prep -%setup -q +%setup -q%{!?rel_build:n %{name}-%{commit}} + %patch0 -p1 -b .cpufreq -autoreconf -fi +# needed for cpufreq patch +#autoreconf -fi +NOCONFIGURE=1 ./autogen.sh %build %configure \ @@ -143,6 +167,10 @@ fi %{_datadir}/pixmaps/mate-cpufreq-applet %changelog +* Tue Feb 11 2014 Wolfgang Ulbrich 1.7.2-0.1.git20140211.c3b48ea +- update to git snapshot from 2014.02.11 +- add improved snapshot usage + * Sun Feb 09 2014 Dan Mashal 1.7.1-1 - Update to 1.7.1