[glew] glew 1.6.0

Adam Jackson ajax at fedoraproject.org
Mon Jun 20 19:13:20 UTC 2011 

commit fca1ffac668536a7d0357974e8592903cc274221
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Jun 20 15:13:09 2011 -0400

    glew 1.6.0

 .gitignore                                         |    1 +
 glew-1.5.8-soname.patch                            |   21 -----------
 ...5.8-makefile.patch => glew-1.6.0-makefile.patch |   36 ++++++++++----------
 glew.spec                                          |   29 +++++----------
 sources                                            |    1 +
 5 files changed, 30 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ad4dff6..c67d6b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ glew-1.5.4.tgz
 /glew-1.5.5.tgz
 /glew-1.5.7.tgz
 /glew-1.5.8.tgz
+/glew-1.6.0.tgz
diff --git a/glew-1.5.8-makefile.patch b/glew-1.6.0-makefile.patch
similarity index 59%
rename from glew-1.5.8-makefile.patch
rename to glew-1.6.0-makefile.patch
index b23215a..4643b14 100644
--- a/glew-1.5.8-makefile.patch
+++ b/glew-1.6.0-makefile.patch
@@ -1,9 +1,9 @@
-diff -up glew-1.5.5/config/Makefile.linux.make glew-1.5.5/config/Makefile.linux
---- glew-1.5.5/config/Makefile.linux.make	2010-07-13 12:36:44.000000000 -0400
-+++ glew-1.5.5/config/Makefile.linux	2010-08-25 16:24:05.000000000 -0400
-@@ -7,14 +7,8 @@ endif
+diff -up glew-1.6.0/config/Makefile.linux.jx glew-1.6.0/config/Makefile.linux
+--- glew-1.6.0/config/Makefile.linux.jx	2011-04-27 12:16:34.000000000 -0400
++++ glew-1.6.0/config/Makefile.linux	2011-06-20 13:21:38.144060270 -0400
+@@ -3,14 +3,8 @@ CC = cc
+ LD = cc
  PICFLAG = -fPIC
- LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME)
  M_ARCH ?= $(shell uname -m)
 -ifeq (x86_64,${M_ARCH})
 -LDFLAGS.EXTRA = -L/usr/X11R6/lib64
@@ -18,9 +18,9 @@ diff -up glew-1.5.5/config/Makefile.linux.make glew-1.5.5/config/Makefile.linux
  LDFLAGS.STATIC = -Wl,-Bstatic
  LDFLAGS.DYNAMIC = -Wl,-Bdynamic
  NAME = GLEW
