Author: sparky Date: Fri Jun 18 12:31:52 2010 GMT Module: packages Tag: HEAD ---- Log message: - conditional BR: gtk+2-devel, xorg-lib-libSM-devel - simplified %build
---- Files affected: packages/truecrypt: truecrypt.spec (1.45 -> 1.46) ---- Diffs: ================================================================ Index: packages/truecrypt/truecrypt.spec diff -u packages/truecrypt/truecrypt.spec:1.45 packages/truecrypt/truecrypt.spec:1.46 --- packages/truecrypt/truecrypt.spec:1.45 Fri Jun 18 14:23:36 2010 +++ packages/truecrypt/truecrypt.spec Fri Jun 18 14:31:47 2010 @@ -30,13 +30,13 @@ # Source4-md5: aeebc839b98e672982abf566e6a25525 URL: http://www.truecrypt.org/ BuildRequires: gcc >= 5:4.0.0 -BuildRequires: gtk+2-devel +%{?with_gui:BuildRequires: gtk+2-devel} BuildRequires: libfuse-devel BuildRequires: libstdc++-devel BuildRequires: pkgconfig BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpmbuild(macros) >= 1.379 -BuildRequires: xorg-lib-libSM-devel +%{?with_gui:BuildRequires: xorg-lib-libSM-devel} Requires: losetup BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -85,29 +85,17 @@ %build -%if %{without gui} %{__make} wxbuild \ CC="%{__cc}" \ CXX="%{__cxx}" \ CFLAGS="%{rpmcflags}" \ CXXFLAGS="%{rpmcxxflags}" \ - NOGUI=1 \ WX_ROOT=%{_builddir}/%{name}-%{version}-source/wxWidgets-%{wx_ver} \ + %{!?with_gui:NOGUI=1} \ VERBOSE=1 %{__make} \ - NOGUI=1 \ + %{!?with_gui:NOGUI=1} \ WXSTATIC=1 -%else -%{__make} wxbuild \ - CC="%{__cc}" \ - CXX="%{__cxx}" \ - CFLAGS="%{rpmcflags}" \ - CXXFLAGS="%{rpmcxxflags}" \ - WX_ROOT=%{_builddir}/%{name}-%{version}-source/wxWidgets-%{wx_ver} \ - VERBOSE=1 -%{__make} \ - WXSTATIC=1 -%endif %install rm -rf $RPM_BUILD_ROOT @@ -131,6 +119,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.46 2010/06/18 12:31:47 sparky +- conditional BR: gtk+2-devel, xorg-lib-libSM-devel +- simplified %build + Revision 1.45 2010/06/18 12:23:36 sparky - BR: gtk+2-devel, libstdc++-devel, pkgconfig, xorg-lib-libSM-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/truecrypt/truecrypt.spec?r1=1.45&r2=1.46&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
