Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e
Modified Files:
configure.in e16.spec.in
Log Message:
Use same configure.in/spec file setup in e16 and epplets.
===================================================================
RCS file: /cvs/e/e16/e/configure.in,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -3 -r1.200 -r1.201
--- configure.in 14 Mar 2007 05:27:14 -0000 1.200
+++ configure.in 18 Mar 2007 01:08:09 -0000 1.201
@@ -1,44 +1,32 @@
AC_INIT(configure.in)
-ENLIGHTENMENT_MAJOR=0
-ENLIGHTENMENT_MINOR=16
-ENLIGHTENMENT_MICRO=8.7
-ENLIGHTENMENT_REVISION=0.02
-ENLIGHTENMENT_VERSION=$ENLIGHTENMENT_MAJOR.$ENLIGHTENMENT_MINOR.$ENLIGHTENMENT_MICRO
-if test "x$ENLIGHTENMENT_REVISION" != "x"; then
- ENLIGHTENMENT_REVNAME="$ENLIGHTENMENT_VERSION-$ENLIGHTENMENT_REVISION"
- RPM_REVISION=$ENLIGHTENMENT_REVISION
+E_PKG_VERSION=0.16.8.7
+E_PKG_REVISION=0.02
+if test "x$E_PKG_REVISION" != "x"; then
+ E_PKG_VER_REV=$E_PKG_VERSION-$E_PKG_REVISION
+ E_RPM_REVISION=$E_PKG_REVISION
else
- ENLIGHTENMENT_REVNAME="$ENLIGHTENMENT_VERSION"
- RPM_REVISION=1
+ E_PKG_VER_REV=$E_PKG_VERSION
+ E_RPM_REVISION=1
fi
-AM_INIT_AUTOMAKE(e16, $ENLIGHTENMENT_REVNAME)
-AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE(e16, $E_PKG_VER_REV)
+
+AC_DEFINE_UNQUOTED(E_PKG_VERSION, "$E_PKG_VERSION", [Version])
+AC_SUBST(E_PKG_VERSION)
+AC_DEFINE_UNQUOTED(E_PKG_REVISION, "$E_PKG_REVISION", [Revision])
+AC_SUBST(E_PKG_REVISION)
+AC_SUBST(E_RPM_REVISION)
-dnl reasonable guesses for where stuff is installed
+# reasonable guesses for where stuff is installed
if test "x$prefix" = "xNONE"; then
- prefix="/usr/local"
+ prefix=$ac_default_prefix
fi
if test "x$exec_prefix" = "xNONE"; then
exec_prefix=$prefix
fi
-AM_CONFIG_HEADER(config.h)
-
-AC_DEFINE_UNQUOTED(ENLIGHTENMENT_VERSION, "$ENLIGHTENMENT_VERSION",
[Enlightenment version])
-AC_SUBST(ENLIGHTENMENT_VERSION)
-AC_DEFINE_UNQUOTED(ENLIGHTENMENT_MAJOR, "$ENLIGHTENMENT_MAJOR", [Major
Version])
-AC_SUBST(ENLIGHTENMENT_MAJOR)
-AC_DEFINE_UNQUOTED(ENLIGHTENMENT_MINOR, "$ENLIGHTENMENT_MINOR", [Minor
Version])
-AC_SUBST(ENLIGHTENMENT_MINOR)
-AC_DEFINE_UNQUOTED(ENLIGHTENMENT_MICRO, "$ENLIGHTENMENT_MICRO", [Micro
Version])
-AC_SUBST(ENLIGHTENMENT_MICRO)
-AC_DEFINE_UNQUOTED(ENLIGHTENMENT_REVISION, "$ENLIGHTENMENT_REVISION",
[Revision])
-AC_SUBST(ENLIGHTENMENT_REVISION)
-AC_DEFINE_UNQUOTED(ENLIGHTENMENT_REVNAME, "$ENLIGHTENMENT_REVNAME",
[Version-Revision])
-AC_SUBST(ENLIGHTENMENT_REVNAME)
-AC_SUBST(RPM_REVISION)
+AM_MAINTAINER_MODE
ALL_LINGUAS="bg bs da de en_US es fr hu ko nl no ru sv pt pl pt_BR tr ja"
@@ -305,6 +293,8 @@
fi
AC_SUBST(E_X_LIBS)
+
+AM_CONFIG_HEADER(config.h)
AC_OUTPUT([
Makefile
===================================================================
RCS file: /cvs/e/e16/e/e16.spec.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e16.spec.in 7 Jan 2007 19:15:15 -0000 1.5
+++ e16.spec.in 18 Mar 2007 01:08:09 -0000 1.6
@@ -1,18 +1,18 @@
Summary: The Enlightenment window manager, DR16.
Name: @PACKAGE@
-Version: @ENLIGHTENMENT_VERSION@
-Release: @[EMAIL PROTECTED]:.%(date
'+%y%m%d')}%{?_vendorsuffix:.%{_vendorsuffix}}
+Version: @E_PKG_VERSION@
+Release: @[EMAIL PROTECTED]:.%(date
'+%y%m%d')}%{?_vendorsuffix:.%{_vendorsuffix}}
License: BSD
Group: User Interface/Desktops
URL: http://www.enlightenment.org/
-Source0: http://prdownloads.sourceforge.net/enlightenment/@[EMAIL
PROTECTED]@[EMAIL PROTECTED]
-#BuildSuggests: esound-devel
-BuildRequires: imlib2-devel freetype-devel
+Source: http://prdownloads.sourceforge.net/enlightenment/[EMAIL
PROTECTED]@.tar.gz
Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <[EMAIL
PROTECTED]>}
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment
Project (http://www.enlightenment.org/)}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: imlib2-devel freetype-devel
+#BuildSuggests: esound-devel
Obsoletes: enlightenment < 0.16.8
Requires: imlib2 >= 1.2.0
@@ -30,7 +30,7 @@
This package will install the Enlightenment window manager.
%prep
-%setup -n @[EMAIL PROTECTED]@VERSION@
+%setup -n [EMAIL PROTECTED]@
%build
CFLAGS="${RPM_OPT_FLAGS}"
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
