kwo pushed a commit to branch master.
http://git.enlightenment.org/legacy/imlib2.git/commit/?id=240857af990a621d64eeaa1c15672a8a167520cf
commit 240857af990a621d64eeaa1c15672a8a167520cf
Author: Kim Woelders <k...@woelders.dk>
Date: Sun Oct 13 21:30:09 2019 +0200
Spec file: Add git tag to rpm file name (if built from git checkout)
---
Makefile.am | 22 +++++++++++++++++++---
configure.ac | 3 ++-
imlib2.spec.in | 2 +-
3 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 8e4421d..47b2c0e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,8 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src data doc
+CLEANFILES = $(PACKAGE).spec
+
MAINTAINERCLEANFILES = aclocal.m4 compile \
config.guess config.h.in config.sub configure \
depcomp install-sh ltmain.sh missing Makefile.in \
@@ -14,8 +16,22 @@ bin_SCRIPTS = imlib2-config
EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN gendoc \
Doxyfile \
README.in README \
- imlib2.pc.in \
- imlib2.spec.in imlib2.spec
+ $(PACKAGE).pc.in \
+ $(PACKAGE).spec.in
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = imlib2.pc
+pkgconfig_DATA = $(PACKAGE).pc
+
+if SRC_IS_GIT
+RPM_RELEASE=`echo -n "1.%(date '+%y%m%d').git"; git rev-parse --short=8 HEAD`
+else
+RPM_RELEASE=`echo -n "1.%(date '+%y%m%d')"`
+endif
+
+dist-hook: $(top_builddir)/$(PACKAGE).spec
+
+$(top_builddir)/$(PACKAGE).spec: FORCE
+ sed
"s/\@PACKAGE\@/@PACKAGE@/;s/\@VERSION\@/@VERSION@/;s/\@RPM_RELEASE\@/$(RPM_RELEASE)/"
\
+ $(top_srcdir)/$(PACKAGE).spec.in > $@
+
+FORCE:
diff --git a/configure.ac b/configure.ac
index 957e802..02edf59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,6 +7,8 @@ AC_CANONICAL_HOST
AM_INIT_AUTOMAKE(1.6 dist-bzip2)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AM_CONDITIONAL(SRC_IS_GIT, test -d $srcdir/.git)
+
AC_C_BIGENDIAN
AC_PROG_CC
AM_PROG_AS
@@ -397,7 +399,6 @@ data/images/Makefile
doc/Makefile
imlib2-config
README
-imlib2.spec
])
AC_CONFIG_COMMANDS([default],[
chmod +x imlib2-config
diff --git a/imlib2.spec.in b/imlib2.spec.in
index 8725192..98f26a5 100644
--- a/imlib2.spec.in
+++ b/imlib2.spec.in
@@ -1,7 +1,7 @@
Summary: Powerful image loading and rendering library
Name: @PACKAGE@
Version: @VERSION@
-Release: 1.%(date '+%y%m%d')
+Release: @RPM_RELEASE@
License: BSD
Group: System Environment/Libraries
URL: http://www.enlightenment.org
--
