rpms/glew/devel .cvsignore, 1.2, 1.3 glew-1.3.6-pathandstrip.patch, 1.1, 1.2 glew.spec, 1.2, 1.3 sources, 1.2, 1.3 LICENSE-README.fedora, 1.1, NONE glew-1.4.0-GL_FLOAT_MATXxX.patch, 1.1, NONE glew-1.4.0-auto-make.patch, 1.1, NONE glew-1.4.0-license-doc.patch, 1.1, NONE

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Tue Jan 22 11:13:34 UTC 2008


Author: jwrdegoede

Update of /cvs/extras/rpms/glew/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4743

Modified Files:
	.cvsignore glew-1.3.6-pathandstrip.patch glew.spec sources 
Removed Files:
	LICENSE-README.fedora glew-1.4.0-GL_FLOAT_MATXxX.patch 
	glew-1.4.0-auto-make.patch glew-1.4.0-license-doc.patch 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glew/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Aug 2007 06:22:05 -0000	1.2
+++ .cvsignore	22 Jan 2008 11:12:51 -0000	1.3
@@ -1,2 +1 @@
-glew-1.4.0-src-clean.tgz
-glew-mesa-replacement-headers.tgz
+glew-1.5.0-src-clean.tgz

glew-1.3.6-pathandstrip.patch:

Index: glew-1.3.6-pathandstrip.patch
===================================================================
RCS file: /cvs/extras/rpms/glew/devel/glew-1.3.6-pathandstrip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glew-1.3.6-pathandstrip.patch	19 Aug 2007 06:22:05 -0000	1.1
+++ glew-1.3.6-pathandstrip.patch	22 Jan 2008 11:12:51 -0000	1.2
@@ -1,6 +1,7 @@
---- glew/Makefile.orig	2007-03-02 16:56:00.000000000 +0000
-+++ glew/Makefile	2007-03-04 19:56:19.000000000 +0000
-@@ -41,9 +41,9 @@
+diff -up glew/Makefile.orig glew/Makefile
+--- glew/Makefile.orig	2007-12-28 04:05:25.000000000 +0100
++++ glew/Makefile	2008-01-21 20:30:35.000000000 +0100
+@@ -41,16 +41,16 @@ $(error "Platform '$(SYSTEM)' not suppor
  endif
  
  GLEW_DEST ?= /usr
@@ -13,33 +14,32 @@
  SHARED_OBJ_EXT ?= o
  TARDIR = ../glew-$(GLEW_VERSION)
  TARBALL = ../glew_$(GLEW_VERSION).tar.gz
-@@ -57,7 +57,7 @@
- STRIP =
+ 
+ AR = ar
+ INSTALL = install
+-STRIP = strip
++STRIP = true
+ RM = rm -f
+ LN = ln -sf
+ ifeq ($(MAKECMDGOALS), debug)
+@@ -117,7 +117,7 @@ ifeq ($(patsubst mingw%,mingw,$(SYSTEM))
+ 	$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/
  else
- OPT = $(POPT)
--STRIP = -s
-+STRIP = 
- endif
- INCLUDE = -Iinclude
- CFLAGS = $(OPT) $(WARN) $(INCLUDE) $(CFLAGS.EXTRA)
-@@ -121,7 +121,7 @@
- 	$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
- 	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME)
-   else
--	$(INSTALL) $(STRIP) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
-+	$(INSTALL) $(STRIP) -m 0755 lib/$(LIB.SHARED) $(LIBDIR)/
+ 	$(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
  endif
-@@ -137,7 +137,7 @@
- 	$(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/
+ # development files
+@@ -132,7 +132,7 @@ else
  	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
-   else
--	$(INSTALL) $(STRIP) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/
-+	$(INSTALL) $(STRIP) -m 0755 lib/$(LIB.STATIC) $(LIBDIR)/
- 	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
-   endif
  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
 --- glew/config/Makefile.linux.orig	2007-03-01 06:49:21.000000000 +0000
 +++ glew/config/Makefile.linux	2007-03-04 19:38:17.000000000 +0000
 @@ -9,10 +9,10 @@


Index: glew.spec
===================================================================
RCS file: /cvs/extras/rpms/glew/devel/glew.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glew.spec	12 Jan 2008 20:58:10 -0000	1.2
+++ glew.spec	22 Jan 2008 11:12:51 -0000	1.3
@@ -1,27 +1,20 @@
 Name:           glew
-Version:        1.4.0
-Release:        4%{?dist}
+Version:        1.5.0
+Release:        1%{?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
+# 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
-# 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
-Patch4:         glew-1.4.0-GL_FLOAT_MATXxX.patch
+Patch1:         glew-1.4.0-unused-direct-shlib-dependency.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libGLU-devel
 
@@ -45,20 +38,9 @@
 
 
 %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
-# This is a patch to the autogenerated include/GL/glew.h file, so don't apply
-# before that file is generated. I have no clue why these defines do not get
-# properly added by the generation process, but they don't.
-%patch4 -p1
 
 
 %build
@@ -83,18 +65,22 @@
 
 %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
 
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glew/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Aug 2007 06:22:05 -0000	1.2
+++ sources	22 Jan 2008 11:12:51 -0000	1.3
@@ -1,2 +1 @@
-c8b8f2db1b68886baf6c0849807884b4  glew-1.4.0-src-clean.tgz
-211daf41c394153f3d989195898145a6  glew-mesa-replacement-headers.tgz
+2920724f7a462fff84346b4de2c8aebe  glew-1.5.0-src-clean.tgz


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


--- glew-1.4.0-GL_FLOAT_MATXxX.patch DELETED ---


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


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




More information about the fedora-extras-commits mailing list