This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository e16-themes.
View the commit online.
commit 0f44c4c507e508c58d41abb92818f95a126e336e
Author: Kim Woelders <k...@woelders.dk>
AuthorDate: Fri Oct 13 11:55:23 2023 +0200
autofoo: Align with changes in other e16 stuff
---
.git-src | 0
ChangeLog | 47 ++++++++++++++++++++---------------------------
Makefile.am | 23 ++++++++++++++++++++++-
configure.ac | 10 +---------
e16-themes.spec.in | 4 +---
5 files changed, 44 insertions(+), 40 deletions(-)
diff --git a/.git-src b/.git-src
new file mode 100644
index 0000000..e69de29
diff --git a/ChangeLog b/ChangeLog
index 2b83474..dedda17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,29 +1,22 @@
---- 0.16.8.0.1 ---
-Enable building combined theme package.
+v1.0.2 - 2018-08-12
+--------------------
+Kim Woelders (9):
+ Spec file cleanups.
+ 1.0.1.000
+ Another spec file fix - don't own datadir/e16/themes.
+ Remove unnecessary AC_PROG_MAKE_SET.
+ Add MAINTAINERCLEANFILES.
+ ShinyMetal: Remove .xvpics/
+ Spec file cleanups
+ Simplify autogen.sh
+ 1.0.2.
---- 0.16.8.0.2 ---
-ShinyMetal - Correct pager textclass.
-New style AC_INIT, autofoo cleanups.
-ShinyMetal - Make border and menu fonts separately configurable.
-Add ChangeLog
+v1.0.1 - 2010-07-14
+--------------------
+Kim Woelders (5):
+ Bump version, autofoo cleanups, switch to non-deprecated macros.
+ Remove use of font-*-italic (only used by Ganymede).
+ Ganymede: Remove incorrect __FLAGS in transient border.
+ ShinyMetal: Fix backgrounds.
+ 1.0.1.
---- 0.16.8.0.3 ---
-configure.in -> configure.ac
-Remove duplicate fonts, put all fonts in ttfonts/.
-
---- 1.0.0 ---
-Rename font configuration files to match e16 changes. Remove obsolete localised ones.
-BrushedMetal-Tigert: Remove reference to non-existing synclaves.wav.
-
---- 1.0.1 ---
-Autofoo cleanups, switch to non-deprecated macros.
-Remove use of font-*-italic (only used by Ganymede).
-Ganymede: Remove incorrect __FLAGS in transient border.
-ShinyMetal: Fix backgrounds.
-
---- 1.0.2 ---
-Spec file cleanups.
-Remove unnecessary AC_PROG_MAKE_SET.
-Add MAINTAINERCLEANFILES.
-ShinyMetal: Remove .xvpics/
-Simplify autogen.sh
diff --git a/Makefile.am b/Makefile.am
index a025b69..267a0ab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,4 +6,25 @@ MAINTAINERCLEANFILES = \
aclocal.m4 configure install-sh missing \
Makefile.in */Makefile.in */*/Makefile.in
-EXTRA_DIST = ChangeLog
+EXTRA_DIST = $(PACKAGE).spec.in ChangeLog
+CLEANFILES = $(PACKAGE).spec
+
+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 5a0485b..3475e77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,6 @@
-m4_define([pkg_version], [1.0.2])
-m4_define([pkg_revision], [000])
-m4_define([pkg_version], m4_ifdef([pkg_revision], [pkg_version.pkg_revision], [pkg_version]))
-m4_define([rpm_revision], m4_ifdef([pkg_revision], ["0.%(date '+%y%m%d')"], [1]))
-
-AC_INIT([e16-themes], [pkg_version], [enlightenment-devel@lists.sourceforge.net])
+AC_INIT([e16-themes], [1.0.2], [enlightenment-devel@lists.sourceforge.net])
AM_INIT_AUTOMAKE([foreign])
-AC_SUBST(E_RPM_REVISION, [rpm_revision])
-
AC_PROG_INSTALL
THEMES="BlueSteel BrushedMetal-Tigert Ganymede ShinyMetal"
@@ -19,6 +12,5 @@ AC_CONFIG_FILES([
BrushedMetal-Tigert/Makefile
Ganymede/Makefile
ShinyMetal/Makefile
- e16-themes.spec
])
AC_OUTPUT
diff --git a/e16-themes.spec.in b/e16-themes.spec.in
index 4f86008..fc23f3e 100644
--- a/e16-themes.spec.in
+++ b/e16-themes.spec.in
@@ -1,7 +1,7 @@
Summary: Enlightenment themes: BlueSteel, BrushedMetal-Tigert, Ganymede, ShinyMetal
Name: @PACKAGE@
Version: @VERSION@
-Release: @E_RPM_REVISION@%{?_vendorsuffix:.%{_vendorsuffix}}
+Release: @RPM_RELEASE@%{?_vendorsuffix:.%{_vendorsuffix}}
License: BSD
Group: User Interface/Desktops
URL: http://www.enlightenment.org/
@@ -11,8 +11,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildArch: noarch
Requires: e16 >= 0.16.8
-Obsoletes: enlightenment-theme-BlueSteel enlightenment-theme-BrushedMetal-Tigert enlightenment-theme-Ganymede enlightenment-theme-ShinyMetal
-Obsoletes: e16-theme-BlueSteel e16-theme-BrushedMetal-Tigert e16-theme-Ganymede e16-theme-ShinyMetal
%description
The BlueSteel, BrushedMetal-Tigert, Ganymede, and ShinyMetal themes for Enlightenment DR16.
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
