SPECS: truecrypt.spec - sanitized (with_nogui -> without_gui)

[qboosh]

Author: qboosh                       Date: Wed Jul 23 15:01:03 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- sanitized (with_nogui -> without_gui)

---- Files affected:
SPECS:
   truecrypt.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: SPECS/truecrypt.spec
diff -u SPECS/truecrypt.spec:1.31 SPECS/truecrypt.spec:1.32
--- SPECS/truecrypt.spec:1.31	Wed Jul 23 11:58:07 2008
+++ SPECS/truecrypt.spec	Wed Jul 23 17:00:58 2008
@@ -1,10 +1,9 @@
 # $Revision$, $Date$
 #
 # Conditional build:
+%bcond_without	gui	# build without GUI
 #
-%bcond_with	nogui	# build without gui
-
-%define		_wxWid_ver	2.8.7
+%define		wx_ver	2.8.7
 
 Summary:	TrueCrypt - Free Open-Source Disk Encryption Software
 Summary(pl.UTF-8):	TrueCrypt - wolnodostępne oprogramowanie do szyfrowania dysków
@@ -17,10 +16,10 @@
 #Source0:	http://ftp.uni-kl.de/pub/linux/archlinux/other/truecrypt/TrueCrypt-%{version}-Source.tar.gz
 Source0:	http://www.truecrypt.org/downloads/TrueCrypt-%{version}-Source.tar.gz
 # Source0-md5:	7281d485a175c161e90526447d9d3fd0
-Source1:    http://ftp.wxwidgets.org/pub/%{_wxWid_ver}/wxWidgets-%{_wxWid_ver}.tar.bz2
+Source1:	http://ftp.wxwidgets.org/pub/%{wx_ver}/wxWidgets-%{wx_ver}.tar.bz2
 # Source1-md5:	e3455083afdf6404a569a8bf0701cf13
 URL:		http://www.truecrypt.org/
-BuildRequires:	gcc	>= 5:4.0.0
+BuildRequires:	gcc >= 5:4.0.0
 BuildRequires:	libfuse-devel
 BuildRequires:	rpmbuild(macros) >= 1.379
 Requires:	libfuse
@@ -63,19 +62,22 @@
 %setup -q -a1 -n %{name}-%{version}-source
 
 %build
-%if %{with nogui}
-%{__make} NOGUI=1 WX_ROOT=%{_builddir}/%{name}-%{version}-source/wxWidgets-%{_wxWid_ver} wxbuild
-%{__make} NOGUI=1
+%if %{with gui}
+%{__make} wxbuild \
+	NOGUI=1 \
+	WX_ROOT=%{_builddir}/%{name}-%{version}-source/wxWidgets-%{wx_ver}
+%{__make} \
+	NOGUI=1
 %else
-%{__make} WX_ROOT=%{_builddir}/%{name}-%{version}-source/wxWidgets-%{_wxWid_ver} wxbuild
+%{__make} wxbuild \
+	WX_ROOT=%{_builddir}/%{name}-%{version}-source/wxWidgets-%{wx_ver}
 %{__make}
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
 
-install -d $RPM_BUILD_ROOT{/%{_bindir},%{_mandir}/man1}
-ls -l Main/truecrypt
 install Main/truecrypt $RPM_BUILD_ROOT%{_bindir}/truecrypt
 mv -f Release/Setup\ Files/TrueCrypt\ User\ Guide.pdf TrueCrypt-User-Guide.pdf
 
@@ -88,13 +90,15 @@
 %attr(755,root,root) %{_bindir}/%{name}
 ##%%{_mandir}/man1/*
 
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2008/07/23 15:00:58  qboosh
+- sanitized (with_nogui -> without_gui)
+
 Revision 1.31  2008/07/23 09:58:07  kolodko
 - added nogui bcond
 - rel 0.2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/truecrypt.spec?r1=1.31&r2=1.32&f=u