rpms/kicad/F-12 kicad-2010.05.27.display-footprint-value.patch, NONE, 1.1 kicad-2010.05.27.real-version.patch, NONE, 1.1 kicad-2010.05.27.set-extension-if-missing.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 kicad.spec, 1.25, 1.26 sources, 1.9, 1.10

Alain Portal dionysos at fedoraproject.org
Sun May 30 21:52:57 UTC 2010


Author: dionysos

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

Modified Files:
	.cvsignore kicad.spec sources 
Added Files:
	kicad-2010.05.27.display-footprint-value.patch 
	kicad-2010.05.27.real-version.patch 
	kicad-2010.05.27.set-extension-if-missing.patch 
Log Message:
* Sat May 29 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2010.05.27-1
- New packager version
- Update kicad version number patch
- Patch to fix https://bugs.launchpad.net/kicad/+bug/587175
- Patch to fix https://bugs.launchpad.net/kicad/+bug/587176

* Fri May 21 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2010.05.09-3
- Fix the kicad version number
- Fix a problem when trying to modify a footprint value in eeschema
  https://bugs.launchpad.net/kicad/+bug/583939

* Tue May 18 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2010.05.09-2
- No backup of patched files to deleted
- Add noreplace flag to config macro



kicad-2010.05.27.display-footprint-value.patch:
 edit_component_in_schematic.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE kicad-2010.05.27.display-footprint-value.patch ---
--- eeschema/edit_component_in_schematic.cpp.orig	2010-05-28 21:47:32.000000000 +0200
+++ eeschema/edit_component_in_schematic.cpp	2010-05-29 15:27:08.000000000 +0200
@@ -369,6 +369,7 @@
         return;
 
     SCH_FIELD* TextField = Cmp->GetField( FOOTPRINT );
+    message = TextField->m_Text;
 
     if( Get_Message( _( "Footprint" ), _( "Component footprint" ), message, this ) )
         return;    // edition cancelled by user.

kicad-2010.05.27.real-version.patch:
 build_version.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kicad-2010.05.27.real-version.patch ---
--- common/build_version.cpp.orig	2010-05-28 21:47:34.000000000 +0200
+++ common/build_version.cpp	2010-05-29 15:32:11.000000000 +0200
@@ -6,7 +6,7 @@
 #endif
 
 #ifndef KICAD_BUILD_VERSION
-#define KICAD_BUILD_VERSION "(2010-00-09 BZR 23xx)"
+#define KICAD_BUILD_VERSION "(2010-05-09 BZR 2363)"
 #endif
 
 #define VERSION_STABILITY "stable"

kicad-2010.05.27.set-extension-if-missing.patch:
 prjconfig.cpp |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE kicad-2010.05.27.set-extension-if-missing.patch ---
--- kicad/prjconfig.cpp.orig	2010-05-28 21:47:32.000000000 +0200
+++ kicad/prjconfig.cpp	2010-05-29 15:29:37.000000000 +0200
@@ -86,8 +86,15 @@
         m_ProjectFileName = dlg.GetPath();
 
         if( event.GetId() == ID_NEW_PROJECT )
+        {
+            wxString tmpString = m_ProjectFileName.GetFullName();
+            if ( !tmpString.EndsWith( wxT( ".pro" ) ) )
+            {
+                tmpString += wxT( ".pro" );
+                m_ProjectFileName.SetFullName( tmpString );
+            }
             CreateNewProject( m_ProjectFileName.GetFullPath() );
-
+        }
         SetLastProject( m_ProjectFileName.GetFullPath() );
     }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kicad/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	17 May 2010 22:55:04 -0000	1.9
+++ .cvsignore	30 May 2010 21:52:57 -0000	1.10
@@ -1,4 +1,3 @@
-kicad-2010.05.09.tar.bz2
-kicad-libraries-2010.05.09.tar.bz2
-kicad-doc-2010.05.09.tar.bz2
-kicad-icons.tar.bz2
+kicad-2010.05.27.tar.bz2
+kicad-doc-2010.05.27.tar.bz2
+kicad-libraries-2010.05.27.tar.bz2


Index: kicad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kicad/F-12/kicad.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- kicad.spec	17 May 2010 22:55:05 -0000	1.25
+++ kicad.spec	30 May 2010 21:52:57 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           kicad
-Version:        2010.05.09
-Release:        1%{?dist}
+Version:        2010.05.27
+Release:        1.rev2363%{?dist}
 Summary:        Electronic schematic diagrams and printed circuit board artwork
 Summary(fr):    Saisie de schéma électronique et routage de circuit imprimé
 
