From 084912582013261e3c6c0491deed2bebf14b5f0b Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 9 Feb 2010 18:36:41 +0000 Subject: [PATCH] - glew-1.5.2-add-needed.patch: Fix FTBFS from --no-add-needed --- glew-1.5.2-add-needed.patch | 12 ++++++++++++ glew.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 glew-1.5.2-add-needed.patch diff --git a/glew-1.5.2-add-needed.patch b/glew-1.5.2-add-needed.patch new file mode 100644 index 0000000..f216904 --- /dev/null +++ b/glew-1.5.2-add-needed.patch @@ -0,0 +1,12 @@ +diff -up glew-1.5.2/Makefile.jx glew-1.5.2/Makefile +--- glew-1.5.2/Makefile.jx 2010-02-09 13:33:15.000000000 -0500 ++++ glew-1.5.2/Makefile 2010-02-09 13:35:51.000000000 -0500 +@@ -78,7 +78,7 @@ GLEWINFO.BIN.OBJS = $(GLEWINFO.BIN.SRCS: + VISUALINFO.BIN = visualinfo$(BIN.SUFFIX) + VISUALINFO.BIN.SRCS = src/visualinfo.c + VISUALINFO.BIN.OBJS = $(VISUALINFO.BIN.SRCS:.c=.o) +-BIN.LIBS = -Llib $(LDFLAGS.DYNAMIC) -l$(NAME) $(LDFLAGS.EXTRA) $(LDFLAGS.GL) ++BIN.LIBS = -Llib $(LDFLAGS.DYNAMIC) -l$(NAME) $(LDFLAGS.EXTRA) $(LDFLAGS.GL) -lX11 + + all debug: lib/$(LIB.SHARED) lib/$(LIB.STATIC) bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) + diff --git a/glew.spec b/glew.spec index 3ac2be6..504f52e 100644 --- a/glew.spec +++ b/glew.spec @@ -1,6 +1,6 @@ Name: glew Version: 1.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The OpenGL Extension Wrangler Library Group: System Environment/Libraries License: BSD and MIT @@ -8,6 +8,7 @@ URL: http://glew.sourceforge.net Source0: http://downloads.sourceforge.net/project/glew/glew/%{version}/glew-%{version}.tgz Patch0: glew-1.5.2-makefile.patch +Patch1: glew-1.5.2-add-needed.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libGLU-devel @@ -33,6 +34,7 @@ Development files for glew %prep %setup -q %patch0 -p1 +%patch1 -p1 sed -i -e 's/\r//g' config/config.guess @@ -70,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/* %changelog +* Tue Feb 09 2010 Adam Jackson 1.5.2-2 +- glew-1.5.2-add-needed.patch: Fix FTBFS from --no-add-needed + * Tue Feb 02 2010 Adam Jackson 1.5.2-1 - glew 1.5.2