This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository legacy-imlib2.
View the commit online.
commit 191b9bac47ef735c2fe715d4bd0b03bddf37fd72
Author: Kim Woelders <k...@woelders.dk>
AuthorDate: Sun Oct 23 08:08:58 2022 +0200
autofoo: Rework git tag/release stuff
- Add 'release' target to make dist without git tag in rpm name.
- Use .git-src (not .git) to test if we are building from git.
---
.git-src | 0
Makefile.am | 20 +++++++++++++-------
configure.ac | 2 --
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/.git-src b/.git-src
new file mode 100644
index 0000000..e69de29
diff --git a/Makefile.am b/Makefile.am
index f138690..3371af3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,19 +33,25 @@ dist-hook: $(top_builddir)/$(PACKAGE).spec
cd $(top_srcdir) && $(AUTOMAKE) --foreign $(abs_builddir)/$(distdir)/test/Makefile; \
fi
-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
+RPR_DEV = `echo -n "1.%(date '+%y%m%d').git"; git rev-parse --short=8 HEAD`
+RPR_REL = 1
+SED_DEV = "s/\@PACKAGE\@/@PACKAGE@/;s/\@VERSION\@/@VERSION@/;s/\@RPM_RELEASE\@/$(RPR_DEV)/"
+SED_REL = "s/\@PACKAGE\@/@PACKAGE@/;s/\@VERSION\@/@VERSION@/;s/\@RPM_RELEASE\@/$(RPR_REL)/"
$(top_builddir)/$(PACKAGE).spec: FORCE
- sed "s/\@PACKAGE\@/@PACKAGE@/;s/\@VERSION\@/@VERSION@/;s/\@RPM_RELEASE\@/$(RPM_RELEASE)/" \
- $(top_srcdir)/$(PACKAGE).spec.in > $@
+ @if [ -f $(top_srcdir)/.git-src -a -z "$(release)" ]; then \
+ sed $(SED_DEV) $(top_srcdir)/$(PACKAGE).spec.in > $@; \
+ else \
+ sed $(SED_REL) $(top_srcdir)/$(PACKAGE).spec.in > $@; \
+ fi
.PHONY: doc src test
doc src test:
$(MAKE) -C $@
test: src
+.PHONY: release
+release:
+ $(MAKE) dist release=y
+
FORCE:
diff --git a/configure.ac b/configure.ac
index e825438..0e0fe45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,8 +7,6 @@ AC_CANONICAL_HOST
AM_INIT_AUTOMAKE(1.6 dist-xz -Wno-portability)
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
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
