Enlightenment CVS committal
Author : mej
Project : e16
Module : e
Dir : e16/e
Modified Files:
e.rh.spec e.spec
Log Message:
Updated release number.
Resynced old RH spec file with latest (cleanest) stuff.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/e.rh.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e.rh.spec 27 Mar 2003 01:38:01 -0000 1.3
+++ e.rh.spec 28 Mar 2003 05:27:28 -0000 1.4
@@ -1,25 +1,19 @@
-# Note that this is NOT a relocatable package
-%define ver 0.16.6
-%define rel 1
-%define prefix /usr
-
-Summary: The Enlightenment window manager. Crippled for GNOME ;-)
-Name: enlightenment_for_GNOME
-Version: %ver
-Release: %rel
-Copyright: GPL
+Summary: The Enlightenment window manager.
+Name: enlightenment
+Version: 0.16.6
+Release: 0.2
+Copyright: BSD
Group: User Interface/Desktops
-Source: ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment-%{ver}.tar.gz
-BuildRoot: /tmp/e-%{ver}-root
-Packager: Tom Gilbert <[EMAIL PROTECTED]>
-URL: http://www.enlightenment.org
+Source: ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment-%{version}.tar.gz
+Prefix: %{_prefix}
+Docdir: %{_docdir}
+BuildRoot: /tmp/e-%{version}-root
+Packager: Michael Jennings <[EMAIL PROTECTED]>
+URL: http://www.enlightenment.org/
Requires: imlib >= 1.9.8
Requires: fnlib >= 0.5
-Requires: freetype >= 1.1
Requires: esound >= 0.2.13
-Docdir: %{prefix}/doc
-
%description
Enlightenment is a window manager for the X Window System that
is designed to be powerful, extensible, configurable and
@@ -34,9 +28,8 @@
This package will install the Enlightenment window manager.
This version has had a number of GNOME-friendly customisations.
-Several options are disabled by default because they are
-duplicated by GNOME. They can of course be re-enabled at any
-time.
+Several options are disabled by default because they are duplicated by
+GNOME. They can of course be re-enabled at any time.
%changelog
@@ -44,32 +37,22 @@
%setup
%build
-# Optimize that damned code all the way
-if [ ! -z "`echo -n ${RPM_OPT_FLAGS} | grep pentium`" ]; then
- if [ ! -z "`which egcs`" ]; then
- CC="egcs"
- else
- if [ ! -z "`which pgcc`" ]; then
- CC="pgcc"
- fi
- fi
- CFLAGS="${RPM_OPT_FLAGS}"
-else
- CFLAGS="${RPM_OPT_FLAGS}"
-fi
+CFLAGS="${RPM_OPT_FLAGS}"
+export CFLAGS
if [ ! -f configure ]; then
- CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix --enable-fsstd
--enable-upgrade=no
+ ./autogen.sh --prefix=%{_prefix} --bindir=%{_bindir} --datadir=%{_datadir}
--mandir=%{_mandir} --enable-fsstd --enable-upgrade=no
else
- CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --enable-fsstd
--enable-upgrade=no
+ %{configure} --prefix=%{_prefix} --bindir=%{_bindir} --datadir=%{_datadir}
--mandir=%{_mandir} --enable-fsstd --enable-upgrade=no
fi
make
%install
rm -rf $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT%{prefix} install
+make DESTDIR=$RPM_BUILD_ROOT install
-( cd $RPM_BUILD_ROOT/%{prefix}/share/enlightenment/config
+(
+ cd $RPM_BUILD_ROOT/%{_prefix}/share/enlightenment/config
mv control.cfg control.cfg.real_E
mv control.rh.cfg control.cfg
@@ -83,20 +66,9 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-
-%postun
-
%files
%defattr(-, root, root)
-
-%{prefix}/share/enlightenment/*
-%{prefix}/bin/*
-%{prefix}/man/man1/*
-
-%doc AUTHORS
-%doc COPYING
-%doc INSTALL
-%doc README
-%doc FAQ
-%doc TODO
+%doc AUTHORS COPYING INSTALL README FAQ
+%{_datadir}/enlightenment/*
+%{_bindir}/*
+%{_mandir}/man1/*
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/e.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- e.spec 24 Mar 2003 03:48:07 -0000 1.26
+++ e.spec 28 Mar 2003 05:27:29 -0000 1.27
@@ -1,9 +1,7 @@
-# This is actually a CVS snapshot as of 20020904 at 20:00 EDT
-
Summary: The Enlightenment window manager.
Name: enlightenment
Version: 0.16.6
-Release: 0.1
+Release: 0.2
Copyright: BSD
Group: User Interface/Desktops
Source: ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment-%{version}.tar.gz
@@ -35,15 +33,7 @@
%setup
%build
-# Optimize that damned code all the way
-if [ ! -z "`echo -n ${RPM_OPT_FLAGS} | grep pentium`" ]; then
- if [ ! -z "`which pgcc`" ]; then
- CC="pgcc"
- fi
- CFLAGS="${RPM_OPT_FLAGS}"
-else
- CFLAGS="${RPM_OPT_FLAGS}"
-fi
+CFLAGS="${RPM_OPT_FLAGS}"
export CFLAGS
if [ ! -f configure ]; then
./autogen.sh --prefix=%{_prefix} --bindir=%{_bindir} --datadir=%{_datadir}
--mandir=%{_mandir} --enable-fsstd --enable-upgrade=no
-------------------------------------------------------
This SF.net email is sponsored by:
The Definitive IT and Networking Event. Be There!
NetWorld+Interop Las Vegas 2003 -- Register today!
http://ads.sourceforge.net/cgi-bin/redirect.pl?keyn0001en
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
