rpms/kicad/F-12 kicad-2010.04.06.dialog_design_rules.cpp.fix-sort-function.patch, NONE, 1.1 kicad-2010.04.06.edit_component_in_schematic.cpp.fix_footprint_edition.patch, NONE, 1.1 kicad.spec, 1.22, 1.23

[Alain Portal]

Author: dionysos

Update of /cvs/pkgs/rpms/kicad/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19843

Modified Files:
	kicad.spec 
Added Files:
	kicad-2010.04.06.dialog_design_rules.cpp.fix-sort-function.patch 
	kicad-2010.04.06.edit_component_in_schematic.cpp.fix_footprint_edition.patch 
Log Message:
* Thu Apr 29 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2010.04.06-3.rev2514
- Fix a crash that happens sometimes when opening the design rule dialog

* Mon Apr 26 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2010.04.06-2.rev2514
- Fix https://bugs.launchpad.net/bugs/570074


kicad-2010.04.06.dialog_design_rules.cpp.fix-sort-function.patch:
 dialog_design_rules.cpp |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE kicad-2010.04.06.dialog_design_rules.cpp.fix-sort-function.patch ---
--- pcbnew/dialog_design_rules.cpp.orig	2010-03-02 12:54:11.000000000 +0100
+++ pcbnew/dialog_design_rules.cpp	2010-04-29 20:03:28.000000000 +0200
@@ -294,8 +294,12 @@
     if( a->clazz < b->clazz )
         return true;
 
-    if( a->net < b->net )
-        return true;
+    // inside the same class, sort by net name:
+    if( a->clazz == b->clazz )
+    {
+        if( a->net < b->net )
+            return true;
+    }
 
     return false;
 }

kicad-2010.04.06.edit_component_in_schematic.cpp.fix_footprint_edition.patch:
 edit_component_in_schematic.cpp |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE kicad-2010.04.06.edit_component_in_schematic.cpp.fix_footprint_edition.patch ---
--- eeschema/edit_component_in_schematic.cpp.orig	2010-02-18 21:07:29.000000000 +0100
+++ eeschema/edit_component_in_schematic.cpp	2010-04-26 15:49:07.000000000 +0200
@@ -416,13 +416,13 @@
 
         Cmp->GetField( FOOTPRINT )->m_Orient =
             Cmp->GetField( REFERENCE )->m_Orient;
-    }
-    TextField->m_Text = message;
+        TextField->m_Text = message;
 
-    Cmp->GetField( FOOTPRINT )->Draw( DrawPanel, DC, wxPoint( 0, 0 ),
-                                      Cmp->m_Flags ? g_XorMode :
-                                      GR_DEFAULT_DRAWMODE );
-    OnModify( );
+        Cmp->GetField( FOOTPRINT )->Draw( DrawPanel, DC, wxPoint( 0, 0 ),
+                                          Cmp->m_Flags ? g_XorMode :
+                                          GR_DEFAULT_DRAWMODE );
+        OnModify( );
+    }
 
     Cmp->DisplayInfo( this );
 }


Index: kicad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kicad/F-12/kicad.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- kicad.spec	12 Apr 2010 21:57:42 -0000	1.22
+++ kicad.spec	29 Apr 2010 21:39:30 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           kicad
 Version:        2010.04.06
-Release:        1.rev2514%{?dist}
+Release:        3.rev2514%{?dist}
 Summary:        Electronic schematic diagrams and printed circuit board artwork
 Summary(fr):    Saisie de schéma électronique et tracé de circuit imprimé
 
@@ -15,6 +15,9 @@ Source1:        http://dionysos.fedorape
 Source2:        http://dionysos.fedorapeople.org/SOURCES/kicad-library-%{version}.tar.bz2
 Source3:        http://dionysos.fedorapeople.org/SOURCES/kicad-ld.conf
 
+Patch:          %{name}-%{version}.edit_component_in_schematic.cpp.fix_footprint_edition.patch
+Patch1:         %{name}-%{version}.dialog_design_rules.cpp.fix-sort-function.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -166,6 +169,9 @@ Documentation and tutorials for Kicad in
 %prep
 %setup -q -a 1 -a 2
 
+%patch -p0 -b .fix_footprint_edition
+%patch1 -p0 -b .fix-sort-function
+
 #kicad-doc.noarch: W: file-not-utf8 /usr/share/doc/kicad/AUTHORS.txt
 iconv -f iso8859-1 -t utf-8 AUTHORS.txt > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS.txt
 
@@ -348,6 +354,12 @@ fi
 
 
 %changelog
+* Thu Apr 29 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2010.04.06-3.rev2514
+- Fix a crash that happens sometimes when opening the design rule dialog
+
+* Mon Apr 26 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2010.04.06-2.rev2514
+- Fix https://bugs.launchpad.net/bugs/570074
+
 * Mon Apr 12 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2010.04.06-1.rev2514
 - New upstream version
 - Patches no more needed