[piklab/el6] - Change default sdcc unix name to match the sdcc Fedora package

[Alain Portal]

commit 5e1b5d22c163e1c44710ea43b5621902f02b4b61
Author: Alain Portal <alain.portal at free.fr>
Date:   Mon Jan 30 21:27:01 2012 +0100

    - Change default sdcc unix name to match the sdcc Fedora package

 piklab-0.15.10-sdcc.fedora.patch |   11 +++++++++++
 piklab-LISEZMOI.Fedora           |   10 ----------
 piklab-README.Fedora             |   10 ----------
 piklab.spec                      |    7 ++++++-
 4 files changed, 17 insertions(+), 21 deletions(-)
---
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 1111a58..2266dfd 100644
--- a/piklab.spec
+++ b/piklab.spec
@@ -2,7 +2,7 @@
 
 Name:       piklab
 Version:    0.15.10
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):IDE pour applications à base de microcontrôleurs PIC et de dsPIC
 
@@ -21,6 +21,7 @@ Source6:    %{name}-LISEZMOI.Fedora
 Patch0:     %{name}-0.15.3.desktop-fr.patch
 Patch1:     %{name}-0.12.1.x-desktop-fr.patch
 Patch2:     %{name}-0.15.8.use-fedora-docdir.patch
+Patch3:     %{name}-0.15.10-sdcc.fedora.patch
 
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,6 +58,7 @@ comment finir l'installation.
 %patch0 -p0 -b .desktop-fr
 %patch1 -p0 -b .x-desktop-fr
 %patch2 -p0 -b .use-fedora-docdir
+%patch3 -p0 -b .sdcc.fedora
 
 %{__install} -pm 644 %{SOURCE5} README.Fedora
 %{__install} -pm 644 %{SOURCE6} LISEZMOI.Fedora
@@ -136,6 +138,9 @@ 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-2
+- Change default sdcc unix name to match the sdcc Fedora package
+
 * Sat Jan 30 2011  Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 0.15.10-1
   - New upstream version
   - Fix rules (BZ #594932), patch from David Dillow