[piklab] - Add new defaut sdcc 3.0.0 switch (BZ#750096) - Change default sdcc unix name to match the sdcc Fed

[Alain Portal]

commit b012ee11d6da608764fa057e4cbecc5aa0e3c4c3
Author: Alain Portal <alain.portal at free.fr>
Date:   Mon Jan 30 21:13:09 2012 +0100

    - Add new defaut sdcc 3.0.0 switch (BZ#750096)
    - Change default sdcc unix name to match the sdcc Fedora package

 piklab-0.15.10-sdcc-3.0.0.patch  |   16 ++++++++++++++++
 piklab-0.15.10-sdcc.fedora.patch |   11 +++++++++++
 piklab-LISEZMOI.Fedora           |   10 ----------
 piklab-README.Fedora             |   10 ----------
 piklab.spec                      |   10 +++++++++-
 5 files changed, 36 insertions(+), 21 deletions(-)
---
diff --git a/piklab-0.15.10-sdcc-3.0.0.patch b/piklab-0.15.10-sdcc-3.0.0.patch
new file mode 100644
index 0000000..9e85e0b
--- /dev/null
+++ b/piklab-0.15.10-sdcc-3.0.0.patch
@@ -0,0 +1,16 @@
+--- src/tools/sdcc/sdcc_compile.cpp.orig	2010-07-05 18:16:33.000000000 +0200
++++ src/tools/sdcc/sdcc_compile.cpp	2012-01-30 19:30:39.000000000 +0100
+@@ -1,4 +1,4 @@
+-/***************************************************************************
++  /***************************************************************************
+  *   Copyright (C) 2006 Nicolas Hadacek <hadacek at kde.org>                  *
+  *                                                                         *
+  *   This program is free software; you can redistribute it and/or modify  *
+@@ -32,6 +32,7 @@
+   args += "-%DEVICE";
+   args += "-V"; // verbose
+   args += "--debug";
++  args += "--use-non-free";
+   return args;
+ }
+ 
diff --git a/piklab-0.15.10-sdcc.fedora.patch b/piklab-0.15.10-sdcc.fedora.patch
new file mode 100644
index 0000000..4bf76d0
--- /dev/null
+++ b/piklab-0.15.10-sdcc.fedora.patch
@@ -0,0 +1,11 @@
+--- src/tools/sdcc/sdcc.h.orig	2010-07-05 18:16:33.000000000 +0200
++++ src/tools/sdcc/sdcc.h	2012-01-30 19:35:14.000000000 +0100
+@@ -19,7 +19,7 @@
+ class Base : public Tool::Base
+ {
+ public:
+-  virtual QString baseExecutable(Tool::ExecutableType, Tool::OutputExecutableType) const { return "sdcc"; }
++  virtual QString baseExecutable(Tool::ExecutableType, Tool::OutputExecutableType) const { return "sdcc-sdcc"; }
+ 
+ private:
+   virtual QStringList checkExecutableOptions(Tool::ExecutableType) const;
diff --git a/piklab-LISEZMOI.Fedora b/piklab-LISEZMOI.Fedora
index fca90d5..a70ff89 100644
--- a/piklab-LISEZMOI.Fedora
+++ b/piklab-LISEZMOI.Fedora
@@ -14,13 +14,3 @@ nécessaire de charger le module ppdev, grâce à la commande :
 
 	modprobe ppdev
 
-
-Pour pouvoir utiliser le compilateur SDCC, vous devez modifier le PATH
-à l'échelle du système et pas seulement pour un utilisateur.
-Vous devez donc ajouter la ligne suivante :
-
-	PATH=$PATH:/usr/libexec/sdcc
-
-dans le fichier /etc/profile, avant la ligne de commande
-
-	export PATH
diff --git a/piklab-README.Fedora b/piklab-README.Fedora
index a14fc55..d49ad19 100644
--- a/piklab-README.Fedora
+++ b/piklab-README.Fedora
@@ -12,13 +12,3 @@ by typing the following command line:
 
     modprobe ppdev
 
-
-If you want to use the SDCC Compiler with Piklab, you have to modify
-the PATH for the whole system, not only for a single user.
-So, you have to add the following:
-
-    PATH=$PATH:/usr/libexec/sdcc
-
-in /etc/profile, before the command line
-
-    export PATH
diff --git a/piklab.spec b/piklab.spec
index a43996a..bb9a51a 100644
--- a/piklab.spec
+++ b/piklab.spec
@@ -2,7 +2,7 @@
 
 Name:       piklab
 Version:    0.15.10
-Release:    5%{?dist}
+Release:    6%{?dist}
 Summary:    Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):IDE pour applications à base de microcontrôleurs PIC et de dsPIC
 
@@ -23,6 +23,8 @@ Patch1:     %{name}-0.12.1.x-desktop-fr.patch
 Patch2:     %{name}-0.15.8.use-fedora-docdir.patch
 Patch3:     %{name}-0.15.10-gcc46.patch
 Patch4:     %{name}-0.15.10-gcc47.patch
+Patch5:     %{name}-0.15.10-sdcc-3.0.0.patch
+Patch6:     %{name}-0.15.10-sdcc.fedora.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -60,6 +62,8 @@ comment finir l'installation.
 %patch2 -p0 -b .use-fedora-docdir
 %patch3 -p1 -b .gcc46
 %patch4 -p1 -b .gcc47
+%patch5 -p0 -b .sdcc-switch
+%patch6 -p0 -b .sdcc.fedora
 
 %{__install} -pm 644 %{SOURCE5} README.Fedora
 %{__install} -pm 644 %{SOURCE6} LISEZMOI.Fedora
@@ -139,6 +143,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Mon Jan 30 2012  Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 0.15.10-6
+- Add new defaut sdcc 3.0.0 switch (BZ#750096)
+- Change default sdcc unix name to match the sdcc Fedora package
+
 * Tue Jan 17 2012 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.15.10-5
 - Add piklab-0.15.10-gcc47.patch (Fix FTBFS with GCC 4.7).