SPECS: fltk.spec, gai.spec, snd.spec, ocaml-lablgtk.spec, ocaml-la...

qboosh qboosh at pld-linux.org
Wed Feb 6 21:19:55 CET 2008 

Author: qboosh                       Date: Wed Feb  6 20:19:55 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified bcond name: gl -> opengl

---- Files affected:
SPECS:
   fltk.spec (1.57 -> 1.58) , gai.spec (1.23 -> 1.24) , snd.spec (1.10 -> 1.11) , ocaml-lablgtk.spec (1.41 -> 1.42) , ocaml-lablgtk2.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: SPECS/fltk.spec
diff -u SPECS/fltk.spec:1.57 SPECS/fltk.spec:1.58
--- SPECS/fltk.spec:1.57	Tue Feb 13 08:16:44 2007
+++ SPECS/fltk.spec	Wed Feb  6 21:19:49 2008
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	gl	# without OpenGL libraries
+%bcond_without	opengl	# without OpenGL libraries
 %bcond_without	xft	# without Xft support
 #
 Summary:	Fast Light Tool Kit
@@ -19,7 +19,7 @@
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-cxx.patch
 URL:		http://www.fltk.org/
-%{?with_gl:BuildRequires:	OpenGL-GLU-devel}
+%{?with_opengl:BuildRequires:	OpenGL-GLU-devel}
 BuildRequires:	autoconf
 BuildRequires:	libstdc++-devel
 BuildRequires:	rpmbuild(macros) >= 1.315
@@ -141,7 +141,7 @@
 %configure \
 	--enable-shared \
 	--with-x \
-	%{!?with_gl:--disable-gl} \
+	%{!?with_opengl:--disable-gl} \
 	%{?with_xft:--enable-xft}
 
 %{__make} depend
@@ -201,7 +201,7 @@
 %{_libdir}/libfltk_forms.a
 %{_libdir}/libfltk_images.a
 
-%if %{with gl}
+%if %{with opengl}
 %files gl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libfltk_gl.so.*.*
@@ -223,6 +223,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.58  2008-02-06 20:19:49  qboosh
+- unified bcond name: gl -> opengl
+
 Revision 1.57  2007-02-13 07:16:44  glen
 - tabs in preamble
 

================================================================
Index: SPECS/gai.spec
diff -u SPECS/gai.spec:1.23 SPECS/gai.spec:1.24
--- SPECS/gai.spec:1.23	Tue Feb 13 08:16:44 2007
+++ SPECS/gai.spec	Wed Feb  6 21:19:49 2008
@@ -1,8 +1,8 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	gl	# without OpenGL support
 %bcond_without	gnome	# without GNOME support
+%bcond_without	opengl	# without OpenGL support
 %bcond_without	rox	# without ROX support
 %bcond_without	sdl	# without SDL support
 #
@@ -20,7 +20,7 @@
 URL:		http://gai.sourceforge.net/
 %{?with_sdl:BuildRequires:	SDL-devel >= 1.2}
 BuildRequires:	autoconf >= 2.53
-%{?with_gl:BuildRequires:	gtkglext-devel >= 1.0}
+%{?with_opengl:BuildRequires:	gtkglext-devel >= 1.0}
 %{?with_gnome:BuildRequires:	gnome-panel-devel >= 2.4.0}
 BuildRequires:	gtk+2-devel >= 1:2.0
 BuildRequires:	pkgconfig
@@ -53,7 +53,7 @@
 Requires:	gai(gnome) = %{version}-%{release}
 Provides:	gai-devel(gnome) = %{version}-%{release}
 %endif
-%{?with_gl:Requires:	gtkglext-devel >= 1.0}
+%{?with_opengl:Requires:	gtkglext-devel >= 1.0}
 %if %{with rox}
 Requires:	gai(rox) = %{version}-%{release}
 Provides:	gai-devel(rox) = %{version}-%{release}
@@ -74,7 +74,7 @@
 %build
 %{__autoconf}
 %configure \
-	%{!?with_gl:--disable-gl} \
+	%{!?with_opengl:--disable-gl} \
 	%{!?with_gnome:--disable-gnome} \
 	%{!?with_rox:--disable-rox} \
 	%{!?with_sdl:--disable-sdl}
