Author: qboosh                       Date: Sun Apr 16 20:49:57 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added link patch to avoid *.la/-L poisoning
- require allegro >= 4.1.16 to avoid undefined _mangled_main_address

---- Files affected:
SPECS:
   DevIL.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/DevIL.spec
diff -u SPECS/DevIL.spec:1.11 SPECS/DevIL.spec:1.12
--- SPECS/DevIL.spec:1.11       Sat Apr 15 15:48:00 2006
+++ SPECS/DevIL.spec    Sun Apr 16 22:49:52 2006
@@ -1,7 +1,4 @@
 # $Revision$, $Date$
-# ToDo:
-# - fix %%build - one of the lib/auto* calls breaks build -
-#   libraries are named libfoo.1.2.3 instead of libfoo.so.1.2.3
 Summary:       Full featured image library
 Summary(pl):   Biblioteka obsługi obrazów z mnóstwem funkcji
 Name:          DevIL
@@ -17,20 +14,21 @@
 # Source1-md5: 6bb2ddfcbe09930c48ef84b8f99479fe
 Source2:       http://dl.sourceforge.net/openil/%{name}-docs.tar.gz
 # Source2-md5: eec6ae7a028a3f058bab1a6918428ed5
+Patch0:                %{name}-link.patch
 URL:           http://openil.sourceforge.net/
-BuildRequires: OpenGL-devel
-BuildRequires: SDL-devel
-BuildRequires: allegro-devel
-BuildRequires: autoconf
+BuildRequires: OpenGL-GLU-devel
+BuildRequires: SDL-devel >= 1.2.5
+BuildRequires: allegro-devel >= 4.1.16
+BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 BuildRequires: lcms-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libmng-devel
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
-BuildRequires: libtool
+BuildRequires: libtool >= 2:1.5
 BuildRequires: unzip
-Requires:      OpenGL
+Requires:      allegro >= 4.1.16
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _noautoreqdep   libGL.so.1 libGLU.so.1
@@ -73,6 +71,12 @@
 Summary(pl):   Nagłówki DevIL
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      lcms-devel
+Requires:      libjpeg-devel
+Requires:      libmng-devel
+Requires:      libpng-devel
+Requires:      libtiff-devel
+# libILUT additionally: SDL-devel, allegro-devel, OpenGL-GLU-devel
 
 %description devel
 DevIL devel files.
@@ -93,13 +97,16 @@
 
 %prep
 %setup -q -a1 -a2
+%patch0 -p1
+
+# just SDL and messing libtool macros
+rm -f acinclude.m4
 
 %build
-cp -f /usr/share/automake/config.sub .
-#%%{__libtoolize}
-#%%{__aclocal}
-#%%{__automake}
-#%%{__autoconf}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %configure \
        %{?debug:--disable-release}
 %{__make}
@@ -119,13 +126,19 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS BUGS CREDITS ChangeLog README.unix
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
-%{_libdir}/libIL*.la
+%attr(755,root,root) %{_libdir}/libIL.so.*.*.*
+%attr(755,root,root) %{_libdir}/libILU.so.*.*.*
+%attr(755,root,root) %{_libdir}/libILUT.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/lib*.so
-%{_includedir}/*
+%attr(755,root,root) %{_libdir}/libIL.so
+%attr(755,root,root) %{_libdir}/libILU.so
+%attr(755,root,root) %{_libdir}/libILUT.so
+%{_libdir}/libIL.la
+%{_libdir}/libILU.la
+%{_libdir}/libILUT.la
+%{_includedir}/IL
 
 %files doc
 %defattr(644,root,root,755)
@@ -137,6 +150,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2006/04/16 20:49:52  qboosh
+- added link patch to avoid *.la/-L poisoning
+- require allegro >= 4.1.16 to avoid undefined _mangled_main_address
+
 Revision 1.11  2006/04/15 13:48:00  blekot
 - more %files
 - rel 0.2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/DevIL.spec?r1=1.11&r2=1.12&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to