SPECS: TiMidity++.spec - unified bcond name: X -> x

[qboosh]

Author: qboosh                       Date: Wed Feb  6 20:08:39 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified bcond name: X -> x

---- Files affected:
SPECS:
   TiMidity++.spec (1.87 -> 1.88) 

---- Diffs:

================================================================
Index: SPECS/TiMidity++.spec
diff -u SPECS/TiMidity++.spec:1.87 SPECS/TiMidity++.spec:1.88
--- SPECS/TiMidity++.spec:1.87	Wed Nov 28 09:19:00 2007
+++ SPECS/TiMidity++.spec	Wed Feb  6 21:08:33 2008
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	X	# without X based interfaces (implies libX11 deps)
+%bcond_without	x	# without X based interfaces (implies libX11 deps)
 %bcond_without	alsa	# without ALSA support
 %bcond_with	arts	# enable ARTS support (implies also glib(2) deps)
 %bcond_with	esd	# enable ESD support
@@ -38,16 +38,16 @@
 %{?with_arts:BuildRequires:	arts-devel}
 BuildRequires:	autoconf
 %{?with_esd:BuildRequires:	esound-devel}
-%{?with_X:BuildRequires:	gtk+-devel}
+%{?with_x:BuildRequires:	gtk+-devel}
 %{?with_jack:BuildRequires:	jack-audio-connection-kit-devel}
 %{?with_vorbis:BuildRequires:	libvorbis-devel}
-%{?with_X:BuildRequires:	motif-devel}
+%{?with_x:BuildRequires:	motif-devel}
 %{?with_nas:BuildRequires:	nas-devel}
 BuildRequires:	ncurses-devel
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	slang-devel >= 2.0.0
-%{?with_X:BuildRequires:	tk-devel >= 8.3.2}
-%{?with_X:Provides:	%{name}(X) = %{version}-%{release}}
+%{?with_x:BuildRequires:	tk-devel >= 8.3.2}
+%{?with_x:Provides:	%{name}(X) = %{version}-%{release}}
 Obsoletes:	timidity
 Obsoletes:	timidity++
 Obsoletes:	timidity++-X11
@@ -250,21 +250,21 @@
 	%{?with_alsa:--enable-alsaseq} \
 	--enable-audio=$AUDIO \
 	--enable-dynamic \
-	%{?with_X:--enable-gtk=dynamic} \
+	%{?with_x:--enable-gtk=dynamic} \
 	--enable-emacs=dynamic \
-	%{?with_X:--enable-motif=dynamic} \
+	%{?with_x:--enable-motif=dynamic} \
 	--enable-ncurses=dynamic \
 	--enable-network \
 	--enable-server \
 	--enable-slang=dynamic \
-	%{?with_X:--enable-spectrogram} \
-	%{?with_X:--enable-tcltk=dynamic} \
+	%{?with_x:--enable-spectrogram} \
+	%{?with_x:--enable-tcltk=dynamic} \
 	--enable-vt100=dynamic \
-	%{?with_X:--enable-xaw=dynamic} \
-	%{?with_X:--enable-xskin=dynamic} \
+	%{?with_x:--enable-xaw=dynamic} \
+	%{?with_x:--enable-xskin=dynamic} \
 	--with-default-path=%{_sysconfdir} \
 	--with-elf \
-	%{!?with_X:--without-x}
+	%{!?with_x:--without-x}
 
 %{__make} \
 	SHLIB_DIR=%{_libdir}/timidity
@@ -328,7 +328,7 @@
 %if "%{_lib}" != "lib"
 %dir %{_prefix}/lib/timidity
 %endif
-%{?with_X:%{_prefix}/lib/timidity/bitmaps}
+%{?with_x:%{_prefix}/lib/timidity/bitmaps}
 %{_mandir}/man1/timidity.1*
 %{_mandir}/man5/timidity.cfg.5*
 %lang(ja) %{_mandir}/ja/man1/timidity.1*
@@ -342,7 +342,7 @@
 %defattr(644,root,root,755)
 %{_datadir}/GUSpatches/*
 
-%if %{with X}
+%if %{with x}
 %files gtk
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gtkmidi
@@ -350,7 +350,7 @@
 %{_libdir}/timidity/interface_g.txt
 %endif
 
-%if %{with X}
+%if %{with x}
 %files motif
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/xmmidi
@@ -363,7 +363,7 @@
 %attr(755,root,root) %{_libdir}/timidity/interface_s.so
 %{_libdir}/timidity/interface_s.txt
 
-%if %{with X}
+%if %{with x}
 %files tcltk
 %defattr(644,root,root,755)
 %doc doc/C/README.tk
@@ -380,7 +380,7 @@
 %attr(755,root,root) %{_libdir}/timidity/interface_T.so
 %{_libdir}/timidity/interface_T.txt
 
-%if %{with X}
+%if %{with x}
 %files xaw
 %defattr(644,root,root,755)
 %doc doc/C/README.xaw
@@ -411,6 +411,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.88  2008-02-06 20:08:33  qboosh
+- unified bcond name: X -> x
+
 Revision 1.87  2007-11-28 08:19:00  arekm
 - rel 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/TiMidity++.spec?r1=1.87&r2=1.88&f=u