From 6cc1efd91f20f5b58a8211d6ae555126441e23fd Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 8 Jul 2014 14:20:20 +0100
Subject: [PATCH] Various packaging fixes (RHBZ#1117291).

- Put git version into release tag.
  https://fedoraproject.org/wiki/Packaging:NamingGuidelines#Release_Tag
---
 mingw-srvany.spec | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/mingw-srvany.spec b/mingw-srvany.spec
index 70dda7d..a2da1ec 100644
--- a/mingw-srvany.spec
+++ b/mingw-srvany.spec
@@ -1,12 +1,12 @@
-%define __strip %{mingw32_strip}
-%define __objdump %{mingw32_objdump}
+%{?mingw_package_header}
 
+%global gitdate 20131118
 %global commit 5774c46c67858b2aad503628b4e1ece6d5aad562
 %global shortcommit 5774c46c
 
 Name:		mingw-srvany
 Version:	1.0
-Release:	13%{?dist}
+Release:	14.%{gitdate}git%{shortcommit}%{?dist}
 Summary:	Utility for creating services for Windows
 
 License:	GPLv2+
@@ -16,12 +16,13 @@ URL:		http://github.com/rwmjones/rhsrvany
 Source0:	https://github.com/rwmjones/rhsrvany/archive/%{commit}/rhsrvany-%{commit}.tar.gz
 Source1:	COPYING
 
+# Needed because we build from the git version, using autoreconf.
 BuildRequires:	automake autoconf libtool
-BuildRequires:	redhat-rpm-config
+
 BuildRequires:	mingw32-filesystem
 BuildRequires:	mingw32-gcc
 BuildRequires:	mingw32-gcc-c++
-BuildRequires:	mingw32-binutils
+
 
 %description
 Utility for creating a service from any MinGW Windows binary
@@ -35,6 +36,9 @@ Summary:	Utility for creating services for Windows
 Utility for creating a service from any MinGW Windows binary
 
 
+%{?mingw_debug_package}
+
+
 %prep
 %setup -q -n rhsrvany-%{commit}
 cp %{SOURCE1} .
@@ -56,6 +60,11 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 
 %changelog
+* Tue Jul  8 2014 Richard W.M. Jones <rjones@redhat.com> - 1.0-14
+- Various packaging fixes (RHBZ#1117291).
+- Put git version into release tag.
+  https://fedoraproject.org/wiki/Packaging:NamingGuidelines#Release_Tag
+
 * Tue Jul  8 2014 Richard W.M. Jones <rjones@redhat.com> - 1.0-13
 - Switch to upstream version instead of fork.
 - There is no documentation upstream, but include a COPYING file.