From cee87cdec2f1f424e97c76a2dcbe2d9482b2cfee871532fa3d9da223d14cd549 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Mon, 1 Oct 2012 08:31:11 +0000 Subject: [PATCH] Accepting request 135748 from home:etamPL:branches:multimedia:libs update to latest stable 1.9.0 OBS-URL: https://build.opensuse.org/request/show/135748 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/glew?expand=0&rev=30 --- ...d-glew.c-glewinfo.c-and-includes.patch.bz2 | 3 -- baselibs.conf | 3 +- glew-1.9.0.tgz | 3 ++ glew.changes | 11 +++++ glew.rpmlintrc | 2 + glew.spec | 45 +++++++++---------- glew.tar.bz2 | 3 -- 7 files changed, 40 insertions(+), 30 deletions(-) delete mode 100644 0001-Add-glew.c-glewinfo.c-and-includes.patch.bz2 create mode 100644 glew-1.9.0.tgz create mode 100644 glew.rpmlintrc delete mode 100644 glew.tar.bz2 diff --git a/0001-Add-glew.c-glewinfo.c-and-includes.patch.bz2 b/0001-Add-glew.c-glewinfo.c-and-includes.patch.bz2 deleted file mode 100644 index 8f594d2..0000000 --- a/0001-Add-glew.c-glewinfo.c-and-includes.patch.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a053aae3cb66983fbf8f4895f66bdd723661bc32e07b75618e71ae373f09ce0a -size 182468 diff --git a/baselibs.conf b/baselibs.conf index 11afdfa..92a3fbc 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,3 @@ glew -libGLEW1_7 +glew-devel +libGLEW1_9 diff --git a/glew-1.9.0.tgz b/glew-1.9.0.tgz new file mode 100644 index 0000000..070ff1f --- /dev/null +++ b/glew-1.9.0.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b36530e414c95d6624be9d6815a5be1531d1986300ae5903f16977ab8aeb787 +size 544440 diff --git a/glew.changes b/glew.changes index d54db6a..75c2bf4 100644 --- a/glew.changes +++ b/glew.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Sep 24 22:46:35 UTC 2012 - adam@mizerski.pl + +- update to latest stable 1.9.0 + - removed 0001-Add-glew.c-glewinfo.c-and-includes.patch.bz2. + These files are included in tarball. +- Changed explicit glu dependency, to recommendation. There is + GLEW_NO_GLU option. +- added glew-devel to baselibs.conf +- spec cleanup + ------------------------------------------------------------------- Tue Sep 18 13:40:47 UTC 2012 - idonmez@suse.com diff --git a/glew.rpmlintrc b/glew.rpmlintrc new file mode 100644 index 0000000..48f34b7 --- /dev/null +++ b/glew.rpmlintrc @@ -0,0 +1,2 @@ +# because it's called libGLEW* +addFilter("no-dependency-on glew.*/glew-libs/libglew.*") diff --git a/glew.spec b/glew.spec index d58d15e..c1a7988 100644 --- a/glew.spec +++ b/glew.spec @@ -16,22 +16,24 @@ # +%define so_ver 1_9 + Name: glew -Version: 1.7.0.git20120216.1819 +Version: 1.9.0 Release: 0 Summary: OpenGL Extension Wrangler Library License: BSD-3-Clause and GPL-2.0 and MIT Group: System/Libraries Url: http://glew.sourceforge.net/ -Source0: %name.tar.bz2 +Source0: http://sourceforge.net/projects/glew/files/glew/%{version}/glew-%{version}.tgz Source1: baselibs.conf -Patch: 0001-Add-glew.c-glewinfo.c-and-includes.patch.bz2 -BuildRequires: Mesa-devel +Source2: %{name}.rpmlintrc BuildRequires: pkg-config -BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xmu) -Requires: libGLEW1_7 >= %version BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -41,11 +43,11 @@ run-time mechanisms for determining which OpenGL extensions are supported on the target platform. OpenGL core and extension functionality is exposed in a single header file. -%package -n libGLEW1_7 +%package -n libGLEW%{so_ver} Summary: OpenGL Extension Wrangler Library Group: System/Libraries -%description -n libGLEW1_7 +%description -n libGLEW%{so_ver} The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library. GLEW provides efficient run-time mechanisms for determining which OpenGL extensions are @@ -55,10 +57,13 @@ functionality is exposed in a single header file. %package devel Summary: Development files for glew Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} -Requires: Mesa-devel -# glew.h includes GL/glu.h and glew.pc is incomplete --cartman -Requires: pkgconfig(glu) +Requires: libGLEW%{so_ver} = %{version} +# X11/Xlib.h X11/Xutil.h +Requires: libX11-devel +# X11/Xmd.h +Requires: xorg-x11-proto-devel +# Don't require GLU, because there is GLEW_NO_GLU option +Recommends: pkgconfig(glu) %description devel The OpenGL Extension Wrangler Library (GLEW) is a cross-platform @@ -68,31 +73,25 @@ supported on the target platform. OpenGL core and extension functionality is exposed in a single header file. %prep -%setup -q -n %name -%patch -p1 +%setup -q %build make %{?_smp_mflags} POPT="%{optflags}" LIBDIR=%{_libdir} LDFLAGS.EXTRA= STRIP= %install -export PATH=$PWD:$PATH make GLEW_DEST=%{buildroot}%{_prefix} LIBDIR=%{buildroot}%{_libdir} install.all chmod +x %{buildroot}%{_libdir}/*.so.* -%{__rm} -f %{buildroot}%{_libdir}/*.*a +rm %{buildroot}%{_libdir}/*.a -%clean -rm -rf %{buildroot} - -%post -n libGLEW1_7 -p /sbin/ldconfig - -%postun -n libGLEW1_7 -p /sbin/ldconfig +%post -n libGLEW%{so_ver} -p /sbin/ldconfig +%postun -n libGLEW%{so_ver} -p /sbin/ldconfig %files %defattr(-,root,root) %doc doc/* %{_bindir}/*info -%files -n libGLEW1_7 +%files -n libGLEW%{so_ver} %defattr(-,root,root) %{_libdir}/*.so.* diff --git a/glew.tar.bz2 b/glew.tar.bz2 deleted file mode 100644 index 212c7b5..0000000 --- a/glew.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:feaabc14f4bb846028ef0bb41b810c776b35a2e03d594ac333bc9327af0711b3 -size 119576