Author: qboosh Date: Sat Oct 16 08:41:25 2010 GMT Module: packages Tag: HEAD ---- Log message: - updated to 1.5.6 - updated dynamic-progs patch - don't package GL/wglew.h (Win32-only)
---- Files affected: packages/glew: glew-dynamic-progs.patch (1.2 -> 1.3) , glew.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: packages/glew/glew-dynamic-progs.patch diff -u packages/glew/glew-dynamic-progs.patch:1.2 packages/glew/glew-dynamic-progs.patch:1.3 --- packages/glew/glew-dynamic-progs.patch:1.2 Sat Aug 2 14:58:38 2008 +++ packages/glew/glew-dynamic-progs.patch Sat Oct 16 10:41:20 2010 @@ -1,11 +1,11 @@ ---- glew/Makefile 2007-12-28 03:05:25.000000000 +0000 -+++ glew/Makefile 2008-08-02 11:04:02.000000000 +0000 -@@ -73,7 +73,7 @@ +--- glew-1.5.6/Makefile.orig 2010-09-07 18:01:49.000000000 +0200 ++++ glew-1.5.6/Makefile 2010-10-16 10:23:59.451734339 +0200 +@@ -78,7 +78,7 @@ VISUALINFO.BIN = visualinfo$(BIN.SUFFIX) VISUALINFO.BIN.SRCS = src/visualinfo.c - VISUALINFO.BIN.OBJS = $(VISUALINFO_BIN.SRCS:.c=.o) + VISUALINFO.BIN.OBJS = $(VISUALINFO.BIN.SRCS:.c=.o) -BIN.LIBS = -Llib $(LDFLAGS.DYNAMIC) -l$(NAME) $(LDFLAGS.EXTRA) $(LDFLAGS.GL) +BIN.LIBS = -Llib -l$(NAME) $(LDFLAGS.EXTRA) $(LDFLAGS.GL) - all debug: lib/$(LIB.SHARED) lib/$(LIB.STATIC) bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) + all debug: lib/$(LIB.SHARED) lib/$(LIB.STATIC) bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) glew.pc ================================================================ Index: packages/glew/glew.spec diff -u packages/glew/glew.spec:1.9 packages/glew/glew.spec:1.10 --- packages/glew/glew.spec:1.9 Wed Apr 15 18:08:49 2009 +++ packages/glew/glew.spec Sat Oct 16 10:41:20 2010 @@ -2,16 +2,16 @@ Summary: The OpenGL Extension Wrangler Library Summary(pl.UTF-8): Bibliteka OpenGL Extension Wrangler Name: glew -Version: 1.5.1 +Version: 1.5.6 Release: 1 License: BSD Group: Libraries -Source0: http://dl.sourceforge.net/glew/%{name}-%{version}-src.tgz -# Source0-md5: 759a59853dfaae4d007b414a3c1712f2 +Source0: http://downloads.sourceforge.net/glew/%{name}-%{version}.tgz +# Source0-md5: e6f56eb765f1da489a1327793adcf6bb Patch0: %{name}-dynamic-progs.patch URL: http://glew.sourceforge.net/ BuildRequires: OpenGL-GLU-devel -BuildRequires: dos2unix +BuildRequires: xorg-lib-libXext-devel BuildRequires: xorg-lib-libXi-devel BuildRequires: xorg-lib-libXmu-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -36,6 +36,7 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: OpenGL-GLU-devel +Requires: xorg-lib-libXext-devel Requires: xorg-lib-libXi-devel Requires: xorg-lib-libXmu-devel @@ -58,23 +59,24 @@ Biblioteka statyczna glew. %prep -%setup -q -n %{name} -dos2unix config/config.guess Makefile +%setup -q %patch0 -p1 %build %{__make} \ CC="%{__cc}" \ OPT="%{rpmcflags}" \ - LDFLAGS="%{rpmldflags}" + LDFLAGS="%{rpmldflags}" \ + LIBDIR=%{_libdir} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_includedir}/GL} +install -d $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_includedir}/GL,%{_pkgconfigdir}} install bin/* $RPM_BUILD_ROOT%{_bindir} cp -d lib/* $RPM_BUILD_ROOT%{_libdir} -install include/GL/* $RPM_BUILD_ROOT%{_includedir}/GL +install include/GL/{glew,glxew}.h $RPM_BUILD_ROOT%{_includedir}/GL +install glew.pc $RPM_BUILD_ROOT%{_pkgconfigdir} %clean rm -rf $RPM_BUILD_ROOT @@ -84,15 +86,18 @@ %files %defattr(644,root,root,755) -%doc LICENSE.txt README.txt doc/* -%attr(755,root,root) %{_bindir}/* +%doc LICENSE.txt README.txt TODO.txt doc/*.{html,css,png,jpg} +%attr(755,root,root) %{_bindir}/glewinfo +%attr(755,root,root) %{_bindir}/visualinfo %attr(755,root,root) %{_libdir}/libGLEW.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libGLEW.so.?.? +%attr(755,root,root) %ghost %{_libdir}/libGLEW.so.1.5 %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libGLEW.so -%{_includedir}/GL/*.h +%{_includedir}/GL/glew.h +%{_includedir}/GL/glxew.h +%{_pkgconfigdir}/glew.pc %files static %defattr(644,root,root,755) @@ -104,6 +109,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.10 2010/10/16 08:41:20 qboosh +- updated to 1.5.6 +- updated dynamic-progs patch +- don't package GL/wglew.h (Win32-only) + Revision 1.9 2009/04/15 16:08:49 arvenil - convert also Makefile to UNIX format instead changing patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glew/glew-dynamic-progs.patch?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glew/glew.spec?r1=1.9&r2=1.10&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
