rpms/codeblocks/EL-4 codeblocks-run.patch, NONE, 1.1 codeblocks-desktop.patch, 1.1, 1.2 codeblocks.spec, 1.22, 1.23
Dan Horák
sharkcz at fedoraproject.org
Mon Sep 22 06:32:29 UTC 2008
- Previous message: rpms/codeblocks/devel codeblocks-run.patch, NONE, 1.1 codeblocks-desktop.patch, 1.2, 1.3 codeblocks.spec, 1.26, 1.27
- Next message: rpms/codeblocks/EL-5 codeblocks-run.patch, NONE, 1.1 codeblocks-desktop.patch, 1.1, 1.2 codeblocks.spec, 1.20, 1.21
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sharkcz
Update of /cvs/extras/rpms/codeblocks/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19782
Modified Files:
codeblocks-desktop.patch codeblocks.spec
Added Files:
codeblocks-run.patch
Log Message:
* Sat Sep 20 2008 Dan Horak <dan[at]danny.cz> 8.02-2
- update desktop file
- fix running console applications (#461120)
codeblocks-run.patch:
--- NEW FILE codeblocks-run.patch ---
Index: src/plugins/compilergcc/compilergcc.cpp
===================================================================
--- src/plugins/compilergcc/compilergcc.cpp (revision 5202)
+++ src/plugins/compilergcc/compilergcc.cpp (working copy)
@@ -1723,6 +1723,7 @@
wxString cmd;
wxString command;
+ bool has_explicit_shell = false;
wxFileName f(out);
f.MakeAbsolute(m_Project->GetBasePath());
@@ -1770,6 +1771,9 @@
// and its use for such purposes should be strictly banned!"
// -- Csh Programming Considered Harmful
command << DEFAULT_CONSOLE_SHELL << strSPACE;
+
+ has_explicit_shell = true;
+ command << _T("'");
}
}
@@ -1820,6 +1824,9 @@
return -1;
}
+ if (has_explicit_shell)
+ command << _T("'");
+
wxString script = command;
if (platform::macosx)
codeblocks-desktop.patch:
Index: codeblocks-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/EL-4/codeblocks-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- codeblocks-desktop.patch 13 Sep 2006 20:21:13 -0000 1.1
+++ codeblocks-desktop.patch 22 Sep 2008 06:31:58 -0000 1.2
@@ -1,7 +1,19 @@
--- codeblocks/src/setup/mime/codeblocks.desktop.old 2006-09-09 18:03:05.000000000 +0200
+++ codeblocks/src/setup/mime/codeblocks.desktop 2006-09-10 10:37:08.000000000 +0200
-@@ -11,4 +11,3 @@
- Categories=Application;Development;
- StartupNotify=false
+@@ -1,14 +1,12 @@
+ [Desktop Entry]
+ Version=1.0
+-Encoding=UTF-8
+ Name=Code::Blocks IDE
+ Comment=Configurable and extensible IDE
+ Exec=codeblocks %F
+-Icon=codeblocks.png
++Icon=codeblocks
+ Terminal=false
+ X-MultipleArgs=false
+ Type=Application
+-Categories=Application;Development;
++Categories=Development;
+ StartupNotify=true
MimeType=application/x-codeblocks;application/x-codeblocks-workspace;
-GenericName[en_GR]=
Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/EL-4/codeblocks.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- codeblocks.spec 15 Mar 2008 16:38:35 -0000 1.22
+++ codeblocks.spec 22 Sep 2008 06:31:58 -0000 1.23
@@ -1,6 +1,6 @@
Name: codeblocks
Version: 8.02
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: An open source, cross platform, free C++ IDE
Group: Development/Tools
License: GPLv3+
@@ -13,8 +13,12 @@
BuildRequires: desktop-file-utils
Requires: %{name}-libs = %{version}-%{release}
Requires: shared-mime-info
+# Fedora packaging rules
Patch1: codeblocks-plugins.patch
+# update to recent standards (http://developer.berlios.de/patch/?func=detailpatch&patch_id=2567&group_id=5358)
Patch2: codeblocks-desktop.patch
+# bug #461120 (http://developer.berlios.de/patch/?func=detailpatch&patch_id=2568&group_id=5358)
+Patch3: codeblocks-run.patch
%description
Code::Blocks is a free C++ IDE built specifically to meet the most demanding
@@ -66,6 +70,7 @@
%setup -q
%patch1
%patch2 -p1
+%patch3 -p0 -b .run
# convert EOLs
find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix --keepdate &> /dev/null
@@ -253,6 +258,10 @@
%changelog
+* Sat Sep 20 2008 Dan Horak <dan[at]danny.cz> 8.02-2
+- update desktop file
+- fix running console applications (#461120)
+
* Sun Mar 2 2008 Dan Horak <dan[at]danny.cz> 8.02-1
- update to stable release 8.02
- update BR to use system libraries
- Previous message: rpms/codeblocks/devel codeblocks-run.patch, NONE, 1.1 codeblocks-desktop.patch, 1.2, 1.3 codeblocks.spec, 1.26, 1.27
- Next message: rpms/codeblocks/EL-5 codeblocks-run.patch, NONE, 1.1 codeblocks-desktop.patch, 1.1, 1.2 codeblocks.spec, 1.20, 1.21
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list