Author: qboosh Date: Sun Nov 28 21:02:56 2010 GMT Module: packages Tag: HEAD ---- Log message: - added link patch to make use of as-needed flag - updated BRs
---- Files affected: packages/gliv: gliv.spec (1.32 -> 1.33) , gliv-link.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/gliv/gliv.spec diff -u packages/gliv/gliv.spec:1.32 packages/gliv/gliv.spec:1.33 --- packages/gliv/gliv.spec:1.32 Tue Nov 23 15:13:12 2010 +++ packages/gliv/gliv.spec Sun Nov 28 22:02:48 2010 @@ -4,16 +4,19 @@ Name: gliv Version: 1.9.7 Release: 1 -License: GPL +License: GPL v2+ Group: X11/Applications/Multimedia -Vendor: Guillaume Chazarain <[email protected]> Source0: http://guichaz.free.fr/gliv/files/%{name}-%{version}.tar.bz2 # Source0-md5: 5f0fafaf41651da8882e88b3df062d02 +Patch0: %{name}-link.patch URL: http://guichaz.free.fr/gliv/ +BuildRequires: OpenGL-GLU-devel +BuildRequires: autoconf >= 2.50 BuildRequires: automake -BuildRequires: gtk+2-devel >= 2:2.4.0 +BuildRequires: gtk+2-devel >= 2:2.6.0 BuildRequires: gtkglext-devel >= 1.0.0 BuildRequires: pkgconfig +Requires: gtk+2 >= 2:2.6.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _noautoreqdep libGL.so.1 libGLU.so.1 @@ -38,9 +41,13 @@ %prep %setup -q +%patch0 -p1 %build -cp -f /usr/share/automake/config.* . +%{__aclocal} +%{__autoconf} +%{__autoheader} +%{__automake} %configure %{__make} @@ -57,12 +64,13 @@ %files -f %{name}.lang %defattr(644,root,root,755) -%doc README NEWS THANKS +%doc NEWS README THANKS %attr(755,root,root) %{_bindir}/%{name} -%{_mandir}/man1/* -%lang(de) %{_mandir}/de/man1/* -%lang(fr) %{_mandir}/fr/man1/* -%lang(ru) %{_mandir}/ru/man1/* +%{_mandir}/man1/gliv.1* +%lang(cs) %{_mandir}/cs/man1/gliv.1* +%lang(de) %{_mandir}/de/man1/gliv.1* +%lang(fr) %{_mandir}/fr/man1/gliv.1* +%lang(ru) %{_mandir}/ru/man1/gliv.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -70,6 +78,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.33 2010/11/28 21:02:48 qboosh +- added link patch to make use of as-needed flag +- updated BRs + Revision 1.32 2010/11/23 14:13:12 uzsolt - 1.9.7 ================================================================ Index: packages/gliv/gliv-link.patch diff -u /dev/null packages/gliv/gliv-link.patch:1.1 --- /dev/null Sun Nov 28 22:02:56 2010 +++ packages/gliv/gliv-link.patch Sun Nov 28 22:02:48 2010 @@ -0,0 +1,37 @@ +--- gliv-1.9.7/configure.ac.orig 2010-11-07 20:22:01.000000000 +0100 ++++ gliv-1.9.7/configure.ac 2010-11-28 21:53:19.778114393 +0100 +@@ -129,12 +129,12 @@ + # Checks for X. + AC_PATH_XTRA + CFLAGS="$X_CFLAGS $CFLAGS" +-LDFLAGS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS $LDFLAGS" ++LIBS="$LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" + + # Checks for GtkGLExt. + PKG_CHECK_MODULES(GTKGLEXT, [gtkglext-1.0 >= 0.7.0]) + CFLAGS="$GTKGLEXT_CFLAGS $CFLAGS" +-LDFLAGS="$GTKGLEXT_LIBS $LDFLAGS" ++LIBS="$LIBS $GTKGLEXT_LIBS" + GTKGL_VERSION="$($PKG_CONFIG --modversion gtkglext-1.0)" + + # Checks for OpenGL. +@@ -145,8 +145,8 @@ + + if test "x$ogl" = "xno"; then + AC_MSG_NOTICE([maybe libGL requires libpthread...]) +- OLD_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -lpthread" ++ OLD_LIBS="$LIBS" ++ LIBS="$LIBS -lpthread" + AC_TRY_LINK([#include "GL/gl.h"], + [glBegin(GL_QUADS);], + [], +@@ -156,7 +156,7 @@ + # Checks for gtk. + AM_PATH_GTK_2_0([2.6.0], [ + CFLAGS="$GTK_CFLAGS $CFLAGS" +- LDFLAGS="$GTK_LIBS $LDFLAGS" ++ LIBS="$LIBS $GTK_LIBS" + GTK_VERSION="$($PKG_CONFIG --modversion gtk+-2.0)" + ], [exit 1], [gthread]) + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gliv/gliv.spec?r1=1.32&r2=1.33&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
