rpms/piklab/F-11 piklab-0.15.7.gpsim-version.patch, NONE, 1.1 piklab.spec, 1.26, 1.27

[Alain Portal]

Author: dionysos

Update of /cvs/pkgs/rpms/piklab/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31230

Modified Files:
	piklab.spec 
Added Files:
	piklab-0.15.7.gpsim-version.patch 
Log Message:
* Mon Mar 15 2010  Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 0.15.7-2
  - Add a patch to fix a bug that didn't allow to find gpsim


piklab-0.15.7.gpsim-version.patch:
 gpsim.cpp |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE piklab-0.15.7.gpsim-version.patch ---
--- src/progs/gpsim/base/gpsim.cpp.orig	2009-10-24 16:06:13.000000000 +0200
+++ src/progs/gpsim/base/gpsim.cpp	2010-03-15 09:24:56.000000000 +0100
@@ -150,7 +150,11 @@
 {
   if ( !sendCommand("version", true) ) return false;
   QRegExp reg("\\w*\\s*(\\d+\\.\\d+\\.\\d+).*");
-  if ( outputLines().count()==0 || !reg.exactMatch(outputLines()[0]) ) {
+  if ( outputLines().count()==0) {
+    version = VersionData();
+    return true;
+  }
+  if ( !reg.exactMatch(outputLines()[outputLines().count()-1]) ) {
     version = VersionData();
     return true;
   }


Index: piklab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/piklab/F-11/piklab.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- piklab.spec	10 Mar 2010 14:53:49 -0000	1.26
+++ piklab.spec	15 Mar 2010 12:17:49 -0000	1.27
@@ -2,7 +2,7 @@
 
 Name:       piklab
 Version:    0.15.7
-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
 
@@ -20,6 +20,7 @@ Source6:    %{name}-LISEZMOI.Fedora
 
 Patch0:     %{name}-0.15.3.desktop-fr.patch
 Patch1:     %{name}-0.12.1.x-desktop-fr.patch
+Patch10:    %{name}-%{version}.gpsim-version.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -53,6 +54,7 @@ comment finir l'installation.
 
 %patch0 -p0 -b .desktop-fr
 %patch1 -p0 -b .x-desktop-fr
+%patch10 -p0 -b .gpsim-version
 
 %{__install} -pm 644 %{SOURCE5} README.Fedora
 %{__install} -pm 644 %{SOURCE6} LISEZMOI.Fedora
@@ -135,6 +137,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Mon Mar 15 2010  Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 0.15.7-2
+  - Add a patch to fix a bug that didn't allow to find gpsim
+
 * Wed Mar 10 2010  Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 0.15.7-1
   - New upstream version
   - Remove patches 2 & 3 that are no more needed