diff --git a/0001-Add-glew.c-glewinfo.c-and-includes.patch.bz2 b/0001-Add-glew.c-glewinfo.c-and-includes.patch.bz2 index 595d44e..919c9aa 100644 --- a/0001-Add-glew.c-glewinfo.c-and-includes.patch.bz2 +++ b/0001-Add-glew.c-glewinfo.c-and-includes.patch.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9deb2e9dbbcafaacf0faee2da0c149060b31dd1358dd33cca8f191a6aa4a55db -size 238046 +oid sha256:b92214aec969ccd305bd14af454ac34f146beb14f05f847095892c1199092039 +size 206328 diff --git a/es_branch.diff.bz2 b/es_branch.diff.bz2 deleted file mode 100644 index c706287..0000000 --- a/es_branch.diff.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f28f61dceceb52f339c684d1fbf58a46142f4a43a3fb020fa47ce0c14c3519b -size 35809 diff --git a/glew.changes b/glew.changes index f008a16..e54ef3d 100644 --- a/glew.changes +++ b/glew.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 28 17:51:57 UTC 2011 - johannesobermayr@gmx.de + +- Do not merge es branch for now + * Fixes bnc #732438, #738519 + * Issue reported upstream + ------------------------------------------------------------------- Sun Nov 13 14:16:19 UTC 2011 - johannesobermayr@gmx.de diff --git a/glew.spec b/glew.spec index 0cd33a0..22af5c3 100644 --- a/glew.spec +++ b/glew.spec @@ -18,7 +18,7 @@ Name: glew -Version: 1.7.0.git20111104.1441 +Version: 1.7.0.git20111123.2145 Release: 1 License: BSD-3-Clause and GPL-2.0 and MIT Summary: OpenGL Extension Wrangler Library @@ -28,7 +28,6 @@ Source0: %name.tar.bz2 Source1: baselibs.conf Patch: 0001-Add-glew.c-glewinfo.c-and-includes.patch.bz2 Patch1: dont-strip.diff -Patch2: es_branch.diff.bz2 BuildRequires: Mesa-devel BuildRequires: pkg-config Requires: libGLEW1_7 >= %version @@ -67,7 +66,6 @@ functionality is exposed in a single header file. %prep %setup -q -n %name -%patch2 -p1 %patch1 -p1 %patch -p1 diff --git a/glew.tar.bz2 b/glew.tar.bz2 index af54374..bb3914b 100644 --- a/glew.tar.bz2 +++ b/glew.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f21459dda45a63635dd4a0f25ae434aa1ef6fb096172c97aa46d868b12393dff -size 119351 +oid sha256:4bc507537f55db0712bf296a2b54f48221d892f562f54f61c62ffa8551d278c9 +size 119382