@@ -118,6 +118,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2008-02-06 20:19:49  qboosh
+- unified bcond name: gl -> opengl
+
 Revision 1.23  2007-02-13 07:16:44  glen
 - tabs in preamble
 

================================================================
Index: SPECS/snd.spec
diff -u SPECS/snd.spec:1.10 SPECS/snd.spec:1.11
--- SPECS/snd.spec:1.10	Mon Feb 12 23:09:15 2007
+++ SPECS/snd.spec	Wed Feb  6 21:19:49 2008
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	gl	# with OpenGL (reason yet unknown)
+%bcond_without	opengl	# with OpenGL (reason yet unknown)
 %bcond_without	ruby	# embed Ruby
 %bcond_with	gtk	# seems to be broken :]
 #
@@ -21,7 +21,7 @@
 BuildRequires:	alsa-lib-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-%{?with_gl:BuildRequires:	gtkglext-devel}
+%{?with_opengl:BuildRequires:	gtkglext-devel}
 %{?with_gtk:BuildRequires:	gtk+2-devel}
 %{?with_guile:BuildRequires:	guile-devel}
 %if %{with ruby}
@@ -56,7 +56,7 @@
 	%{?with_gtk:--with-gtk} \
 	--with-ladspa \
 	%{?with_ruby:--with-ruby} \
-	%{?with_gl:--with-gl} \
+	%{?with_opengl:--with-gl} \
 	%{!?with_guile:--without-guile}
 
 %{__make} \
@@ -85,6 +85,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2008-02-06 20:19:49  qboosh
+- unified bcond name: gl -> opengl
+
 Revision 1.10  2007-02-12 22:09:15  glen
 - tabs in preamble
 

================================================================
Index: SPECS/ocaml-lablgtk.spec
diff -u SPECS/ocaml-lablgtk.spec:1.41 SPECS/ocaml-lablgtk.spec:1.42
--- SPECS/ocaml-lablgtk.spec:1.41	Tue Feb 13 08:16:50 2007
+++ SPECS/ocaml-lablgtk.spec	Wed Feb  6 21:19:49 2008
@@ -1,9 +1,9 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_with	gl		# build with lablgtkgl packages
-%bcond_with	gnome	# build with lablgtkgnome packages
+%bcond_with	opengl	# build with lablgtkgl packages
 %bcond_with	glade	# build with lablgtkglade packages
+%bcond_with	gnome	# build with lablgtkgnome packages
 #
 %define		ocaml_ver	1:3.09.2
 Summary:	GTK+ binding for OCaml
@@ -20,14 +20,14 @@
 BuildRequires:	gdk-pixbuf-devel
 %{?with_gnome:BuildRequires:	gnome-libs-devel}
 BuildRequires:	gtk+-devel
-%{?with_gl:BuildRequires:	gtkglarea1-devel >= 1.2.0}
+%{?with_opengl:BuildRequires:	gtkglarea1-devel >= 1.2.0}
 %{?with_glade:BuildRequires:	libglade-devel}
 %if %{with glade} && %{with gnome}
 BuildRequires:	libglade-gnome-devel
 %endif
 BuildRequires:	libxml-devel
 BuildRequires:	ocaml-camlp4 >= %{ocaml_ver}
-%{?with_gl:BuildRequires:	ocaml-lablgl-devel}
+%{?with_opengl:BuildRequires:	ocaml-lablgl-devel}
 BuildRequires:	which
 %requires_eq	ocaml-runtime
 Obsoletes:	lablgtk
@@ -47,7 +47,7 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 %requires_eq	ocaml
-%{?with_gl:%requires_eq	ocaml-lablgl-devel}
+%{?with_opengl:%requires_eq	ocaml-lablgl-devel}
 Obsoletes:	lablgtk-examples
 
 %description devel
@@ -124,7 +124,7 @@
 Group:		Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 %requires_eq	ocaml-runtime
-%{?with_gl:%requires_eq	ocaml-lablgl}
+%{?with_opengl:%requires_eq	ocaml-lablgl}
 
 %description gl
 GTK+ binding for OCaml, GtkGL support. This package contains files
