This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository e16-keyedit.
View the commit online.
commit b8f6fce97d62f7c7e83ee8fdf5f66c725d7ae2af
Author: Kim Woelders <k...@woelders.dk>
AuthorDate: Fri Dec 8 15:20:59 2023 +0100
autofoo: Add git tag to rpm file name (if built from git checkout)
Same as e16 and imlib2.
And a couple of spec file cleanups.
---
.git-src | 0
Makefile.am | 24 ++++++++++++++++++++++--
configure.ac | 2 +-
e16-keyedit.spec.in | 6 +++---
4 files changed, 26 insertions(+), 6 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 fc2a7fb..739b144 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,9 +6,9 @@ MAINTAINERCLEANFILES = aclocal.m4 config.* compile configure depcomp \
install-sh missing \
Makefile.in
-CLEANFILES = e16-keyedit.desktop
+CLEANFILES = $(PACKAGE).spec e16-keyedit.desktop
-EXTRA_DIST = e16-keyedit.desktop.in
+EXTRA_DIST = $(PACKAGE).spec.in e16-keyedit.desktop.in
bin_PROGRAMS = e16keyedit
@@ -25,3 +25,23 @@ e16-keyedit.desktop: $(srcdir)/e16-keyedit.desktop.in Makefile
e16-keyedit.desktop:
sed -e "s=@e16datadir@=${datadir}=" $(srcdir)/$@.in > $@
+
+dist-hook: $(top_builddir)/$(PACKAGE).spec
+
+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
+ @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: release
+release:
+ $(MAKE) dist release=y
+
+FORCE:
diff --git a/configure.ac b/configure.ac
index f23cd0b..131f637 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,5 +44,5 @@ AC_PATH_X
EC_C_WARNINGS()
AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES(Makefile e16-keyedit.spec)
+AC_CONFIG_FILES(Makefile)
AC_OUTPUT
diff --git a/e16-keyedit.spec.in b/e16-keyedit.spec.in
index 17e3de7..31fcf9e 100644
--- a/e16-keyedit.spec.in
+++ b/e16-keyedit.spec.in
@@ -1,15 +1,15 @@
Summary: GUI Tool for Editing Enlightenment e16 Keybindings
Name: @PACKAGE@
Version: @VERSION@
-Release: @E_RPM_REVISION@%{?_vendorsuffix:.%{_vendorsuffix}}
-License: BSD-like
+Release: @RPM_RELEASE@%{?_vendorsuffix:.%{_vendorsuffix}}
+License: BSD
Group: User Interface/Desktops
URL: http://www.enlightenment.org/
Source: http://prdownloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
Vendor: The Enlightenment Project (http://www.enlightenment.org/)
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Requires: e16 >= 1.0.1
-Obsoletes: e16keyedit
+Obsoletes: e16keyedit <= 0.8
%description
e16-keyedit provides a graphical interface for managing keybindings in
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
