Enlightenment CVS committal

Author  : mej
Project : e17
Module  : libs/imlib2

Dir     : e17/libs/imlib2


Modified Files:
        imlib2.spec 


Log Message:
Sun Jul 25 17:45:53 2004                        Michael Jennings (mej)

Fixed up lots of spec files here.  I haven't been able to test the
emotion spec file, but hopefully I didn't break anything too
terrible. :-)

Also fixed an etox problem with the conditional test build.
----------------------------------------------------------------------

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/imlib2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- imlib2.spec 20 Jul 2004 21:24:37 -0000      1.24
+++ imlib2.spec 25 Jul 2004 21:50:40 -0000      1.25
@@ -1,13 +1,14 @@
 Summary: Powerful image loading and rendering library
 Name: imlib2
 Version: 1.1.2
-Release: 1
+Release: 1.%(date '+%Y%m%d')
 Copyright: BSD
 Group: System Environment/Libraries
 Source: 
ftp://ftp.enlightenment.org/pub/enlightenment/e17/libs/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-root
 Packager: Michael Jennings <[EMAIL PROTECTED]>
 URL: http://www.rasterman.com/raster/imlib.html
+#BuildSuggests: freetype-devel xorg-x11-devel
 Requires: %{name}-loader_jpeg = %{version}
 Requires: %{name}-loader_png = %{version}
 Requires: %{name}-loader_argb = %{version}
@@ -103,51 +104,32 @@
 gz compressed image loader/saver for Imlib2
 
 %prep
-rm -rf $RPM_BUILD_ROOT
-
 %setup -q
 
 %build
-
-if [ -f configure ]
-then
-  %configure --prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} 
--includedir=%{_includedir}
-else
-  # can't build as root? gah. ;)
-  sed <autogen.sh '[EMAIL PROTECTED]@ANNOYING@' >autogen.sh1
-  mv -f autogen.sh1 autogen.sh
-  chmod 0700 autogen.sh
-  ./autogen.sh --prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} 
--includedir=%{_includedir}
-fi
-
-if [ "$SMP" != "" ]; then
-  (make "MAKE=make -k -j $SMP"; exit 0)
-  make
-else
-  make
-fi
+%{configure} --prefix=%{_prefix}
+%{__make} %{?_smp_mflags} %{?mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+%{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 
 %post
-test -x /sbin/ldconfig && /sbin/ldconfig
+/sbin/ldconfig
 
 %postun
-test -x /sbin/ldconfig && /sbin/ldconfig
+/sbin/ldconfig
 
 %files
-%defattr(-,root,root,0755)
-%doc AUTHORS README COPYING ChangeLog doc/index.html doc/imlib2.gif doc/blank.gif
+%defattr(-, root, root)
+%doc AUTHORS COPYING README ChangeLog doc/index.html doc/imlib2.gif doc/blank.gif
 %{_libdir}/lib*.so.*
 %{_bindir}/*
 
 %files devel
-%defattr(-,root,root,0755)
+%defattr(-, root, root, 0755)
 %{_libdir}/libImlib2.so
 %{_libdir}/*.a
 %{_libdir}/*.la
@@ -190,28 +172,4 @@
 %files loader_gz
 %attr(755,root,root) %{_libdir}/imlib2_loaders/image/zlib.*
 
-
-
 %changelog
-* Mon Jan 8 2001 The Rasterman <[EMAIL PROTECTED]>
-- Fix Requires & BuildRequires for freetype.
-
-* Sat Sep 30 2000 Lyle Kempler <[EMAIL PROTECTED]>
-- Bring back building imlib2 as root via autogen.sh for the lazy (me)
-- Some minor changes
-
-* Sat Sep 30 2000 Joakim Bodin <[EMAIL PROTECTED]>
-- Linux-Mandrake:ise the spec file
-
-* Tue Sep 12 2000 The Rasterman <[EMAIL PROTECTED]>
-- Redo spec file
-
-* Wed Aug 30 2000 Lyle Kempler <[EMAIL PROTECTED]>
-- Include imlib2-config
-
-* Sat May 20 2000 Lyle Kempler <[EMAIL PROTECTED]>
-- Fixed problems with requiring imlib2_view
-- Went back to imlib2_view (not imlib2-view)
-
-* Tue Nov 2 1999 Lyle Kempler <[EMAIL PROTECTED]>
-- Mangled imlib 1.9.8 imlib spec file into imlib2 spec file




-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to