-diff -up glew-1.5.5/Makefile.make glew-1.5.5/Makefile
---- glew-1.5.5/Makefile.make	2010-07-13 12:36:45.000000000 -0400
-+++ glew-1.5.5/Makefile	2010-08-25 16:25:27.000000000 -0400
+diff -up glew-1.6.0/Makefile.jx glew-1.6.0/Makefile
+--- glew-1.6.0/Makefile.jx	2011-04-27 12:16:35.000000000 -0400
++++ glew-1.6.0/Makefile	2011-06-20 13:23:05.090373848 -0400
 @@ -41,9 +41,9 @@ $(error "Platform '$(SYSTEM)' not suppor
  endif
  
@@ -32,9 +32,9 @@ diff -up glew-1.5.5/Makefile.make glew-1.5.5/Makefile
 +LIBDIR ?= $(GLEW_DEST)$(libdir)
 +INCDIR ?= $(GLEW_DEST)$(includedir)/GL
  SHARED_OBJ_EXT ?= o
+ 
  TARDIR = ../glew-$(GLEW_VERSION)
- TARBALL = ../glew-$(GLEW_VERSION).tar.gz
-@@ -55,7 +55,7 @@ DIST_SRC_TGZ = glew-$(GLEW_VERSION).tgz
+@@ -56,7 +56,7 @@ DIST_SRC_TGZ = glew-$(GLEW_VERSION).tgz
  
  AR = ar
  INSTALL = install
@@ -43,8 +43,8 @@ diff -up glew-1.5.5/Makefile.make glew-1.5.5/Makefile
  RM = rm -f
  LN = ln -sf
  ifeq ($(MAKECMDGOALS), debug)
-@@ -132,7 +132,7 @@ ifeq ($(patsubst mingw%,mingw,$(SYSTEM))
- 	$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/
+@@ -186,7 +186,7 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTE
+ 	$(INSTALL) -m 0755 lib/$(LIB.SHARED) $(BINDIR)/
  else
  	$(STRIP) -x lib/$(LIB.SHARED)
 -	$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
@@ -52,12 +52,12 @@ diff -up glew-1.5.5/Makefile.make glew-1.5.5/Makefile
  	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME)
  endif
  # development files
-@@ -148,7 +148,7 @@ else
- 	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
- endif
- # utilities
+@@ -221,7 +221,7 @@ endif
+ 
+ install.bin: glew.bin
+ 	$(INSTALL) -d -m 0755 $(BINDIR)
 -	$(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
+ install.include:
+ 	$(INSTALL) -d -m 0755 $(INCDIR)
diff --git a/glew.spec b/glew.spec
index 0322ba9..99040ae 100644
--- a/glew.spec
+++ b/glew.spec
@@ -1,20 +1,13 @@
 Name:           glew
-Version:        1.5.8
-Release:        3%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        The OpenGL Extension Wrangler Library
 Group:          System Environment/Libraries
 License:        BSD and MIT
 URL:            http://glew.sourceforge.net
 
 Source0:	http://downloads.sourceforge.net/project/glew/glew/%{version}/glew-%{version}.tgz
-Patch0:         glew-1.5.8-makefile.patch
-# From upstream: build MX-enabled library, with a different soname
-# http://glew.git.sourceforge.net/git/gitweb.cgi?p=glew/glew;a=commitdiff;h=18455eb40fe2d71f5f78cce0bf44eb302c224016
-# (rediffed for our makefile changes)
-Patch1:		glew-1.5.8-glewmx.patch
-# Fixes the soname of libGLEWmx, sent upstream
-Patch2:		glew-1.5.8-soname.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         glew-1.6.0-makefile.patch
 BuildRequires:  libGLU-devel
 
 %description
@@ -56,8 +49,6 @@ libGLEWmx
 %prep
 %setup -q
 %patch0 -p1 -b .make
-%patch1 -p1 -b .glewmx
-%patch2 -p1 -b .soname
 
 sed -i -e 's/\r//g' config/config.guess
 
@@ -65,23 +56,20 @@ sed -i -e 's/\r//g' config/config.guess
 
 make %{?_smp_mflags} CFLAGS.EXTRA="$RPM_OPT_FLAGS" includedir=%{_includedir} GLEW_DEST= libdir=%{_libdir} bindir=%{_bindir}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
-make install.all GLEW_DEST="$RPM_BUILD_ROOT" libdir=%{_libdir} bindir=%{_bindir} \
-  includedir=%{_includedir}
-rm $RPM_BUILD_ROOT%{_libdir}/libGLEW.a $RPM_BUILD_ROOT%{_libdir}/libGLEWmx.a
-
+make install.all GLEW_DEST="$RPM_BUILD_ROOT" libdir=%{_libdir} bindir=%{_bindir} includedir=%{_includedir}
+rm -f $RPM_BUILD_ROOT%{_libdir}/libGLEW.a $RPM_BUILD_ROOT%{_libdir}/libGLEWmx.a
+# sigh
+chmod 0755 $RPM_BUILD_ROOT%{_libdir}/*.so*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-
 %files
 %defattr(-,root,root,-)
 %doc LICENSE.txt
@@ -107,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/*
 
 %changelog
+* Mon Jun 20 2011 Adam Jackson <ajax at redhat.com> 1.6.0-1
+- glew 1.6.0 (#714763)
+
 * Wed Mar 23 2011 Adam Williamson <awilliam at redhat.com> - 1.5.8-3
 - instead of taking flags out in makefile.patch and adding them back
   in add-needed.patch, let's just not take them out...
diff --git a/sources b/sources
index 060841f..1d01090 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 342c8dc64fb9daa6af245b132e086bdd  glew-1.5.8.tgz
+7dfbb444b5a4e125bc5dba0aef403082  glew-1.6.0.tgz

More information about the scm-commits mailing list