rpms/codeblocks/devel codeblocks-run.patch, NONE, 1.1 codeblocks-desktop.patch, 1.2, 1.3 codeblocks.spec, 1.26, 1.27
Dan Horák
sharkcz at fedoraproject.org
Mon Sep 22 06:29:05 UTC 2008
Author: sharkcz
Update of /cvs/extras/rpms/codeblocks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19332
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-3
- 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/devel/codeblocks-desktop.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- codeblocks-desktop.patch 29 Aug 2008 05:53:16 -0000 1.2
+++ codeblocks-desktop.patch 22 Sep 2008 06:29:05 -0000 1.3
@@ -1,8 +1,19 @@
-diff -Nrup -x'*.orig' codeblocks-8.02.orig/src/setup/mime/codeblocks.desktop codeblocks-8.02/src/setup/mime/codeblocks.desktop
---- codeblocks-8.02.orig/src/setup/mime/codeblocks.desktop 2007-03-01 12:24:27.000000000 +0100
-+++ codeblocks-8.02/src/setup/mime/codeblocks.desktop 2008-08-29 07:40:30.000000000 +0200
-@@ -11,4 +11,3 @@ Type=Application
- Categories=Application;Development;
+--- 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
+@@ -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/devel/codeblocks.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- codeblocks.spec 29 Aug 2008 05:53:16 -0000 1.26
+++ codeblocks.spec 22 Sep 2008 06:29:05 -0000 1.27
@@ -1,6 +1,6 @@
Name: codeblocks
Version: 8.02
-Release: 2%{?dist}
+Release: 3%{?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
-Patch1: codeblocks-plugins.patch
-Patch2: codeblocks-desktop.patch
+# 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 -p1
%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-3
+- update desktop file
+- fix running console applications (#461120)
+
* Fri Aug 29 2008 Dan Horak <dan[at]danny.cz> 8.02-2
- refresh patches
More information about the fedora-extras-commits
mailing list