diff --git a/glew-1.3.6-pathandstrip.patch b/glew-1.3.6-pathandstrip.patch deleted file mode 100644 index fd03d97..0000000 --- a/glew-1.3.6-pathandstrip.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -up glew/Makefile.orig glew/Makefile ---- glew/Makefile.orig 2007-12-28 04:05:25.000000000 +0100 -+++ glew/Makefile 2008-01-21 20:30:35.000000000 +0100 -@@ -41,16 +41,16 @@ $(error "Platform '$(SYSTEM)' not suppor - endif - - GLEW_DEST ?= /usr --BINDIR ?= $(GLEW_DEST)/bin --LIBDIR ?= $(GLEW_DEST)/lib --INCDIR ?= $(GLEW_DEST)/include/GL -+BINDIR ?= $(GLEW_DEST)$(bindir) -+LIBDIR ?= $(GLEW_DEST)$(libdir) -+INCDIR ?= $(GLEW_DEST)$(includedir)/GL - SHARED_OBJ_EXT ?= o - TARDIR = ../glew-$(GLEW_VERSION) - TARBALL = ../glew_$(GLEW_VERSION).tar.gz - - AR = ar - INSTALL = install --STRIP = strip -+STRIP = true - RM = rm -f - LN = ln -sf - ifeq ($(MAKECMDGOALS), debug) -@@ -117,7 +117,7 @@ ifeq ($(patsubst mingw%,mingw,$(SYSTEM)) - $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/ - else - $(STRIP) -x lib/$(LIB.SHARED) -- $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/ -+ $(INSTALL) -m 0755 lib/$(LIB.SHARED) $(LIBDIR)/ - $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME) - endif - # development files -@@ -132,7 +132,7 @@ else - $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK) - endif - # utilities -- $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/ -+ $(INSTALL) -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/ - - uninstall: - $(RM) $(INCDIR)/wglew.h ---- glew/config/Makefile.linux.orig 2007-03-01 06:49:21.000000000 +0000 -+++ glew/config/Makefile.linux 2007-03-04 19:38:17.000000000 +0000 -@@ -9,10 +9,10 @@ - M_ARCH ?= $(shell arch) - ifeq (x86_64,${M_ARCH}) - LDFLAGS.EXTRA = -L/usr/X11R6/lib64 --LIBDIR = $(GLEW_DEST)/lib64 -+LIBDIR = $(GLEW_DEST)$(libdir) - else - LDFLAGS.EXTRA = -L/usr/X11R6/lib --LIBDIR = $(GLEW_DEST)/lib -+LIBDIR = $(GLEW_DEST)$(libdir) - endif - LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11 - LDFLAGS.STATIC = -Wl,-Bstatic diff --git a/glew-1.4.0-unused-direct-shlib-dependency.patch b/glew-1.4.0-unused-direct-shlib-dependency.patch deleted file mode 100644 index 6e544d3..0000000 --- a/glew-1.4.0-unused-direct-shlib-dependency.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up glew/config/Makefile.linux~ glew/config/Makefile.linux ---- glew/config/Makefile.linux~ 2007-08-18 09:56:12.000000000 +0200 -+++ glew/config/Makefile.linux 2007-08-18 09:56:12.000000000 +0200 -@@ -14,7 +14,7 @@ else - LDFLAGS.EXTRA = -L/usr/X11R6/lib - LIBDIR = $(GLEW_DEST)$(libdir) - endif --LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11 -+LDFLAGS.GL = -lGL - LDFLAGS.STATIC = -Wl,-Bstatic - LDFLAGS.DYNAMIC = -Wl,-Bdynamic - NAME = GLEW -diff -up glew/Makefile~ glew/Makefile ---- glew/Makefile~ 2007-08-18 10:26:11.000000000 +0200 -+++ glew/Makefile 2007-08-18 10:26:11.000000000 +0200 -@@ -96,7 +96,7 @@ bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.SRCS - $(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.SRCS) $(BIN.LIBS) - - bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.SRCS) lib/$(LIB.SHARED) -- $(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.SRCS) $(BIN.LIBS) -+ $(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.SRCS) $(BIN.LIBS) -lGLU - - %.o: %.c - $(CC) -c $(CFLAGS) -o $@ $< diff --git a/glew-1.5.1-makefile.patch b/glew-1.5.1-makefile.patch new file mode 100644 index 0000000..b10632c --- /dev/null +++ b/glew-1.5.1-makefile.patch @@ -0,0 +1,71 @@ +diff -up glew/config/Makefile.linux.org glew/config/Makefile.linux +--- glew/config/Makefile.linux.org 2008-11-03 07:25:20.000000000 +0100 ++++ glew/config/Makefile.linux 2008-11-13 19:38:43.000000000 +0100 +@@ -7,14 +7,8 @@ endif + PICFLAG = -fPIC + LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME) + M_ARCH ?= $(shell arch) +-ifeq (x86_64,${M_ARCH}) +-LDFLAGS.EXTRA = -L/usr/X11R6/lib64 +-LIBDIR = $(GLEW_DEST)/lib64 +-else +-LDFLAGS.EXTRA = -L/usr/X11R6/lib +-LIBDIR = $(GLEW_DEST)/lib +-endif +-LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11 ++LIBDIR = $(GLEW_DEST)$(libdir) ++LDFLAGS.GL = -lGL + LDFLAGS.STATIC = -Wl,-Bstatic + LDFLAGS.DYNAMIC = -Wl,-Bdynamic + NAME = GLEW +diff -up glew/Makefile.org glew/Makefile +--- glew/Makefile.org 2008-11-03 07:25:21.000000000 +0100 ++++ glew/Makefile 2008-11-13 19:39:41.000000000 +0100 +@@ -41,16 +41,16 @@ $(error "Platform '$(SYSTEM)' not suppor + endif + + GLEW_DEST ?= /usr +-BINDIR ?= $(GLEW_DEST)/bin +-LIBDIR ?= $(GLEW_DEST)/lib +-INCDIR ?= $(GLEW_DEST)/include/GL ++BINDIR ?= $(GLEW_DEST)$(bindir) ++LIBDIR ?= $(GLEW_DEST)$(libdir) ++INCDIR ?= $(GLEW_DEST)$(includedir)/GL + SHARED_OBJ_EXT ?= o + TARDIR = ../glew-$(GLEW_VERSION) + TARBALL = ../glew_$(GLEW_VERSION).tar.gz + + AR = ar + INSTALL = install +-STRIP = strip ++STRIP = true + RM = rm -f + LN = ln -sf + ifeq ($(MAKECMDGOALS), debug) +@@ -95,7 +95,7 @@ bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.SRCS + $(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.SRCS) $(BIN.LIBS) + + bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.SRCS) lib/$(LIB.SHARED) +- $(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.SRCS) $(BIN.LIBS) ++ $(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.SRCS) $(BIN.LIBS) -lGLU + + %.o: %.c + $(CC) -c $(CFLAGS) -o $@ $< +@@ -117,7 +117,7 @@ ifeq ($(patsubst mingw%,mingw,$(SYSTEM)) + $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/ + else + $(STRIP) -x lib/$(LIB.SHARED) +- $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/ ++ $(INSTALL) -m 0755 lib/$(LIB.SHARED) $(LIBDIR)/ + $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME) + endif + # development files +@@ -132,7 +132,7 @@ else + $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK) + endif + # utilities +- $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/ ++ $(INSTALL) -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/ + + uninstall: + $(RM) $(INCDIR)/wglew.h diff --git a/glew.spec b/glew.spec index fb3490b..e7187e0 100644 --- a/glew.spec +++ b/glew.spec @@ -1,20 +1,13 @@ Name: glew -Version: 1.5.0 -Release: 2%{?dist} +Version: 1.5.1 +Release: 1%{?dist} Summary: The OpenGL Extension Wrangler Library Group: System Environment/Libraries License: BSD and MIT URL: http://glew.sourceforge.net -# This is http://downloads.sourceforge.net/glew/glew-%{version}-src.tgz -# The files under the doc dir in this archive are under this non free license: -# Copyright (C) 2002-2008, Milan Ikits -# Copyright (C) 2002-2008, Marcelo E. Magallon -# This documentation may not be modified or redistributed in any -# form, except by the copyright holder. -# and therefor these files have been removed. -Source0: glew-%{version}-src-clean.tgz -Patch0: glew-1.3.6-pathandstrip.patch -Patch1: glew-1.4.0-unused-direct-shlib-dependency.patch + +Source0: http://downloads.sourceforge.net/glew/glew-%{version}-src.tgz +Patch0: glew-1.5.1-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libGLU-devel @@ -40,10 +33,11 @@ Development files for glew %prep %setup -q -n %{name} %patch0 -p1 -%patch1 -p1 +sed -i -e 's/\r//g' config/config.guess %build + make %{?_smp_mflags} CFLAGS.EXTRA="$RPM_OPT_FLAGS" @@ -73,9 +67,13 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %{_libdir}/libGLEW.so %{_includedir}/GL/*.h - +%doc doc/* %changelog +* Thu Nov 13 2008 Jochen Schmitt - 1.5.1-1 +- New upstream release (#469639) +- Fix licenseing issue with developer documentation + * Tue Feb 19 2008 Fedora Release Engineering - 1.5.0-2 - Autorebuild for GCC 4.3 diff --git a/sources b/sources index 7cffe28..66a6ad6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2920724f7a462fff84346b4de2c8aebe glew-1.5.0-src-clean.tgz +759a59853dfaae4d007b414a3c1712f2 glew-1.5.1-src.tgz