Author: leigh123linux Update of /cvs/nonfree/rpms/realcrypt/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv4602 Modified Files: realcrypt-rpm_opt_flags.patch realcrypt.spec sources Removed Files: realcrypt-6.3-rebranding.patch realcrypt-6.3a-rebranding.patch realcrypt-Makefile.patch realcrypt-no-userguide-menuitem.patch Log Message: * Wed Dec 15 2010 leigh scott <leigh123linux(a)googlemail.com&gt; - 7.0a-1 - update to 7.0a realcrypt-rpm_opt_flags.patch: Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: realcrypt-rpm_opt_flags.patch =================================================================== RCS file: /cvs/nonfree/rpms/realcrypt/F-14/realcrypt-rpm_opt_flags.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- realcrypt-rpm_opt_flags.patch 12 Feb 2010 03:25:19 -0000 1.3 +++ realcrypt-rpm_opt_flags.patch 18 Dec 2010 14:27:55 -0000 1.4 @@ -1,10 +1,11 @@ ---- truecrypt-6.3-source/Makefile.orig -+++ truecrypt-6.3-source/Makefile -@@ -85,7 +85,7 @@ +--- truecrypt-7.0-source/Makefile.orig 2010-09-05 16:32:10.000000000 +0200 ++++ truecrypt-7.0-source/Makefile 2010-12-09 15:49:23.517359765 +0100 +@@ -87,7 +87,7 @@ endif ifeq "$(TC_BUILD_CONFIG)" "Release" --C_CXX_FLAGS += -O2 -fno-strict-aliasing # Do not enable strict aliasing -+C_CXX_FLAGS += $(RPM_OPT_FLAGS) -fno-strict-aliasing # Do not enable strict aliasing - export WX_BUILD_DIR ?= $(BASE_DIR)/wxrelease - WX_CONFIGURE_FLAGS += --disable-debug_flag --disable-debug_gdb --disable-debug_info +- C_CXX_FLAGS += -O2 -fno-strict-aliasing # Do not enable strict aliasing ++ C_CXX_FLAGS += $(RPM_OPT_FLAGS) -fno-strict-aliasing # Do not enable strict aliasing + export WX_BUILD_DIR ?= $(BASE_DIR)/wxrelease + WX_CONFIGURE_FLAGS += --disable-debug_flag --disable-debug_gdb --disable-debug_info + Index: realcrypt.spec =================================================================== RCS file: /cvs/nonfree/rpms/realcrypt/F-14/realcrypt.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- realcrypt.spec 17 Jun 2010 22:06:05 -0000 1.13 +++ realcrypt.spec 18 Dec 2010 14:27:55 -0000 1.14 @@ -2,8 +2,8 @@ Name: realcrypt Summary: Cross platform disk encryption software -Version: 6.3a -Release: 5%{?dist} +Version: 7.0a +Release: 1%{?dist} License: TrueCrypt License Version 2.8 Group: Applications/File URL: http://www.truecrypt.org/ @@ -35,8 +35,7 @@ Source22: Textual_logo_background_real.bmp.lzma Patch1: realcrypt-rpm_opt_flags.patch Patch2: realcrypt-%{version}-rebranding.patch -#Patch3: realcrypt-no-userguide-menuitem.patch -#Patch4: realcrypt-Makefile.patch + Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: fuse, pam, usermode, wxGTK >= 2.8.0 BuildRequires: fuse-devel, wxGTK-devel >= 2.8.0 @@ -69,8 +68,7 @@ cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE7} . %patch1 -p1 -b .realcrypt-rpm_opt_flags %patch2 -p1 -b .realcrypt-%{version}-rebranding -#patch3 -p1 -b .realcrypt-no-userguide-menuitem -#patch4 -p1 -b .realcrypt-Makefile + # Replace graphics which include the TrueCrypt logo rm -f `find -name *.bmp` @@ -90,7 +88,8 @@ lzcat %{SOURCE20} > ./Resources/Icons/TrueCrypt-16x16.xpm %build -sed -i -e 's,TrueCrypt,RealCrypt,g' Main/Forms/Forms.cpp Main/Forms/Forms.h Main/LanguageStrings.cpp +sed -i 579,+14d Main/Forms/TrueCrypt.fbp +sed -i -e 's,TrueCrypt,RealCrypt,g' Main/Forms/Forms.cpp Main/Forms/Forms.h Main/LanguageStrings.cpp Main/Forms/TrueCrypt.fbp sed -i -e 's,namespace RealCrypt,namespace TrueCrypt,g' Main/Forms/Forms.cpp Main/Forms/Forms.h Main/LanguageStrings.cpp make \ @@ -144,6 +143,9 @@ %changelog +* Wed Dec 15 2010 leigh scott <leigh123linux(a)googlemail.com&gt; - 7.0a-1 +- update to 7.0a + * Thu Jun 17 2010 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 6.3a-5 - Rebuild for F14 Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/realcrypt/F-14/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Feb 2010 03:04:49 -0000 1.6 +++ sources 18 Dec 2010 14:27:55 -0000 1.7 @@ -1,4 +1,4 @@ -0a7cc9a340df0aa0a86e8f2ff3fdda92 trueCrypt-6.3a-source.tar.gz +0a61616bc5c5ad90e876b4014c004ac9 trueCrypt-7.0a-source.tar.gz 9bc27b99ba35d06ebce2a509959edc59 Drive_icon_96dpi_real.bmp.lzma 28a8f649fffbad0de024322d92a6d98a Drive_icon_mask_96dpi_real.bmp.lzma 5b44c191a46d727249f28ab77deb2e7c Logo_96dpi_real.bmp.lzma @@ -11,3 +11,4 @@ 7c2ad91bc612971e6f3b78077c2102a5 Textual_logo_background_real.bmp.lzma 4445bb6d55876805e9e97adcb2377cbf TrueCrypt-16x16_real.xpm.lzma daa49085339d7b55dccebf2306b0a87e TrueCrypt_Wizard_real.bmp.lzma + --- realcrypt-6.3-rebranding.patch DELETED --- --- realcrypt-6.3a-rebranding.patch DELETED --- --- realcrypt-Makefile.patch DELETED --- --- realcrypt-no-userguide-menuitem.patch DELETED ---