From a9d3d28c36b0058a2a3bb6b97403a49cabb4ed434eba4cf94a6d74f205d31e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 27 May 2014 18:08:33 +0000 Subject: [PATCH] Accepting request 235456 from home:fstrba Upgrade to glew-1.10.0 needed by upcoming libreoffice-4.3 OBS-URL: https://build.opensuse.org/request/show/235456 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/glew?expand=0&rev=35 --- glew-1.10.0-destdir.patch | 130 ++++++++++++++++++++++++++++++++++++++ glew-1.10.0.tgz | 3 + glew-1.9.0.tgz | 3 - glew.changes | 8 +++ glew.spec | 22 ++++--- 5 files changed, 153 insertions(+), 13 deletions(-) create mode 100644 glew-1.10.0-destdir.patch create mode 100644 glew-1.10.0.tgz delete mode 100644 glew-1.9.0.tgz diff --git a/glew-1.10.0-destdir.patch b/glew-1.10.0-destdir.patch new file mode 100644 index 0000000..6bc3845 --- /dev/null +++ b/glew-1.10.0-destdir.patch @@ -0,0 +1,130 @@ +--- glew-1.10.0/Makefile 2013-07-22 16:11:22.000000000 +0200 ++++ glew-1.10.0/Makefile 2014-05-26 21:43:14.091089329 +0200 +@@ -52,6 +52,8 @@ + + DIST_DIR := $(shell mktemp -d /tmp/glew.XXXXXX)/$(DIST_NAME) + ++DESTDIR ?= "" ++ + # To disable stripping of binaries either: + # - use STRIP= on gmake command-line + # - edit this makefile to set STRIP to the empty string +@@ -231,81 +233,81 @@ + install.mx: install.include install.lib.mx install.pkgconfig.mx + + install.lib: glew.lib +- $(INSTALL) -d -m 0755 $(LIBDIR) ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR) + # runtime + ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) +- $(INSTALL) -d -m 0755 $(BINDIR) +- $(INSTALL) -m 0755 lib/$(LIB.SHARED) $(BINDIR)/ ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 0755 lib/$(LIB.SHARED) $(DESTDIR)$(BINDIR)/ + else +- $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/ ++ $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(DESTDIR)$(LIBDIR)/ + endif + ifneq ($(LN),) +- $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME) ++ $(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.SONAME) + endif + + # development files + ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) +- $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/ ++ $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(DESTDIR)$(LIBDIR)/ + endif + ifneq ($(LN),) +- $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK) ++ $(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK) + endif +- $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/ ++ $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(DESTDIR)$(LIBDIR)/ + + install.lib.mx: glew.lib.mx +- $(INSTALL) -d -m 0755 $(LIBDIR) ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR) + # runtime + ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) +- $(INSTALL) -d -m 0755 $(BINDIR) +- $(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(BINDIR)/ ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(DESTDIR)$(BINDIR)/ + else +- $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(LIBDIR)/ ++ $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(DESTDIR)$(LIBDIR)/ + endif + ifneq ($(LN),) +- $(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.SONAME.MX) ++ $(LN) $(LIB.SHARED.MX) $(DESTDIR)$(LIBDIR)/$(LIB.SONAME.MX) + endif + # development files + ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) +- $(INSTALL) -m 0644 lib/$(LIB.DEVLNK.MX) $(LIBDIR)/ ++ $(INSTALL) -m 0644 lib/$(LIB.DEVLNK.MX) $(DESTDIR)$(LIBDIR)/ + endif + ifneq ($(LN),) +- $(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.DEVLNK.MX) ++ $(LN) $(LIB.SHARED.MX) $(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK.MX) + endif +- $(INSTALL) -m 0644 lib/$(LIB.STATIC.MX) $(LIBDIR)/ ++ $(INSTALL) -m 0644 lib/$(LIB.STATIC.MX) $(DESTDIR)$(LIBDIR)/ + + install.bin: glew.bin +- $(INSTALL) -d -m 0755 $(BINDIR) +- $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/ ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(BINDIR) ++ $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(DESTDIR)$(BINDIR)/ + + install.include: +- $(INSTALL) -d -m 0755 $(INCDIR) +- $(INSTALL) -m 0644 include/GL/wglew.h $(INCDIR)/ +- $(INSTALL) -m 0644 include/GL/glew.h $(INCDIR)/ +- $(INSTALL) -m 0644 include/GL/glxew.h $(INCDIR)/ ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(INCDIR) ++ $(INSTALL) -m 0644 include/GL/wglew.h $(DESTDIR)$(INCDIR)/ ++ $(INSTALL) -m 0644 include/GL/glew.h $(DESTDIR)$(INCDIR)/ ++ $(INSTALL) -m 0644 include/GL/glxew.h $(DESTDIR)$(INCDIR)/ + + install.pkgconfig: glew.pc +- $(INSTALL) -d -m 0755 $(LIBDIR) +- $(INSTALL) -d -m 0755 $(LIBDIR)/pkgconfig +- $(INSTALL) -m 0644 glew.pc $(LIBDIR)/pkgconfig/ ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR) ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR)/pkgconfig ++ $(INSTALL) -m 0644 glew.pc $(DESTDIR)$(LIBDIR)/pkgconfig/ + + install.pkgconfig.mx: glewmx.pc +- $(INSTALL) -d -m 0755 $(LIBDIR) +- $(INSTALL) -d -m 0755 $(LIBDIR)/pkgconfig +- $(INSTALL) -m 0644 glewmx.pc $(LIBDIR)/pkgconfig/ ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR) ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR)/pkgconfig ++ $(INSTALL) -m 0644 glewmx.pc $(DESTDIR)$(LIBDIR)/pkgconfig/ + + uninstall: +- $(RM) $(INCDIR)/wglew.h +- $(RM) $(INCDIR)/glew.h +- $(RM) $(INCDIR)/glxew.h +- $(RM) $(LIBDIR)/$(LIB.DEVLNK) $(LIBDIR)/$(LIB.DEVLNK.MX) ++ $(RM) $(DESTDIR)$(INCDIR)/wglew.h ++ $(RM) $(DESTDIR)$(INCDIR)/glew.h ++ $(RM) $(DESTDIR)$(INCDIR)/glxew.h ++ $(RM) $(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK) $(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK.MX) + ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) +- $(RM) $(BINDIR)/$(LIB.SHARED) $(BINDIR)/$(LIB.SHARED.MX) ++ $(RM) $(DESTDIR)$(BINDIR)/$(LIB.SHARED) $(DESTDIR)$(BINDIR)/$(LIB.SHARED.MX) + else +- $(RM) $(LIBDIR)/$(LIB.SONAME) $(LIBDIR)/$(LIB.SONAME.MX) +- $(RM) $(LIBDIR)/$(LIB.SHARED) $(LIBDIR)/$(LIB.SHARED.MX) ++ $(RM) $(DESTDIR)$(LIBDIR)/$(LIB.SONAME) $(DESTDIR)$(LIBDIR)/$(LIB.SONAME.MX) ++ $(RM) $(DESTDIR)$(LIBDIR)/$(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.SHARED.MX) + endif +- $(RM) $(LIBDIR)/$(LIB.STATIC) $(LIBDIR)/$(LIB.STATIC.MX) +- $(RM) $(BINDIR)/$(GLEWINFO.BIN) $(BINDIR)/$(VISUALINFO.BIN) ++ $(RM) $(DESTDIR)$(LIBDIR)/$(LIB.STATIC) $(DESTDIR)$(LIBDIR)/$(LIB.STATIC.MX) ++ $(RM) $(DESTDIR)$(BINDIR)/$(GLEWINFO.BIN) $(DESTDIR)$(BINDIR)/$(VISUALINFO.BIN) + + clean: + $(RM) -r tmp/ diff --git a/glew-1.10.0.tgz b/glew-1.10.0.tgz new file mode 100644 index 0000000..3fe9d96 --- /dev/null +++ b/glew-1.10.0.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99c41320b63f6860869b5fb9af9a1854b15582796c64ee3dfd7096dc0c89f307 +size 567605 diff --git a/glew-1.9.0.tgz b/glew-1.9.0.tgz deleted file mode 100644 index 070ff1f..0000000 --- a/glew-1.9.0.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9b36530e414c95d6624be9d6815a5be1531d1986300ae5903f16977ab8aeb787 -size 544440 diff --git a/glew.changes b/glew.changes index ffc10a9..6e1e998 100644 --- a/glew.changes +++ b/glew.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon May 26 19:44:23 UTC 2014 - fstrba@suse.com + +- Upgrade to upstream 0.10.0 +- New patch: + * glew-1.10.0-destdir.patch: Sanitize Makefile + - Add DESTDIR option to avoid buildroot in .pc files + ------------------------------------------------------------------- Wed Oct 24 22:38:00 UTC 2012 - thorstenb@flightgear.org diff --git a/glew.spec b/glew.spec index 037999a..5277294 100644 --- a/glew.spec +++ b/glew.spec @@ -1,7 +1,7 @@ # # spec file for package glew # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,10 +16,9 @@ # -%define so_ver 1_9 - +%define so_ver 1_10 Name: glew -Version: 1.9.0 +Version: 1.10.0 Release: 0 Summary: OpenGL Extension Wrangler Library License: BSD-3-Clause and GPL-2.0 and MIT @@ -28,6 +27,7 @@ Url: http://glew.sourceforge.net/ Source0: http://sourceforge.net/projects/glew/files/glew/%{version}/glew-%{version}.tgz Source1: baselibs.conf Source2: %{name}.rpmlintrc +Patch0: glew-1.10.0-destdir.patch BuildRequires: pkg-config BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(x11) @@ -58,14 +58,14 @@ functionality is exposed in a single header file. Summary: Development files for glew Group: Development/Libraries/C and C++ Requires: libGLEW%{so_ver} = %{version} -%if %suse_version >= 1220 -# X11/Xlib.h X11/Xutil.h -Requires: libX11-devel -%endif # X11/Xmd.h Requires: xorg-x11-proto-devel # Don't require GLU, because there is GLEW_NO_GLU option Recommends: pkgconfig(glu) +%if 0%{?suse_version} >= 1220 +# X11/Xlib.h X11/Xutil.h +Requires: libX11-devel +%endif %description devel The OpenGL Extension Wrangler Library (GLEW) is a cross-platform @@ -76,16 +76,18 @@ functionality is exposed in a single header file. %prep %setup -q +%patch0 -p1 %build -make %{?_smp_mflags} POPT="%{optflags}" LIBDIR=%{_libdir} LDFLAGS.EXTRA= STRIP= +make %{?_smp_mflags} POPT="%{optflags}" GLEW_DEST=%{_prefix} LIBDIR=%{_libdir} LDFLAGS.EXTRA= STRIP= %install -make GLEW_DEST=%{buildroot}%{_prefix} LIBDIR=%{buildroot}%{_libdir} install.all +make DESTDIR=%{buildroot} GLEW_DEST=%{_prefix} LIBDIR=%{_libdir} install.all chmod +x %{buildroot}%{_libdir}/*.so.* rm %{buildroot}%{_libdir}/*.a %post -n libGLEW%{so_ver} -p /sbin/ldconfig + %postun -n libGLEW%{so_ver} -p /sbin/ldconfig %files