@@ -140,7 +140,7 @@
 Group:		Development/Libraries
 Requires:	%{name}-gl = %{epoch}:%{version}-%{release}
 %requires_eq	ocaml
-%{?with_gl:%requires_eq	ocaml-lablgl-devel}
+%{?with_opengl:%requires_eq	ocaml-lablgl-devel}
 
 %description gl-devel
 GTK+ binding for OCaml, GtkGL support. This package contains files
@@ -176,7 +176,7 @@
 	USE_CC=1 \
 	%{?with_gnome:USE_GNOME=1} \
 	%{?with_glade:USE_GLADE=1} \
-	%{?with_gl:USE_GL=1}
+	%{?with_opengl:USE_GL=1}
 
 %{__make} all opt -j1 \
 	LABLGLDIR=%{_libdir}/ocaml/lablgl
@@ -277,7 +277,7 @@
 %{_libdir}/ocaml/site-lib/lablglade
 %endif
 
-%if %{with gl}
+%if %{with opengl}
 %files gl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/ocaml/stublibs/dlllablgtkgl.so
@@ -303,6 +303,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42  2008-02-06 20:19:49  qboosh
+- unified bcond name: gl -> opengl
+
 Revision 1.41  2007-02-13 07:16:50  glen
 - tabs in preamble
 

================================================================
Index: SPECS/ocaml-lablgtk2.spec
diff -u SPECS/ocaml-lablgtk2.spec:1.22 SPECS/ocaml-lablgtk2.spec:1.23
--- SPECS/ocaml-lablgtk2.spec:1.22	Thu Jan 31 23:21:56 2008
+++ SPECS/ocaml-lablgtk2.spec	Wed Feb  6 21:19:49 2008
@@ -1,9 +1,9 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	gl	# without lablgtkgl
-%bcond_without	gnome	# without lablgtkgnome
+%bcond_without	opengl	# without lablgtkgl
 %bcond_without	glade	# without lablgtkglade
+%bcond_without	gnome	# without lablgtkgnome
 #
 %define		ocaml_ver	1:3.09.2
 Summary:	GTK+ binding for OCaml
@@ -17,7 +17,7 @@
 # Source0-md5:	47319aacbbb761323bdfab67513829df
 URL:		http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
 BuildRequires:	gtk+2-devel >= 2.0
-%{?with_gl:BuildRequires:	gtkglarea-devel >= 1.99}
+%{?with_opengl:BuildRequires:	gtkglarea-devel >= 1.99}
 BuildRequires:	gtkspell-devel >= 2.0
 %{?with_glade:BuildRequires:	libglade2-devel >= 2.0}
 %if %{with gnome}
@@ -27,7 +27,7 @@
 %endif
 BuildRequires:	librsvg-devel >= 2.0
 BuildRequires:	ocaml-camlp4 >= %{ocaml_ver}
-%{?with_gl:BuildRequires:	ocaml-lablgl-devel}
+%{?with_opengl:BuildRequires:	ocaml-lablgl-devel}
 %requires_eq	ocaml-runtime
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -230,7 +230,7 @@
 	CC="%{__cc} %{rpmcflags} -fPIC" \
 	%{!?with_gnome:--without-gnomecanvas} \
 	%{!?with_glade:--without-glade} \
-	%{!?with_gl:--without-gl}
+	%{!?with_opengl:--without-gl}
 
 %{__make} -j1 \
 	all opt
@@ -305,7 +305,7 @@
 %{_examplesdir}/%{name}-%{version}
 %{_libdir}/ocaml/site-lib/lablgtk2
 
-%if %{with gl}
+%if %{with opengl}
 %files gl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/ocaml/stublibs/dlllablgtkgl2.so
@@ -380,6 +380,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2008-02-06 20:19:49  qboosh
+- unified bcond name: gl -> opengl
+
 Revision 1.22  2008-01-31 22:21:56  glen
 - rel 6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/fltk.spec?r1=1.57&r2=1.58&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gai.spec?r1=1.23&r2=1.24&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/snd.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ocaml-lablgtk.spec?r1=1.41&r2=1.42&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ocaml-lablgtk2.spec?r1=1.22&r2=1.23&f=u

More information about the pld-cvs-commit mailing list