[mate-screensaver] ubdate spec file and make Maintainers life easier and use better git snapshot usage
Wolfgang Ulbrich
raveit65 at fedoraproject.org
Sun Jan 26 12:14:13 UTC 2014
commit 01240a689964a44e6d45960dd7f2765d45184dfe
Author: raveit65 <chat-to-me at raveit.de>
Date: Sun Jan 26 13:14:24 2014 +0100
ubdate spec file and make Maintainers life easier and use better git snapshot usage
mate-screensaver.spec | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
---
diff --git a/mate-screensaver.spec b/mate-screensaver.spec
index b22c244..51aa68f 100644
--- a/mate-screensaver.spec
+++ b/mate-screensaver.spec
@@ -1,18 +1,30 @@
-#%global _internal_version 0460034
+# 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 d5b35083e4de1d7457ebd937172bb0054e1fa089}
+%{!?rel_build:%global commit_date 20140125}
+%{!?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-screensaver
-Version: 1.7.0
-Release: 1%{?dist}
-#Release: 0.1.git%{_internal_version}1%{?dist}
+Version: %{branch}.1
+#Release: 1%{?dist}
+Release: 0.1%{?git_rel}%{?dist}
Summary: MATE Screensaver
License: GPLv2+ and LGPLv2+
URL: http://pub.mate-desktop.org
-# 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://vicodan.fedorapeople.org/%{name}-%{version}.git%{_internal_version}.tar.xz
-
-Source0: http://pub.mate-desktop.org/releases/1.7/%{name}-%{version}.tar.xz
+# for downloading the tarball use 'spectool -g -R mate-screensaver.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}}
Requires: redhat-menus
Requires: system-logos
@@ -59,11 +71,10 @@ Development files for mate-screensaver
%prep
-%setup -q
-#%setup -q -n %{name}-%{_internal_version}
+%setup -q%{!?rel_build:n %{name}-%{commit}}
# needed for git snapshots
-#NOCONFIGURE=1 ./autogen.sh
+NOCONFIGURE=1 ./autogen.sh
%build
%configure \
@@ -99,7 +110,7 @@ rm -f %{buildroot}%{_datadir}/MateConf/gsettings/org.mate.screensaver.gschema.mi
# fix versioned doc dir
mkdir -p %{buildroot}%{_datadir}/doc/mate-screensaver
-mv %{buildroot}%{_datadir}/doc/mate-screensaver-%{version}/mate-screensaver.html %{buildroot}%{_datadir}/doc/mate-screensaver/mate-screensaver.html
+mv %{buildroot}%{_datadir}/doc/mate-screensaver-%{branch}.0/mate-screensaver.html %{buildroot}%{_datadir}/doc/mate-screensaver/mate-screensaver.html
%find_lang %{name} --with-gnome --all-name
@@ -137,6 +148,11 @@ fi
%changelog
+* Sun Jan 26 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.7.1-0.1.git20140125.d5b3508
+- update to git snapshot from 2014.01.25
+- fix rhbz (#1057402) and (#1056591)
+- make Maintainers life easier and use better git snapshot usage
+
* Tue Jan 14 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.7.0-1
- update to 1.7.0 release
- add --with-gnome --all-name for find language
More information about the scm-commits
mailing list