Enlightenment CVS committal

Author  : mej
Project : e16
Module  : e

Dir     : e16/e


Modified Files:
        e.spec ChangeLog 


Log Message:
Mon Jan  3 16:24:25 2005                        Michael Jennings (mej)

Fixed some bad spec file changes, added cleanups and some new stuff.
----------------------------------------------------------------------

===================================================================
RCS file: /cvsroot/enlightenment/e16/e/e.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -3 -r1.174 -r1.175
--- e.spec      28 Dec 2004 23:46:41 -0000      1.174
+++ e.spec      3 Jan 2005 21:24:50 -0000       1.175
@@ -1,16 +1,18 @@
 Summary:       The Enlightenment window manager.
 Name:          e16
 Version:       0.16.8
-Release:       0.01
+Release:       0.01%{?_vendorsuffix:.%{_vendorsuffix}}
 License:       BSD
 Group:         User Interface/Desktops
+URL:           http://www.enlightenment.org/
 Source0:       
http://prdownloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
+#BuildSuggests: esound-devel
+BuildRequires:  imlib2-devel freetype-devel xorg-x11-devel
+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
-URL:           http://www.enlightenment.org/
-
-Requires: imlib2
-Requires: esound >= 0.2.13
 
 %description
 Enlightenment is a window manager for the X Window System that
@@ -31,21 +33,22 @@
 %build
 CFLAGS="${RPM_OPT_FLAGS}"
 ENLIGHTENMENT_RELEASE=%{release}
-export CFLAGS ENLIGHTENMENT_RELEASE
+AC_FLAGS="--prefix=%{_prefix} --mandir=%{_mandir} --enable-fsstd 
--enable-hints-gnome --enable-xrandr"
+export CFLAGS ENLIGHTENMENT_RELEASE AC_FLAGS
 if [ ! -f configure ]; then
-  ./autogen.sh --prefix=%{_prefix} --bindir=%{_bindir} --datadir=%{_datadir} 
--mandir=%{_mandir} --enable-fsstd --enable-hints-gnome --enable-xrandr
+  ./autogen.sh $AC_FLAGS
 else
-  %{configure} --prefix=%{_prefix} --bindir=%{_bindir} --datadir=%{_datadir} 
--mandir=%{_mandir} --enable-fsstd --enable-hints-gnome --enable-xrandr
+  %{configure} $AC_FLAGS %{?acflags}
 fi
-make
+%{__make} %{?mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
+test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
+%{__make} install DESTDIR=$RPM_BUILD_ROOT %{?mflags_install}
 make DESTDIR=$RPM_BUILD_ROOT install
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/ChangeLog,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -3 -r1.173 -r1.174
--- ChangeLog   29 Dec 2004 00:15:31 -0000      1.173
+++ ChangeLog   3 Jan 2005 21:24:50 -0000       1.174
@@ -3211,3 +3211,7 @@
 (Kim)
 
 --- 0.16.8 0.01 ---
+Mon Jan  3 16:24:25 2005                        Michael Jennings (mej)
+
+Fixed some bad spec file changes, added cleanups and some new stuff.
+----------------------------------------------------------------------




-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to