rpms/realcrypt/F-10 realcrypt-Makefile.patch, 1.1,
1.2 realcrypt-no-userguide-menuitem.patch, 1.1,
1.2 realcrypt-rpm_opt_flags.patch, 1.1, 1.2 realcrypt.spec, 1.1,
1.2 sources, 1.2, 1.3
Leigh Scott
leigh123linux at rpmfusion.org
Sun Nov 1 18:53:40 CET 2009
- Previous message: rpms/realcrypt/F-11 realcrypt-Makefile.patch, 1.1,
1.2 realcrypt-no-userguide-menuitem.patch, 1.1,
1.2 realcrypt-rpm_opt_flags.patch, 1.1, 1.2 realcrypt.spec, 1.1,
1.2 sources, 1.2, 1.3
- Next message: rpms/realcrypt/F-11 realcrypt-6.3-rebranding.patch, NONE,
1.1 realcrypt-6.2a-rebranding.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: leigh123linux
Update of /cvs/nonfree/rpms/realcrypt/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29847
Modified Files:
realcrypt-Makefile.patch realcrypt-no-userguide-menuitem.patch
realcrypt-rpm_opt_flags.patch realcrypt.spec sources
Log Message:
* Sat Oct 31 2009 Leigh Scott <leigh123linux at googlemail.com> - 6.3-1
- update to 6.3 and fix rebranding patches
realcrypt-Makefile.patch:
Index: realcrypt-Makefile.patch
===================================================================
RCS file: /cvs/nonfree/rpms/realcrypt/F-10/realcrypt-Makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- realcrypt-Makefile.patch 19 Jul 2009 12:38:56 -0000 1.1
+++ realcrypt-Makefile.patch 1 Nov 2009 17:53:39 -0000 1.2
@@ -1,12 +1,11 @@
---- truecrypt-6.2a-source.orig/Makefile
-+++ truecrypt-6.2a-source/Makefile
+--- truecrypt-6.3-source.orig/Makefile
++++ truecrypt-6.3-source/Makefile
@@ -24,7 +24,7 @@
+
+ #------ Build configuration ------
+
+-export APPNAME := truecrypt
++export APPNAME := realcrypt
+ export BASE_DIR := $(CURDIR)
+ export BUILD_INC := $(BASE_DIR)/Build/Include
- #------ Build configuration ------
-
--export APPNAME := truecrypt
-+export APPNAME := realcrypt
- export BASE_DIR := $(CURDIR)
- export BUILD_INC := $(BASE_DIR)/Build/Include
-
-
realcrypt-no-userguide-menuitem.patch:
Index: realcrypt-no-userguide-menuitem.patch
===================================================================
RCS file: /cvs/nonfree/rpms/realcrypt/F-10/realcrypt-no-userguide-menuitem.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- realcrypt-no-userguide-menuitem.patch 19 Jul 2009 12:38:56 -0000 1.1
+++ realcrypt-no-userguide-menuitem.patch 1 Nov 2009 17:53:39 -0000 1.2
@@ -1,142 +1,133 @@
---- truecrypt-6.2a-source.orig/Main/Forms/Forms.h 2009-06-15 06:15:04.000000000 -0400
-+++ truecrypt-6.2a-source/Main/Forms/Forms.h 2009-07-10 13:05:11.997178582 -0400
-@@ -124,7 +124,6 @@
- virtual void OnHotkeysMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnSecurityTokenPreferencesMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnPreferencesMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-- virtual void OnUserGuideMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnOnlineHelpMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnBeginnersTutorialMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnFaqMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-@@ -152,7 +151,7 @@
-
-
- public:
-- MainFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,496 ), long style = wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxSYSTEM_MENU|wxTAB_TRAVERSAL );
-+ MainFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("RealCrypt"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,496 ), long style = wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxSYSTEM_MENU|wxTAB_TRAVERSAL );
- ~MainFrameBase();
-
+--- truecrypt-6.3-source.orig/Main/Forms/Forms.h
++++ truecrypt-6.3-source/Main/Forms/Forms.h
+@@ -122,7 +122,6 @@
+ virtual void OnHotkeysMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
+ virtual void OnSecurityTokenPreferencesMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
+ virtual void OnPreferencesMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
+- virtual void OnUserGuideMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
+ virtual void OnOnlineHelpMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
+ virtual void OnBeginnersTutorialMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
+ virtual void OnFaqMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
+@@ -150,7 +149,7 @@
+
+
+ public:
+- MainFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,496 ), long style = wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxSYSTEM_MENU|wxTAB_TRAVERSAL );
++ MainFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("RealCrypt"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,496 ), long style = wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxSYSTEM_MENU|wxTAB_TRAVERSAL );
+ ~MainFrameBase();
+
+ };
+@@ -310,7 +309,7 @@
+
+
+ public:
+- EncryptionTestDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt - Test Vectors"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
++ EncryptionTestDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("RealCrypt - Test Vectors"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+ ~EncryptionTestDialogBase();
+
+ };
+@@ -421,7 +420,7 @@
+ wxTextCtrl* LegalNoticesTextCtrl;
+
+ public:
+- LegalNoticesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt - Legal Notices"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
++ LegalNoticesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("RealCrypt - Legal Notices"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+ ~LegalNoticesDialogBase();
+
+ };
+@@ -472,7 +471,7 @@
+
+
+ public:
+- MountOptionsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Enter TrueCrypt Volume Password"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
++ MountOptionsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Enter RealCrypt Volume Password"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
+ ~MountOptionsDialogBase();
+
+ };
+@@ -618,7 +617,7 @@
+
+
+ public:
+- RandomPoolEnrichmentDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt - Random Pool Enrichment"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
++ RandomPoolEnrichmentDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("RealCrypt - Random Pool Enrichment"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+ ~RandomPoolEnrichmentDialogBase();
+
};
-@@ -312,7 +311,7 @@
-
-
- public:
-- EncryptionTestDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt - Test Vectors"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
-+ EncryptionTestDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("RealCrypt - Test Vectors"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
- ~EncryptionTestDialogBase();
-
- };
-@@ -423,7 +422,7 @@
- wxTextCtrl* LegalNoticesTextCtrl;
-
- public:
-- LegalNoticesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt - Legal Notices"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
-+ LegalNoticesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("RealCrypt - Legal Notices"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
- ~LegalNoticesDialogBase();
-
- };
-@@ -474,7 +473,7 @@
-
-
- public:
-- MountOptionsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Enter TrueCrypt Volume Password"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
-+ MountOptionsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Enter RealCrypt Volume Password"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
- ~MountOptionsDialogBase();
-
- };
-@@ -620,7 +619,7 @@
-
-
- public:
-- RandomPoolEnrichmentDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt - Random Pool Enrichment"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
-+ RandomPoolEnrichmentDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("RealCrypt - Random Pool Enrichment"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
- ~RandomPoolEnrichmentDialogBase();
-
- };
---- truecrypt-6.2a-source.orig/Main/Forms/Forms.cpp 2009-06-15 06:15:04.000000000 -0400
-+++ truecrypt-6.2a-source/Main/Forms/Forms.cpp 2009-07-10 13:04:30.368178609 -0400
-@@ -157,9 +157,6 @@
- MainMenuBar->Append( SettingsMenu, _("Settin&gs") );
-
- HelpMenu = new wxMenu();
-- wxMenuItem* UserGuideMenuItem;
-- UserGuideMenuItem = new wxMenuItem( HelpMenu, wxID_HELP, wxString( _("User's Guide") ) , wxEmptyString, wxITEM_NORMAL );
-- HelpMenu->Append( UserGuideMenuItem );
-
- wxMenuItem* OnlineHelpMenuItem;
- OnlineHelpMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("Online Help") ) , wxEmptyString, wxITEM_NORMAL );
-@@ -176,7 +173,7 @@
- HelpMenu->AppendSeparator();
-
- wxMenuItem* WebsiteMenuItem;
-- WebsiteMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("TrueCrypt Website") ) , wxEmptyString, wxITEM_NORMAL );
-+ WebsiteMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("RealCrypt Website") ) , wxEmptyString, wxITEM_NORMAL );
- HelpMenu->Append( WebsiteMenuItem );
-
- wxMenuItem* DownloadsMenuItem;
-@@ -434,7 +431,6 @@
- this->Connect( DefaultKeyfilesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDefaultKeyfilesMenuItemSelected ) );
- this->Connect( SecurityTokenPreferencesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnSecurityTokenPreferencesMenuItemSelected ) );
- this->Connect( PreferencesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnPreferencesMenuItemSelected ) );
-- this->Connect( UserGuideMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnUserGuideMenuItemSelected ) );
- this->Connect( OnlineHelpMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnOnlineHelpMenuItemSelected ) );
- this->Connect( BeginnersTutorialMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnBeginnersTutorialMenuItemSelected ) );
- this->Connect( FaqMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnFaqMenuItemSelected ) );
-@@ -499,7 +495,6 @@
- this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDefaultKeyfilesMenuItemSelected ) );
- this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnSecurityTokenPreferencesMenuItemSelected ) );
- this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnPreferencesMenuItemSelected ) );
-- this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnUserGuideMenuItemSelected ) );
- this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnOnlineHelpMenuItemSelected ) );
- this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnBeginnersTutorialMenuItemSelected ) );
- this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnFaqMenuItemSelected ) );
-@@ -1625,7 +1620,7 @@
- wxStaticBoxSizer* sbSizer14;
- sbSizer14 = new wxStaticBoxSizer( new wxStaticBox( SecurityPage, wxID_ANY, _("Password Cache") ), wxVERTICAL );
-
-- WipeCacheOnCloseCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("Wipe after TrueCrypt window has been closed"), wxDefaultPosition, wxDefaultSize, 0 );
-+ WipeCacheOnCloseCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("Wipe after RealCrypt window has been closed"), wxDefaultPosition, wxDefaultSize, 0 );
-
- sbSizer14->Add( WipeCacheOnCloseCheckBox, 0, wxALL, 5 );
-
-@@ -1699,7 +1694,7 @@
- bSizer62 = new wxBoxSizer( wxVERTICAL );
-
- wxStaticBoxSizer* sbSizer18;
-- sbSizer18 = new wxStaticBoxSizer( new wxStaticBox( BackgroundTaskPanel, wxID_ANY, _("TrueCrypt Background Task") ), wxVERTICAL );
-+ sbSizer18 = new wxStaticBoxSizer( new wxStaticBox( BackgroundTaskPanel, wxID_ANY, _("RealCrypt Background Task") ), wxVERTICAL );
-
- BackgroundTaskEnabledCheckBox = new wxCheckBox( BackgroundTaskPanel, wxID_ANY, _("Enabled"), wxDefaultPosition, wxDefaultSize, 0 );
-
-@@ -1743,7 +1738,7 @@
-
- LogOnSizer = new wxStaticBoxSizer( new wxStaticBox( SystemIntegrationPage, wxID_ANY, _("Actions to Perform when User Logs On") ), wxVERTICAL );
-
-- StartOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Start TrueCrypt Background Task"), wxDefaultPosition, wxDefaultSize, 0 );
-+ StartOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Start RealCrypt Background Task"), wxDefaultPosition, wxDefaultSize, 0 );
-
- LogOnSizer->Add( StartOnLogonCheckBox, 0, wxALL, 5 );
-
-@@ -1751,7 +1746,7 @@
-
- LogOnSizer->Add( MountFavoritesOnLogonCheckBox, 0, wxALL, 5 );
-
-- MountDevicesOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Mount all device-hosted TrueCrypt volumes"), wxDefaultPosition, wxDefaultSize, 0 );
-+ MountDevicesOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Mount all device-hosted RealCrypt volumes"), wxDefaultPosition, wxDefaultSize, 0 );
-
- LogOnSizer->Add( MountDevicesOnLogonCheckBox, 0, wxALL, 5 );
-
-@@ -2503,7 +2498,7 @@
- sbSizer28 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxEmptyString ), wxVERTICAL );
-
- wxStaticText* m_staticText15;
-- m_staticText15 = new wxStaticText( this, wxID_ANY, _("TrueCrypt volume to mount:"), wxDefaultPosition, wxDefaultSize, 0 );
-+ m_staticText15 = new wxStaticText( this, wxID_ANY, _("RealCrypt volume to mount:"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticText15->Wrap( -1 );
- sbSizer28->Add( m_staticText15, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-
---- truecrypt-6.2a-source.orig/Main/Forms/TrueCrypt.fbp 2009-06-15 06:15:04.000000000 -0400
-+++ truecrypt-6.2a-source/Main/Forms/TrueCrypt.fbp 2009-07-10 13:03:47.748052981 -0400
+--- truecrypt-6.3-source.orig/Main/Forms/Forms.cpp
++++ truecrypt-6.3-source/Main/Forms/Forms.cpp
+@@ -154,9 +154,6 @@
+ MainMenuBar->Append( SettingsMenu, _("Settin&gs") );
+
+ HelpMenu = new wxMenu();
+- wxMenuItem* UserGuideMenuItem;
+- UserGuideMenuItem = new wxMenuItem( HelpMenu, wxID_HELP, wxString( _("User's Guide") ) , wxEmptyString, wxITEM_NORMAL );
+- HelpMenu->Append( UserGuideMenuItem );
+
+ wxMenuItem* OnlineHelpMenuItem;
+ OnlineHelpMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("Online Help") ) , wxEmptyString, wxITEM_NORMAL );
+@@ -173,7 +170,7 @@
+ HelpMenu->AppendSeparator();
+
+ wxMenuItem* WebsiteMenuItem;
+- WebsiteMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("TrueCrypt Website") ) , wxEmptyString, wxITEM_NORMAL );
++ WebsiteMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("RealCrypt Website") ) , wxEmptyString, wxITEM_NORMAL );
+ HelpMenu->Append( WebsiteMenuItem );
+
+ wxMenuItem* DownloadsMenuItem;
+@@ -430,7 +427,6 @@
+ this->Connect( DefaultKeyfilesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDefaultKeyfilesMenuItemSelected ) );
+ this->Connect( SecurityTokenPreferencesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnSecurityTokenPreferencesMenuItemSelected ) );
+ this->Connect( PreferencesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnPreferencesMenuItemSelected ) );
+- this->Connect( UserGuideMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnUserGuideMenuItemSelected ) );
+ this->Connect( OnlineHelpMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnOnlineHelpMenuItemSelected ) );
+ this->Connect( BeginnersTutorialMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnBeginnersTutorialMenuItemSelected ) );
+ this->Connect( FaqMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnFaqMenuItemSelected ) );
+@@ -494,7 +490,6 @@
+ this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDefaultKeyfilesMenuItemSelected ) );
+ this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnSecurityTokenPreferencesMenuItemSelected ) );
+ this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnPreferencesMenuItemSelected ) );
+- this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnUserGuideMenuItemSelected ) );
+ this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnOnlineHelpMenuItemSelected ) );
+ this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnBeginnersTutorialMenuItemSelected ) );
+ this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnFaqMenuItemSelected ) );
+@@ -1620,7 +1615,7 @@
+ wxStaticBoxSizer* sbSizer14;
+ sbSizer14 = new wxStaticBoxSizer( new wxStaticBox( SecurityPage, wxID_ANY, _("Password Cache") ), wxVERTICAL );
+
+- WipeCacheOnCloseCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("Wipe after TrueCrypt window has been closed"), wxDefaultPosition, wxDefaultSize, 0 );
++ WipeCacheOnCloseCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("Wipe after RealCrypt window has been closed"), wxDefaultPosition, wxDefaultSize, 0 );
+
+ sbSizer14->Add( WipeCacheOnCloseCheckBox, 0, wxALL, 5 );
+
+@@ -1694,7 +1689,7 @@
+ bSizer62 = new wxBoxSizer( wxVERTICAL );
+
+ wxStaticBoxSizer* sbSizer18;
+- sbSizer18 = new wxStaticBoxSizer( new wxStaticBox( BackgroundTaskPanel, wxID_ANY, _("TrueCrypt Background Task") ), wxVERTICAL );
++ sbSizer18 = new wxStaticBoxSizer( new wxStaticBox( BackgroundTaskPanel, wxID_ANY, _("RealCrypt Background Task") ), wxVERTICAL );
+
+ BackgroundTaskEnabledCheckBox = new wxCheckBox( BackgroundTaskPanel, wxID_ANY, _("Enabled"), wxDefaultPosition, wxDefaultSize, 0 );
+
+@@ -1738,7 +1733,7 @@
+
+ LogOnSizer = new wxStaticBoxSizer( new wxStaticBox( SystemIntegrationPage, wxID_ANY, _("Actions to Perform when User Logs On") ), wxVERTICAL );
+
+- StartOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Start TrueCrypt Background Task"), wxDefaultPosition, wxDefaultSize, 0 );
++ StartOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Start RealCrypt Background Task"), wxDefaultPosition, wxDefaultSize, 0 );
+
+ LogOnSizer->Add( StartOnLogonCheckBox, 0, wxALL, 5 );
+
+@@ -1746,7 +1741,7 @@
+
+ LogOnSizer->Add( MountFavoritesOnLogonCheckBox, 0, wxALL, 5 );
+
+- MountDevicesOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Mount all device-hosted TrueCrypt volumes"), wxDefaultPosition, wxDefaultSize, 0 );
++ MountDevicesOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Mount all device-hosted RealCrypt volumes"), wxDefaultPosition, wxDefaultSize, 0 );
+
+ LogOnSizer->Add( MountDevicesOnLogonCheckBox, 0, wxALL, 5 );
+
+--- truecrypt-6.3-source.orig/Main/Forms/TrueCrypt.fbp 2009-06-15 06:15:04.000000000 -0400
++++ truecrypt-6.3-source/Main/Forms/TrueCrypt.fbp 2009-07-10 13:03:47.748052981 -0400
@@ -604,21 +604,6 @@
<property name="checked">0</property>
<property name="enabled">1</property>
@@ -158,14 +149,25 @@
- <property name="help"></property>
<property name="id">wxID_ANY</property>
<property name="kind">wxITEM_NORMAL</property>
- <property name="label">Online Help</property>
---- truecrypt-6.2a-source.orig/Main/Forms/MainFrame.h 2009-06-15 06:15:04.000000000 -0400
-+++ truecrypt-6.2a-source/Main/Forms/MainFrame.h 2009-07-10 13:04:12.727053724 -0400
-@@ -127,7 +127,6 @@
- void OnVolumeButtonClick (wxCommandEvent& event);
- void OnVolumeDismounted (EventArgs &args) { UpdateVolumeList(); }
- void OnVolumeMounted (EventArgs &args) { UpdateVolumeList(); }
-- void OnUserGuideMenuItemSelected (wxCommandEvent& event) { Gui->OpenUserGuide (this); }
- void OnWebsiteMenuItemSelected (wxCommandEvent& event) { Gui->OpenHomepageLink (this, L"website"); }
- void OnWipeCacheButtonClick (wxCommandEvent& event);
+ <property name="label">Online Help</property>
+--- truecrypt-6.3-source/Main/Forms/MainFrame.cpp 2008-07-01 12:51:42.000000000 -0700
++++ truecrypt-6.3-source/Main/Forms/MainFrame.cpp.new 2008-08-05 20:44:13.000000000 -0700
+@@ -1346,7 +1346,7 @@
+ else if (show && !mTaskBarIcon->IsIconInstalled())
+ {
+ #ifndef TC_MACOSX
+- mTaskBarIcon->SetIcon (Resources::GetTrueCryptIcon(), L"TrueCrypt");
++ mTaskBarIcon->SetIcon (Resources::GetTrueCryptIcon(), L"RealCrypt");
+ #endif
+ }
+ }
+--- truecrypt-6.3-source.orig/Main/Forms/MainFrame.h
++++ truecrypt-6.3-source/Main/Forms/MainFrame.h
+@@ -126,7 +126,6 @@
+ void OnVolumeButtonClick (wxCommandEvent& event);
+ void OnVolumeDismounted (EventArgs &args) { UpdateVolumeList(); }
+ void OnVolumeMounted (EventArgs &args) { UpdateVolumeList(); }
+- void OnUserGuideMenuItemSelected (wxCommandEvent& event) { Gui->OpenUserGuide (this); }
+ void OnWebsiteMenuItemSelected (wxCommandEvent& event) { Gui->OpenHomepageLink (this, L"website"); }
+ void OnWipeCacheButtonClick (wxCommandEvent& event);
void OrganizeFavorites (const FavoriteVolumeList &favorites, size_t newItemCount = 0);
realcrypt-rpm_opt_flags.patch:
Index: realcrypt-rpm_opt_flags.patch
===================================================================
RCS file: /cvs/nonfree/rpms/realcrypt/F-10/realcrypt-rpm_opt_flags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- realcrypt-rpm_opt_flags.patch 19 Jul 2009 12:38:56 -0000 1.1
+++ realcrypt-rpm_opt_flags.patch 1 Nov 2009 17:53:39 -0000 1.2
@@ -1,12 +1,11 @@
---- truecrypt-6.2a-source/Makefile.orig
-+++ truecrypt-6.2a-source/Makefile
+--- truecrypt-6.3-source/Makefile.orig
++++ truecrypt-6.3-source/Makefile
@@ -85,7 +85,7 @@
-
- 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
- export WX_BUILD_DIR ?= $(BASE_DIR)/wxrelease
- WX_CONFIGURE_FLAGS += --disable-debug_flag --disable-debug_gdb --disable-debug_info
-
-
+
+ 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
+
Index: realcrypt.spec
===================================================================
RCS file: /cvs/nonfree/rpms/realcrypt/F-10/realcrypt.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- realcrypt.spec 19 Jul 2009 12:38:56 -0000 1.1
+++ realcrypt.spec 1 Nov 2009 17:53:39 -0000 1.2
@@ -1,8 +1,10 @@
+%define _default_patch_fuzz 2
+
Name: realcrypt
Summary: Cross platform disk encryption software
-Version: 6.2a
-Release: 8%{?dist}
-License: TrueCrypt License Version 2.7
+Version: 6.3
+Release: 1%{?dist}
+License: TrueCrypt License Version 2.8
Group: Applications/File
URL: http://www.truecrypt.org/
# command to generate tarball without spaces in name
@@ -32,7 +34,7 @@
Source21: realcrypt_64.png.lzma
Source22: Textual_logo_background_real.bmp.lzma
Patch1: realcrypt-rpm_opt_flags.patch
-Patch2: realcrypt-6.2a-rebranding.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)
@@ -66,7 +68,7 @@
rm -f ./Readme.txt
cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE7} .
%patch1 -p1 -b .realcrypt-rpm_opt_flags
-%patch2 -p1 -b .realcrypt-6.2a-rebranding
+%patch2 -p1 -b .realcrypt-%{version}-rebranding
%patch3 -p1 -b .realcrypt-no-userguide-menuitem
%patch4 -p1 -b .realcrypt-Makefile
@@ -142,6 +144,9 @@
%changelog
+* Sat Oct 31 2009 Leigh Scott <leigh123linux at googlemail.com> - 6.3-1
+- update to 6.3 and fix rebranding patches
+
* Sun Jul 12 2009 Leigh Scott <leigh123linux at googlemail.com> - 6.2a-8
- replace README.txt
- fix for help menu (link to rpmfusion wiki)
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/realcrypt/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 19 Jul 2009 12:38:56 -0000 1.2
+++ sources 1 Nov 2009 17:53:39 -0000 1.3
@@ -1 +1 @@
-42060059d32cd4be66183247cb55be59 trueCrypt-6.2a-source.tar.gz
+edf3e02046f8fc93878fa5199c4c19fa trueCrypt-6.3-source.tar.gz
- Previous message: rpms/realcrypt/F-11 realcrypt-Makefile.patch, 1.1,
1.2 realcrypt-no-userguide-menuitem.patch, 1.1,
1.2 realcrypt-rpm_opt_flags.patch, 1.1, 1.2 realcrypt.spec, 1.1,
1.2 sources, 1.2, 1.3
- Next message: rpms/realcrypt/F-11 realcrypt-6.3-rebranding.patch, NONE,
1.1 realcrypt-6.2a-rebranding.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the rpmfusion-commits
mailing list