rpms/glew/EL-6 glew-1.5.2-add-needed.patch, NONE, 1.1 glew-1.5.2-makefile.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.4, 1.5 glew.spec, 1.7, 1.8 sources, 1.4, 1.5 glew-1.5.1-makefile.patch, 1.1, NONE

Orion Poplawski orion at fedoraproject.org
Thu Jul 1 18:00:33 UTC 2010 

Author: orion

Update of /cvs/pkgs/rpms/glew/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28773/EL-6

Modified Files:
	.cvsignore glew.spec sources 
Added Files:
	glew-1.5.2-add-needed.patch glew-1.5.2-makefile.patch 
	import.log 
Removed Files:
	glew-1.5.1-makefile.patch 
Log Message:
Update to 1.5.4 from devel

glew-1.5.2-add-needed.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE glew-1.5.2-add-needed.patch ---
diff -up glew-1.5.4/Makefile.add glew-1.5.4/Makefile
--- glew-1.5.4/Makefile.add	2010-05-29 17:53:22.000000000 +1000
+++ glew-1.5.4/Makefile	2010-05-29 17:53:27.000000000 +1000
@@ -78,7 +78,7 @@ GLEWINFO.BIN.OBJS = $(GLEWINFO.BIN.SRCS:
 VISUALINFO.BIN = visualinfo$(BIN.SUFFIX)
 VISUALINFO.BIN.SRCS = src/visualinfo.c
 VISUALINFO.BIN.OBJS = $(VISUALINFO.BIN.SRCS:.c=.o)
-BIN.LIBS = -Llib $(LDFLAGS.DYNAMIC) -l$(NAME) $(LDFLAGS.EXTRA) $(LDFLAGS.GL)
+BIN.LIBS = -Llib $(LDFLAGS.DYNAMIC) -l$(NAME) $(LDFLAGS.EXTRA) $(LDFLAGS.GL) -lX11
 
 all debug: lib/$(LIB.SHARED) lib/$(LIB.STATIC) bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) glew.pc
 

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

--- NEW FILE glew-1.5.2-makefile.patch ---
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
@@ -7,14 +7,8 @@ endif
 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
-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-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
@@ -41,9 +41,9 @@ $(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
@@ -55,7 +55,7 @@ DIST_SRC_TGZ = glew-$(GLEW_VERSION).tgz
 
 AR = ar
 INSTALL = install
-STRIP = strip
+STRIP = true
 RM = rm -f
 LN = ln -sf
 ifeq ($(MAKECMDGOALS), debug)
@@ -100,7 +100,7 @@ bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJS
 	$(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJS) $(BIN.LIBS)
 
 bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.OBJS) lib/$(LIB.SHARED)
-	$(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.OBJS) $(BIN.LIBS)
+	$(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.OBJS) $(BIN.LIBS) -lGLU
 
 %.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)
 	$(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
@@ -147,7 +148,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_4-1_fc14:EL-6:glew-1.5.4-1.fc14.src.rpm:1278007165


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glew/EL-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	24 Nov 2008 19:06:48 -0000	1.4
+++ .cvsignore	1 Jul 2010 18:00:33 -0000	1.5
@@ -1 +1 @@
-glew-1.5.1-src.tgz
+glew-1.5.4.tgz


Index: glew.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glew/EL-6/glew.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- glew.spec	25 Jul 2009 00:18:57 -0000	1.7
+++ glew.spec	1 Jul 2010 18:00:33 -0000	1.8
@@ -1,13 +1,14 @@
 Name:           glew
-Version:        1.5.1
-Release:        3%{?dist}
+Version:        1.5.4
+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/glew/glew-%{version}-src.tgz
-Patch0:         glew-1.5.1-makefile.patch
+Source0:	http://downloads.sourceforge.net/project/glew/glew/%{version}/glew-%{version}.tgz
+Patch0:         glew-1.5.2-makefile.patch
+Patch1:		glew-1.5.2-add-needed.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libGLU-devel
 
@@ -31,8 +32,9 @@ Development files for glew
 
 
 %prep
-%setup -q -n %{name}
-%patch0 -p1
+%setup -q
+%patch0 -p1 -b .make
+%patch1 -p1 -b .add
 
 sed -i -e 's/\r//g' config/config.guess
 
@@ -66,10 +68,20 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libGLEW.so
+%{_libdir}/pkgconfig/glew.pc
 %{_includedir}/GL/*.h
 %doc doc/*
 
 %changelog
+* Sat May 29 2010 Dave Airlie <airlied at redhat.com> 1.5.4-1
+- glew 1.5.4 - add glew.pc
+
+* Tue Feb 09 2010 Adam Jackson <ajax at redhat.com> 1.5.2-2
+- glew-1.5.2-add-needed.patch: Fix FTBFS from --no-add-needed
+
+* Tue Feb 02 2010 Adam Jackson <ajax at redhat.com> 1.5.2-1
+- glew 1.5.2
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glew/EL-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	24 Nov 2008 19:06:48 -0000	1.4
+++ sources	1 Jul 2010 18:00:33 -0000	1.5
@@ -1 +1 @@
-759a59853dfaae4d007b414a3c1712f2  glew-1.5.1-src.tgz
+492ddb502d7db58924a6fcb244ad4be4  glew-1.5.4.tgz


--- glew-1.5.1-makefile.patch DELETED ---

More information about the scm-commits mailing list