Author: glen Date: Fri Oct 3 14:46:09 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use gcc4 on ac
---- Files affected:
SPECS:
truecrypt.spec (1.34 -> 1.35)
---- Diffs:
================================================================
Index: SPECS/truecrypt.spec
diff -u SPECS/truecrypt.spec:1.34 SPECS/truecrypt.spec:1.35
--- SPECS/truecrypt.spec:1.34 Mon Sep 8 14:41:40 2008
+++ SPECS/truecrypt.spec Fri Oct 3 16:46:03 2008
@@ -2,15 +2,18 @@
#
# Conditional build:
%bcond_without gui # build without GUI
-#
-%define wx_ver 2.8.7
+%if "%{pld_release}" == "ac"
+%bcond_without gcc4 # use gcc4* packages for building
+%else
+%bcond_with gcc4 # use gcc4* packages for building
+%endif
+%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
Name: truecrypt
Version: 6.0a
-%define _rel 0.2
-Release: %{_rel}
+Release: 0.2
License: TrueCrypt License Version 2.4
Group: Base/Kernel
#Source0:
http://ftp.uni-kl.de/pub/linux/archlinux/other/truecrypt/TrueCrypt-%{version}-Source.tar.gz
@@ -23,10 +26,18 @@
URL: http://www.truecrypt.org/
BuildRequires: gcc >= 5:4.0.0
BuildRequires: libfuse-devel
+BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.379
Requires: losetup
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%if %{with gcc4}
+# add suffix, but allow ccache, etc in ~/.rpmmacros
+%{expand:%%define __cc %(echo '%__cc' | sed -e 's,-gcc,-gcc4,')}
+%{expand:%%define __cxx %(echo '%__cxx' | sed -e 's,-g++,-g++4,')}
+%{expand:%%define __cpp %(echo '%__cpp' | sed -e 's,-gcc,-gcc4,')}
+%endif
+
%description
Main Features:
- Creates a virtual encrypted disk within a file and mounts it as a
@@ -97,6 +108,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.35 2008/10/03 14:46:03 glen
+- use gcc4 on ac
+
Revision 1.34 2008/09/08 12:41:40 undefine
- gui -> with gui ;)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/truecrypt.spec?r1=1.34&r2=1.35&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
