rpms/glew/F-10 glew-1.5.1-makefile.patch, NONE, 1.1 glew.spec, 1.4, 1.5 sources, 1.3, 1.4 glew-1.3.6-pathandstrip.patch, 1.2, NONE glew-1.4.0-unused-direct-shlib-dependency.patch, 1.1, NONE

Mon Nov 24 19:28:45 UTC 2008

Author: s4504kr

Update of /cvs/extras/rpms/glew/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18719

Modified Files:
	glew.spec sources 
Added Files:
	glew-1.5.1-makefile.patch 
Removed Files:
	glew-1.3.6-pathandstrip.patch 
	glew-1.4.0-unused-direct-shlib-dependency.patch 
Log Message:
New upstream release

glew-1.5.1-makefile.patch:

--- NEW FILE glew-1.5.1-makefile.patch ---
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


Index: glew.spec
===================================================================
RCS file: /cvs/extras/rpms/glew/F-10/glew.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glew.spec	19 Feb 2008 08:27:58 -0000	1.4
+++ glew.spec	24 Nov 2008 19:28:14 -0000	1.5
@@ -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 <milan ikits[]ieee org>
-#  Copyright (C) 2002-2008, Marcelo E. Magallon <mmagallo[]debian org>
-#  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 @@
 %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 @@
 %defattr(-,root,root,-)
 %{_libdir}/libGLEW.so
 %{_includedir}/GL/*.h
-
+%doc doc/*
 
 %changelog
+* Thu Nov 13 2008 Jochen Schmitt <Jochen herr-schmitt de> - 1.5.1-1
+- New upstream release (#469639)
+- Fix licenseing issue with developer documentation
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.5.0-2
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glew/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Jan 2008 11:12:51 -0000	1.3
+++ sources	24 Nov 2008 19:28:15 -0000	1.4
@@ -1 +1 @@
-2920724f7a462fff84346b4de2c8aebe  glew-1.5.0-src-clean.tgz
+759a59853dfaae4d007b414a3c1712f2  glew-1.5.1-src.tgz


--- glew-1.3.6-pathandstrip.patch DELETED ---


--- glew-1.4.0-unused-direct-shlib-dependency.patch DELETED ---


