From e07a70d46331bf3dff050da2672b1ea7174db384 Mon Sep 17 00:00:00 2001 From: Kim Woelders Date: Sat, 3 Jan 2009 07:52:43 +0000 Subject: [PATCH] Autofoo tweaks. SVN revision: 38425 --- configure.ac | 6 ++---- e16.spec.in | 6 +++--- src/config.c | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 4ab810d9..9313e8f6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,13 +1,11 @@ m4_define([pkg_version], [0.16.8.15]) m4_define([pkg_revision], [0.01]) -m4_define([pkg_ver_rev], m4_ifdef([pkg_revision], [pkg_version-pkg_revision], [pkg_version])) +m4_define([pkg_version], m4_ifdef([pkg_revision], [pkg_version-pkg_revision], [pkg_version])) m4_define([rpm_revision], m4_ifdef([pkg_revision], [pkg_revision], [1])) -AC_INIT(e16, [pkg_ver_rev], [enlightenment-devel@lists.sourceforge.net]) +AC_INIT(e16, [pkg_version], [enlightenment-devel@lists.sourceforge.net]) AM_INIT_AUTOMAKE([foreign]) -AC_DEFINE(E_PKG_VERSION, ["pkg_version"], [Version]) -AC_SUBST(E_PKG_VERSION, [pkg_version]) AC_SUBST(E_RPM_REVISION, [rpm_revision]) # reasonable guesses for where stuff is installed diff --git a/e16.spec.in b/e16.spec.in index 8aabca38..1ec34e0c 100644 --- a/e16.spec.in +++ b/e16.spec.in @@ -1,11 +1,11 @@ Summary: The Enlightenment window manager, DR16. Name: @PACKAGE@ -Version: @E_PKG_VERSION@ +Version: @VERSION@ Release: @E_RPM_REVISION@%{?_rpm_add_date:.%(date '+%y%m%d')}%{?_rpm_pkg_ext:%{_rpm_pkg_ext}}%{?_vendorsuffix:.%{_vendorsuffix}} License: BSD Group: User Interface/Desktops URL: http://www.enlightenment.org/ -Source: http://prdownloads.sourceforge.net/enlightenment/%{name}-@VERSION@.tar.gz +Source: http://prdownloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings } Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)} Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}} @@ -31,7 +31,7 @@ define their own policy, down to every last detail. This package will install the Enlightenment window manager. %prep -%setup -n %{name}-@VERSION@ +%setup -n %{name}-%{version} %build %{configure} %{?acflags} diff --git a/src/config.c b/src/config.c index f6065ebe..4397652b 100644 --- a/src/config.c +++ b/src/config.c @@ -254,7 +254,7 @@ ConfigFilePreparse(const char *src, const char *dst, const char *themepath) "-D USER_SHELL=%s " "-D ENLIGHTENMENT_VERSION_015=1 " "%s %s", epp_path, EDirRoot(), themepath, EDirRoot(), - E_PKG_VERSION, EDirRoot(), EDirBin(), + "0.16.8", EDirRoot(), EDirBin(), themepath, EDirUser(), EDirUserCache(), WinGetW(VROOT), WinGetH(VROOT), WinGetW(VROOT), WinGetH(VROOT), WinGetDepth(VROOT), def_user, def_home, def_shell, src, dst);