From 8ba6217deb51e700c2f6d5f85ab4d9f17b4a8269 Mon Sep 17 00:00:00 2001
From: Anders Blomdell <anders.blomdell@control.lth.se>
Date: Thu, 1 Jun 2017 19:51:02 +0200
Subject: [PATCH] Corrected rpm building verion numering
---
Makefile | 5 +++--
md5toc.spec.template | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 14b9e4e..a3f0849 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
TARGET=md5toc
-MD5TOC_VERSION=$(shell git describe | sed -e 's/^v//')
+MD5TOC_VERSION=$(shell git describe | sed -e 's/^v//;s/-/_/g')
SOURCES=Makefile md5toc.c md5toc.spec config.h md5.c md5.h
CFLAGS=-Wall -Werror -I. -DMD5TOC_VERSION='"$(MD5TOC_VERSION)"'
@@ -15,7 +15,8 @@ md5toc.tar: $(SOURCES)
tar -cvf $@ --transform 's|.*|md5toc/&|' $^
md5toc.spec: md5toc.spec.template Makefile
- sed -e 's/__MD5TOC_VERSION__/$(MD5TOC_VERSION)/;s/-/_/g' $< > $@
+ sed -e 's/__MD5TOC_VERSION__/$(MD5TOC_VERSION)/' $< > $@
+ echo $(MD5TOC_VERSION:%-=%-)
srpm: md5toc.spec md5toc.tar Makefile
rpmbuild --define "_topdir $$(pwd)" \
diff --git a/md5toc.spec.template b/md5toc.spec.template
index dd81743..3a8bdd3 100644
--- a/md5toc.spec.template
+++ b/md5toc.spec.template
@@ -5,7 +5,7 @@ Summary: A simple utility to create a TOC of a directory
License: GPLv3
Source0: http://control.lth.se/md5toc.tar
-BuildRequires: libattr-devel
+#BuildRequires: libattr-devel
%description
A simple utility to create a TOC of a directory
@@ -14,7 +14,7 @@ A simple utility to create a TOC of a directory
%setup -q -n %{name}
%build
-make -DMD5TOC_VERSION='"__MD5TOC_VERSION__"'
+make MD5TOC_VERSION=__MD5TOC_VERSION__
file md5toc
%install
--
GitLab