Enlightenment CVS committal
Author : kwo
Project : e16
Module : epplets
Dir : e16/epplets
Modified Files:
.cvsignore configure.in epplets.spec
Added Files:
epplets.spec.in
Log Message:
Use same configure.in/spec file setup in e16 and epplets.
===================================================================
RCS file: /cvs/e/e16/epplets/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- .cvsignore 25 May 2004 17:51:36 -0000 1.5
+++ .cvsignore 18 Mar 2007 01:08:10 -0000 1.6
@@ -3,6 +3,7 @@
config.cache
config.guess
configure
+depcomp
ltconfig
ltmain.sh
Makefile
===================================================================
RCS file: /cvs/e/e16/epplets/configure.in,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- configure.in 15 Apr 2006 19:36:13 -0000 1.44
+++ configure.in 18 Mar 2007 01:08:10 -0000 1.45
@@ -1,7 +1,30 @@
-dnl# $Id: configure.in,v 1.44 2006/04/15 19:36:13 vapier Exp $
+AC_INIT(configure.in)
-AC_INIT(api/epplet.c)
-AM_INIT_AUTOMAKE(epplets, 0.9)
+E_PKG_VERSION=0.10
+E_PKG_REVISION=0.01
+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
+ E_PKG_VER_REV=$E_PKG_VERSION
+ E_RPM_REVISION=1
+fi
+
+AM_INIT_AUTOMAKE(epplets, $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)
+
+# reasonable guesses for where stuff is installed
+if test "x$prefix" = "xNONE"; then
+ prefix=$ac_default_prefix
+fi
+if test "x$exec_prefix" = "xNONE"; then
+ exec_prefix=$prefix
+fi
AC_PROG_CC
AC_PROG_CPP
@@ -195,13 +218,6 @@
GTLIBS=""
fi
-if test "x$prefix" = "xNONE"; then
- prefix=$ac_default_prefix
-fi
-if test "x$exec_prefix" = "xNONE"; then
- exec_prefix=$prefix
-fi
-
# Build test programs?
AC_ARG_WITH(test-programs, [ --with-test-programs Builds the test programs
[default=no]],
TEST_PROGS="EppletTest.epplet
EppletConfigTest.epplet",TEST_PROGS="")
@@ -298,7 +314,14 @@
AM_CONFIG_HEADER(config.h)
-AC_OUTPUT(Makefile api/Makefile epplets/Makefile debian/Makefile api/epplet.h)
+AC_OUTPUT([
+Makefile
+api/Makefile
+epplets/Makefile
+debian/Makefile
+api/epplet.h
+epplets.spec
+])
echo
echo "If you are running Enlightenment < 0.16.4, you *must* configure"
===================================================================
RCS file: /cvs/e/e16/epplets/epplets.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- epplets.spec 17 Mar 2007 03:39:24 -0000 1.16
+++ epplets.spec 18 Mar 2007 01:08:10 -0000 1.17
@@ -1,23 +1,22 @@
-%define use_gnome %{?_with_gnome:1}0
-
Summary: Enlightenment Epplets
Name: epplets
-Version: 0.9
-Release: 0.%(date '+%Y%m%d')%{?_vendorsuffix:.%{_vendorsuffix}}
+Version: 0.10
+Release: 0.01%{?_rpm_add_date:.%(date
'+%y%m%d')}%{?_vendorsuffix:.%{_vendorsuffix}}
License: BSD
-Group: User Interface/X
+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}-0.10-0.01.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}}
-#BuildSuggests: freeglut-devel xorg-x11-devel
+Prefix: %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: imlib2-devel
+#BuildSuggests: freeglut-devel xorg-x11-devel
#Requires: enlightenment >= 0.16.0
Provides: enlightenment-epplets = %{version}
Provides: e16-epplets = %{version}
Obsoletes: enlightenment-epplets
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description
Epplets are small, handy Enlightenment applets, similar to "dockapps"
@@ -27,17 +26,13 @@
slideshow, a URL grabber, a panel-like toolbar, and more.
%prep
-%setup -q
+%setup -n %{name}-0.10-0.01
%build
CFLAGS="$RPM_OPT_FLAGS"
export CFLAGS
-%{configure} --prefix=%{_prefix} --bindir=%{_bindir} --datadir=%{_datadir} \
-%if %{use_gnome}
- --disable-autorespawn \
-%endif
- --enable-fsstd %{?acflags}
+%{configure} --prefix=%{_prefix} --bindir=%{_bindir} --datadir=%{_datadir}
%{?acflags}
%{__make} %{?_smp_mflags} %{?mflags}
%install
-------------------------------------------------------------------------
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
