[glew/el6/master] Sync form devel

[Orion Poplawski]

commit 35910799550deb6c67de1df5a4275e74f1f23ad8
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Oct 5 14:17:10 2010 -0600

    Sync form devel

 .gitignore                |    1 +
 glew-1.5.2-makefile.patch |   23 ++++++++---------------
 glew.spec                 |   10 ++++++++--
 sources                   |    2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4e9f4f2..deffd3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 glew-1.5.4.tgz
+/glew-1.5.5.tgz
diff --git a/glew-1.5.2-makefile.patch b/glew-1.5.2-makefile.patch
index dc8a48d..98cacde 100644
--- a/glew-1.5.2-makefile.patch
+++ b/glew-1.5.2-makefile.patch
@@ -1,6 +1,6 @@
-diff -up glew-1.5.4/config/Makefile.linux.make glew-1.5.4/config/Makefile.linux
---- glew-1.5.4/config/Makefile.linux.make	2010-04-28 08:16:36.000000000 +1000
-+++ glew-1.5.4/config/Makefile.linux	2010-05-29 18:12:26.000000000 +1000
+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
  PICFLAG = -fPIC
  LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME)
@@ -18,9 +18,9 @@ diff -up glew-1.5.4/config/Makefile.linux.make glew-1.5.4/config/Makefile.linux
  LDFLAGS.STATIC = -Wl,-Bstatic
  LDFLAGS.DYNAMIC = -Wl,-Bdynamic
  NAME = GLEW
-diff -up glew-1.5.4/Makefile.make glew-1.5.4/Makefile
---- glew-1.5.4/Makefile.make	2010-04-28 08:16:36.000000000 +1000
-+++ glew-1.5.4/Makefile	2010-05-29 18:19:11.000000000 +1000
+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
 @@ -41,9 +41,9 @@ $(error "Platform '$(SYSTEM)' not suppor
  endif
  
@@ -52,14 +52,7 @@ diff -up glew-1.5.4/Makefile.make glew-1.5.4/Makefile
  
  %.o: %.c
  	$(CC) -c $(CFLAGS) -o $@ $<
-@@ -125,13 +125,14 @@ install: all
- 	$(INSTALL) -d -m 0755 $(BINDIR)
- 	$(INSTALL) -d -m 0755 $(INCDIR)
- 	$(INSTALL) -d -m 0755 $(LIBDIR)
-+	$(INSTALL) -d -m 0755 $(LIBDIR)/pkgconfig
- # runtime
- ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
- 	$(STRIP) -x lib/$(LIB.SHARED)
+@@ -132,7 +132,7 @@ ifeq ($(patsubst mingw%,mingw,$(SYSTEM))
  	$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/
  else
  	$(STRIP) -x lib/$(LIB.SHARED)
@@ -68,7 +61,7 @@ diff -up glew-1.5.4/Makefile.make glew-1.5.4/Makefile
  	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME)
  endif
  # development files
-@@ -147,7 +148,7 @@ else
+@@ -148,7 +148,7 @@ else
  	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
  endif
  # utilities
diff --git a/glew.spec b/glew.spec
index ee54c1d..72a267b 100644
--- a/glew.spec
+++ b/glew.spec
@@ -1,5 +1,5 @@
 Name:           glew
-Version:        1.5.4
+Version:        1.5.5
 Release:        1%{?dist}
 Summary:        The OpenGL Extension Wrangler Library
 Group:          System Environment/Libraries
@@ -40,7 +40,7 @@ sed -i -e 's/\r//g' config/config.guess
 
 %build
 
-make %{?_smp_mflags} CFLAGS.EXTRA="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} CFLAGS.EXTRA="$RPM_OPT_FLAGS" includedir=%{_includedir} GLEW_DEST= libdir=%{_libdir} bindir=%{_bindir}
 
 
 %install
@@ -73,6 +73,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/*
 
 %changelog
+* Wed Aug 25 2010 Adam Jackson <ajax at redhat.com> 1.5.5-1
+- glew 1.5.5
+
+* Fri Jul 30 2010 Dave Airlie <airlied at redhat.com> 1.5.4-2
+- fix glew.pc file as pointed out by David Aguilar
+
 * Sat May 29 2010 Dave Airlie <airlied at redhat.com> 1.5.4-1
 - glew 1.5.4 - add glew.pc
 
diff --git a/sources b/sources
index 596ba62..6d95d18 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-492ddb502d7db58924a6fcb244ad4be4  glew-1.5.4.tgz
+3621f27cfd3e33d5dbcc1111ecb5b762  glew-1.5.5.tgz