Browse Source

fix to build on Vine6

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7660 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 11 years ago
parent
commit
40d0c9eae5
1 changed files with 9 additions and 2 deletions
  1. 9 2
      g/gtkglext/gtkglext-vl.spec

+ 9 - 2
g/gtkglext/gtkglext-vl.spec

@@ -3,7 +3,7 @@ Summary: GtkGLExt is an OpenGL extension to GTK+ 2.0 or later.
 Summary(ja): GTK+ 2.0 以降の OpenGL 拡張
 Name: gtkglext
 Version: 1.2.0
-Release: 6%{?_dist_release}
+Release: 7%{?_dist_release}
 License: LGPL
 Group: System Environment/Libraries
 Source: %{name}-%{version}.tar.bz2
@@ -12,12 +12,14 @@ Patch0:		gtkglext-1.2.0-bz677457.diff
 Patch1:		gtkglext-1.2.0-pangox-compat.patch
 URL: http://gtkglext.sourceforge.net/
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtk2-devel
 BuildRequires: xorg-x11-devel
 BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
+%if "%{_dist_release}" >= "vl7"
 BuildRequires: pangox-compat-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+%endif
 
 Requires: gtk2
 Requires: mesa-libGL
@@ -43,7 +45,9 @@ docs for the GtkGLExt.
 %prep
 %setup -q
 %patch0 -p1
+%if "%{_dist_release}" >= "vl7"
 %patch1 -p1 -b .pangox-compat
+%endif
 
 %build
 
@@ -87,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr 23 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 1.2.0-7
+- do not apply patch1
+
 * Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.0-6
 - add BuildRequires: pangox-compat-devel
 - add Patch1 (gtkglext-1.2.0-pangox-compat.patch)