From 24befb38a85df8cfb473bf428986f989e09cb8de Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Dec 20 2013 22:13:39 +0000
Subject: update spec file to latest git snapshot


---

diff --git a/marco.spec b/marco.spec
index d2fd73a..8675a6e 100644
--- a/marco.spec
+++ b/marco.spec
@@ -1,17 +1,29 @@
-%global _internal_version  0403454e
+# 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 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}
 
 Name:           marco
-Version:        1.7.0
-#Release:        1%%{?dist}
-Release:        0.4.git%{_internal_version}%{?dist}
-Summary:     MATE Desktop window manager
-License:         LGPLv2+ and GPLv2+
-URL:            http://mate-desktop.org
-#Source0:        http://pub.mate-desktop.org/releases/1.6/%%{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
+Version:       %{branch}.0
+Release:       0.5%{?git_rel}%{?dist}
+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}}
 
 # needed for fixing initial-setup issue, rhbz (#962009)
 Source1:        mini-window.png
@@ -41,8 +53,11 @@ BuildRequires: yelp-tools
 # https://bugzilla.redhat.com/962009
 Provides: firstboot(windowmanager) = marco
 
+%if 0%{?fedora} && 0%{?fedora} <= 25
+Provides: mate-window-manager%{?_isa} = %{version}-%{release}
 Provides: mate-window-manager = %{version}-%{release}
 Obsoletes: mate-window-manager < %{version}-%{release}
+%endif
 
 %description
 MATE Desktop window manager
@@ -50,15 +65,17 @@ MATE Desktop window manager
 %package devel
 Summary: Development files for mate-window-manager
 Requires: %{name}%{?_isa} = %{version}-%{release}
+%if 0%{?fedora} && 0%{?fedora} <= 25
+Provides: mate-window-manager-devel%{?_isa} = %{version}-%{release}
 Provides: mate-window-manager-devel = %{version}-%{release}
 Obsoletes: mate-window-manager-devel < %{version}-%{release}
+%endif
 
 %description devel
 Development files for marco
 
 %prep
-#%%setup -q
-%setup -q -n %{name}-%{_internal_version}
+%setup -q%{!?rel_build:n %{name}-%{commit}}
 # needed for missing `po/Makefile.in.in'
 NOCONFIGURE=1 ./autogen.sh
 cp %{SOURCE1} src/mini-window.png
@@ -86,7 +103,7 @@ make %{?_smp_mflags} V=1
 
 
 %install
-make install DESTDIR=%{buildroot}
+%{make_install}
 
 find %{buildroot} -name '*.la' -exec rm -vf {} ';'
 
@@ -148,6 +165,11 @@ fi
 
 
 %changelog
+* Fri Dec 20 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.7.0-0.5.git20131212.62a708d
+- make Maintainers life easier and use better git snapshot usage, Thanks to Björn Esser
+- use modern 'make install' macro
+- improve obsoletes/provides, add limits
+
 * Sat Dec 14 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.7.0-0.4.git0403454e
 - remove isa tags from obsoletes/provides