@@ -9,20 +9,21 @@ License:        GPLv2+
 URL:            https://launchpad.net/kicad
 
 # Source files created from upstream's bazaar repository
-# available on packager web site http://dionysos.fedorapeople.org/SOURCES/
-# bzr export -r 2361 kicad-2010.05.09
-# bzr export -r 76 kicad-libraries-2010.05.09
-# bzr export -r 110 kicad-doc-2010.05.09
+# bzr export -r 2363 kicad-2010.05.27
+# bzr export -r 76 kicad-libraries-2010.05.27
+# bzr export -r 110 kicad-doc-2010.05.27
 
 Source:         %{name}-%{version}.tar.bz2
 Source1:        %{name}-doc-%{version}.tar.bz2
 Source2:        %{name}-libraries-%{version}.tar.bz2
 Source3:        %{name}-ld.conf
-Source4:        %{name}-%{version}.x-kicad-pcbnew.desktop
+Source4:        %{name}-2010.05.09.x-kicad-pcbnew.desktop
 Source5:        pcbnew.desktop
 Source6:        %{name}-icons.tar.bz2
 
-Patch0:         %{name}-%{version}.cmake-requirement.patch
+Patch10:        %{name}-%{version}.real-version.patch
+Patch11:        %{name}-%{version}.display-footprint-value.patch
+Patch12:        %{name}-%{version}.set-extension-if-missing.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -175,7 +176,9 @@ Documentation and tutorials for Kicad in
 %prep
 %setup -q -a 1 -a 2 -a 6
 
-%patch0 -p0 -b .cmake-requirement
+%patch10 -p0 -b .real-version
+%patch11 -p0 -b .display-footprint-value
+%patch12 -p0 -b .set-extension-if-missing
 
 #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
@@ -216,8 +219,6 @@ popd
 cd %{name}-doc-%{version}/internat
 for dir in ca cs de es fr hu it ko nl pl pt ru sl sv zh_CN
 do
-#  install -d %{buildroot}%{_datadir}/locale/${dir}
-#  install -m 644 ${dir}/%{name}.mo %{buildroot}%{_datadir}/locale/${dir}/%{name}.mo
   install -m 644 -D ${dir}/%{name}.mo %{buildroot}%{_datadir}/locale/${dir}/%{name}.mo
 done
 cd ../..
@@ -348,7 +349,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/*.*
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/mimelnk/application/x-%{name}-*.desktop
-%config %{_sysconfdir}/ld.so.conf.d/kicad.conf
+%config(noreplace) %{_sysconfdir}/ld.so.conf.d/kicad.conf
 
 %files doc
 %defattr(-,root,root,-)
@@ -404,6 +405,21 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sat May 29 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2010.05.27-1
+- New packager version
+- Update kicad version number patch
+- Patch to fix https://bugs.launchpad.net/kicad/+bug/587175
+- Patch to fix https://bugs.launchpad.net/kicad/+bug/587176
+
+* Fri May 21 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2010.05.09-3
+- Fix the kicad version number
+- Fix a problem when trying to modify a footprint value in eeschema
+  https://bugs.launchpad.net/kicad/+bug/583939
+
+* Tue May 18 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2010.05.09-2
+- No backup of patched files to deleted
+- Add noreplace flag to config macro
+
 * Mon May 17 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2010.05.09-1
 - New upstream version
 - All previous patches no more needed


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kicad/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	17 May 2010 22:55:05 -0000	1.9
+++ sources	30 May 2010 21:52:57 -0000	1.10
@@ -1,4 +1,3 @@
-31658b668af09d8da825f57e686dc9e7  kicad-2010.05.09.tar.bz2
-622dd6303a0823df16296c2a644eecd2  kicad-libraries-2010.05.09.tar.bz2
-103018d251ff870143ae6642232c14c5  kicad-doc-2010.05.09.tar.bz2
-51459cb884444df60e55c95d50564be7  kicad-icons.tar.bz2
+c4171a6c61e07b21eb7cb36d0f40a830  kicad-2010.05.27.tar.bz2
+f5fd4dc0c7610254e37d1c2c8dc9ba7d  kicad-doc-2010.05.27.tar.bz2
+6ee04b0086ae1c907059bf785e05a1fd  kicad-libraries-2010.05.27.tar.bz2



More information about the scm-commits mailing list