rpms/glew/EL-5 glew-1.5.1-makefile.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 glew.spec, 1.1, 1.2 sources, 1.2, 1.3 LICENSE-README.fedora, 1.1, NONE glew-1.3.6-pathandstrip.patch, 1.1, NONE glew-1.4.0-auto-make.patch, 1.1, NONE glew-1.4.0-license-doc.patch, 1.1, NONE glew-1.4.0-unused-direct-shlib-dependency.patch, 1.1, NONE

Fri Sep 4 20:34:34 UTC 2009

Author: orion

Update of /cvs/pkgs/rpms/glew/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29933/EL-5

Modified Files:
	.cvsignore glew.spec sources 
Added Files:
	glew-1.5.1-makefile.patch import.log 
Removed Files:
	LICENSE-README.fedora glew-1.3.6-pathandstrip.patch 
	glew-1.4.0-auto-make.patch glew-1.4.0-license-doc.patch 
	glew-1.4.0-unused-direct-shlib-dependency.patch 
Log Message:
Update to 1.5.1 - sync from devel

glew-1.5.1-makefile.patch:
 Makefile              |   14 +++++++-------
 config/Makefile.linux |   10 ++--------
 2 files changed, 9 insertions(+), 15 deletions(-)

--- 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


--- NEW FILE import.log ---
glew-1_5_1-3_fc12:EL-5:glew-1.5.1-3.fc12.src.rpm:1252096280


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glew/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Aug 2007 06:30:25 -0000	1.2
+++ .cvsignore	4 Sep 2009 20:34:33 -0000	1.3
@@ -1,2 +1 @@
-glew-1.4.0-src-clean.tgz
-glew-mesa-replacement-headers.tgz
+glew-1.5.1-src.tgz


Index: glew.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glew/EL-5/glew.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- glew.spec	19 Aug 2007 06:30:25 -0000	1.1
+++ glew.spec	4 Sep 2009 20:34:34 -0000	1.2
@@ -1,26 +1,13 @@
 Name:           glew
-Version:        1.4.0
+Version:        1.5.1
 Release:        3%{?dist}
 Summary:        The OpenGL Extension Wrangler Library
 Group:          System Environment/Libraries
-License:        BSD
+License:        BSD and MIT
 URL:            http://glew.sourceforge.net
-# This is http://downloads.sourceforge.net/glew/glew-%{version}-src.tgz
-# With the following files removed because they are subject to the
-# "SGI Free Software License B" resp "GLX Public License" :
-# include/GL/glew.h include/GL/glxew.h auto/src/glew_head.h
-# auto/src/glxew_head.h auto/src/sgi_license.h auto/src/glx_license.h
-# doc/sgi.txt doc/glx.txt
-Source0:        glew-%{version}-src-clean.tgz
-# These are modified headers from Mesa, with all post GL[x] 1.1 defines and
-# prototypes removed, these replace the removed encumbered auto/src/glew_head.h
-# and auto/src/glxew_head.h files
-Source1:        glew-mesa-replacement-headers.tgz
-Source2:        LICENSE-README.fedora
-Patch0:         glew-1.3.6-pathandstrip.patch
-Patch1:         glew-1.4.0-auto-make.patch
-Patch2:         glew-1.4.0-unused-direct-shlib-dependency.patch
-Patch3:         glew-1.4.0-license-doc.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
 
@@ -44,19 +31,13 @@ Development files for glew
 
 
 %prep
-%setup -q -a 1 -n %{name}
+%setup -q -n %{name}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-cp %{SOURCE2} .
-mkdir auto/registry
-touch auto/registry/.dummy auto/extensions/.dummy
-make -C auto ../include/GL/glew.h
-make -C auto ../include/GL/glxew.h
 
+sed -i -e 's/\r//g' config/config.guess
 
 %build
+
 make %{?_smp_mflags} CFLAGS.EXTRA="$RPM_OPT_FLAGS"
 
 
@@ -78,18 +59,38 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE-README.fedora
+%doc LICENSE.txt
 %{_bindir}/*
 %{_libdir}/libGLEW.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc doc/*
 %{_libdir}/libGLEW.so
 %{_includedir}/GL/*.h
-
+%doc doc/*
 
 %changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* 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
+
+* Mon Jan 21 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.5.0-1
+- New upstream version, now SGI licensed stuff free out of the box!
+- Unfortunately some of the included docs are under a non free license,
+  therefor this package is based on a modified tarbal with these files removed
+
+* Sat Jan 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.0-4
+- Add missing GL_FLOAT_MATXxX defines
+
 * Sat Aug 18 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.0-3
 - Fix multiple unused direct shlib dependencies in libGLEW.so
 - Remove the "SGI Free Software License B" and "GLX Public License" tekst from


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glew/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Aug 2007 06:30:25 -0000	1.2
+++ sources	4 Sep 2009 20:34:34 -0000	1.3
@@ -1,2 +1 @@
-c8b8f2db1b68886baf6c0849807884b4  glew-1.4.0-src-clean.tgz
-211daf41c394153f3d989195898145a6  glew-mesa-replacement-headers.tgz
+759a59853dfaae4d007b414a3c1712f2  glew-1.5.1-src.tgz


--- LICENSE-README.fedora DELETED ---


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


--- glew-1.4.0-auto-make.patch DELETED ---


--- glew-1.4.0-license-doc.patch DELETED ---


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


