From 6e6a0cbde6896432093aabf262a69a4a8e2136c0 Mon Sep 17 00:00:00 2001
From: Dan Horák <sharkcz@fedoraproject.org>
Date: Sep 22 2008 06:29:05 +0000
Subject: - update desktop file

- fix running console applications (#461120)

---

diff --git a/codeblocks-desktop.patch b/codeblocks-desktop.patch
index f6cdea8..c72f61c 100644
--- a/codeblocks-desktop.patch
+++ b/codeblocks-desktop.patch
@@ -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]=
diff --git a/codeblocks-run.patch b/codeblocks-run.patch
new file mode 100644
index 0000000..d82615a
--- /dev/null
+++ b/codeblocks-run.patch
@@ -0,0 +1,32 @@
+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)
diff --git a/codeblocks.spec b/codeblocks.spec
index b0014d6..098b91b 100644
--- a/codeblocks.spec
+++ b/codeblocks.spec
@@ -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:	dos2unix
 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 @@ Additional Code::Blocks plugins.
 %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 @@ update-mime-database /usr/share/mime &> /dev/null || :
 
 
 %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