lkundrak pushed to kicad (epel7). "- New upstream version (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Jun 5 07:27:50 UTC 2015
From b9a3639158c4384e30016a8f15f3e095e12331a3 Mon Sep 17 00:00:00 2001
From: Alain Portal <alain.portal at free.fr>
Date: Fri, 15 Jul 2011 19:28:23 +0200
Subject: - New upstream version - Update versioning patch - Add Polish
documentation - Add Epcos MKT capacitors library - Fix localisation
installation path
diff --git a/.gitignore b/.gitignore
index 7df9b61..aa6ab4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,7 @@ kicad-libraries-2010.05.27.tar.bz2
/kicad-2011.01.28.tar.bz2
/kicad-doc-2011.01.28.tar.bz2
/kicad-libraries-2011.01.28.tar.bz2
+/kicad-2011.07.12.tar.bz2
+/kicad-doc-2011.07.12.tar.bz2
+/kicad-libraries-2011.07.12.tar.bz2
+/Epcos-MKT-1.0.tar.bz2
diff --git a/kicad-2011.01.28-3DViewer-crash.patch b/kicad-2011.01.28-3DViewer-crash.patch
deleted file mode 100644
index 2c9c4f4..0000000
--- a/kicad-2011.01.28-3DViewer-crash.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -ru kicad-2011.01.28-2.rev2795/3d-viewer/3d_canvas.cpp kicad-2011.01.28-3.rev2795/3d-viewer/3d_canvas.cpp
---- kicad-2011.01.28-2.rev2795/3d-viewer/3d_canvas.cpp 2011-03-01 20:24:25.000000000 +0100
-+++ kicad-2011.01.28-3.rev2795/3d-viewer/3d_canvas.cpp 2011-04-04 19:12:49.000000000 +0200
-@@ -73,9 +73,9 @@
- Pcb3D_GLCanvas::OnPopUpMenu )
- END_EVENT_TABLE()
-
--Pcb3D_GLCanvas::Pcb3D_GLCanvas( WinEDA3D_DrawFrame* parent ) :
--#if wxCHECK_VERSION( 2, 9, 0 )
-- wxGLCanvas( parent, -1, NULL, wxDefaultPosition, wxDefaultSize,
-+Pcb3D_GLCanvas::Pcb3D_GLCanvas( WinEDA3D_DrawFrame* parent, int* attribList ) :
-+#if wxCHECK_VERSION( 2, 7, 0 )
-+ wxGLCanvas( parent, -1, attribList, wxDefaultPosition, wxDefaultSize,
- wxFULL_REPAINT_ON_RESIZE )
- #else
- wxGLCanvas( parent, -1, wxDefaultPosition, wxDefaultSize,
-@@ -87,7 +87,7 @@
- m_Parent = parent;
- m_ortho = false;
-
--#if wxCHECK_VERSION( 2, 9, 0 )
-+#if wxCHECK_VERSION( 2, 7, 0 )
-
- // Explicitly create a new rendering context instance for this canvas.
- m_glRC = new wxGLContext( this );
-@@ -101,7 +101,7 @@
- {
- ClearLists();
- m_init = FALSE;
--#if wxCHECK_VERSION( 2, 9, 0 )
-+#if wxCHECK_VERSION( 2, 7, 0 )
- delete m_glRC;
- #endif
- }
-diff -ru kicad-2011.01.28-2.rev2795/3d-viewer/3d_draw.cpp kicad-2011.01.28-3.rev2795/3d-viewer/3d_draw.cpp
---- kicad-2011.01.28-2.rev2795/3d-viewer/3d_draw.cpp 2011-03-01 20:24:25.000000000 +0100
-+++ kicad-2011.01.28-3.rev2795/3d-viewer/3d_draw.cpp 2011-04-04 19:14:26.000000000 +0200
-@@ -55,7 +55,11 @@
-
- void Pcb3D_GLCanvas::Redraw( bool finish )
- {
--#if wxCHECK_VERSION( 2, 9, 0 )
-+ /* SwapBuffer requires the window to be shown before calling */
-+ if( !IsShown() )
-+ return;
-+
-+#if wxCHECK_VERSION( 2, 7, 0 )
- SetCurrent( *m_glRC );
- #else
- SetCurrent();
-@@ -96,7 +100,7 @@
- }
-
- glFlush();
-- if( finish )
-+ if( finish );
- glFinish();
- SwapBuffers();
- }
-diff -ru kicad-2011.01.28-2.rev2795/3d-viewer/3d_frame.cpp kicad-2011.01.28-3.rev2795/3d-viewer/3d_frame.cpp
---- kicad-2011.01.28-2.rev2795/3d-viewer/3d_frame.cpp 2011-03-01 20:24:25.000000000 +0100
-+++ kicad-2011.01.28-3.rev2795/3d-viewer/3d_frame.cpp 2011-04-04 19:15:05.000000000 +0200
-@@ -78,7 +78,8 @@
- ReCreateVToolbar();
-
- // Make a Pcb3D_GLCanvas
-- m_Canvas = new Pcb3D_GLCanvas( this );
-+ int attrs[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER, WX_GL_DEPTH_SIZE, 16, 0 };
-+ m_Canvas = new Pcb3D_GLCanvas( this, attrs );
-
- m_auimgr.SetManagedWindow( this );
-
-diff -ru kicad-2011.01.28-2.rev2795/3d-viewer/3d_viewer.h kicad-2011.01.28-3.rev2795/3d-viewer/3d_viewer.h
---- kicad-2011.01.28-2.rev2795/3d-viewer/3d_viewer.h 2011-03-01 20:24:25.000000000 +0100
-+++ kicad-2011.01.28-3.rev2795/3d-viewer/3d_viewer.h 2011-04-04 19:15:55.000000000 +0200
-@@ -141,11 +141,11 @@
- /// Tracks whether to use Orthographic or Perspective projection
- //TODO: Does this belong here, or in WinEDA3D_DrawFrame ???
- bool m_ortho;
--#if wxCHECK_VERSION( 2, 9, 0 )
-+#if wxCHECK_VERSION( 2, 7, 0 )
- wxGLContext* m_glRC;
- #endif
- public:
-- Pcb3D_GLCanvas( WinEDA3D_DrawFrame* parent );
-+ Pcb3D_GLCanvas( WinEDA3D_DrawFrame* parent, int* attribList = 0 );
- ~Pcb3D_GLCanvas();
-
- void ClearLists();
diff --git a/kicad-2011.01.28-fix-build.patch b/kicad-2011.01.28-fix-build.patch
deleted file mode 100644
index 4b6c617..0000000
--- a/kicad-2011.01.28-fix-build.patch
+++ /dev/null
@@ -1,387 +0,0 @@
-diff -d -urpN kicad-2011.01.28/common/class_layerchoicebox.cpp kicad-origin/common/class_layerchoicebox.cpp
---- kicad-2011.01.28/common/class_layerchoicebox.cpp 2011-03-01 20:24:28.000000000 +0100
-+++ kicad-origin/common/class_layerchoicebox.cpp 1970-01-01 01:00:00.000000000 +0100
-@@ -1,180 +0,0 @@
--#include "common.h"
--#include "pcbnew.h"
--#include "wxPcbStruct.h"
--#include "class_board_design_settings.h"
--#include "colors_selection.h"
--
--#include "bitmaps.h"
--
--#include "hotkeys.h"
--#include "help_common_strings.h"
--
--#include <wx/ownerdrw.h>
--#include <wx/menuitem.h>
--#include <wx/bmpcbox.h>
--#include <wx/wx.h>
--
--#include "class_layerchoicebox.h"
--
--/* class to display a layer list.
-- *
-- */
--
--WinEDALayerChoiceBox::WinEDALayerChoiceBox( WinEDA_Toolbar* parent, wxWindowID id,
-- const wxPoint& pos, const wxSize& size,
-- int n, const wxString choices[] ) :
-- wxBitmapComboBox( parent, id, wxEmptyString, pos, size,
-- n, choices, wxCB_READONLY )
--{
-- m_layerorder = true;
-- m_layerhotkeys = true;
-- m_hotkeys = NULL;
--
-- if( choices != NULL )
-- ResyncBitmapOnly();
--}
--
--
--WinEDALayerChoiceBox::WinEDALayerChoiceBox( WinEDA_Toolbar* parent, wxWindowID id,
-- const wxPoint& pos, const wxSize& size,
-- const wxArrayString& choices ) :
-- wxBitmapComboBox( parent, id, wxEmptyString, pos, size,
-- choices, wxCB_READONLY )
--{
-- m_layerorder = true;
-- m_layerhotkeys = true;
-- m_hotkeys = NULL;
--
-- if( !choices.IsEmpty() )
-- ResyncBitmapOnly();
--}
--
--
--bool WinEDALayerChoiceBox::SetLayersOrdered( bool value )
--{
-- m_layerorder = value;
-- return m_layerorder;
--}
--
--
--bool WinEDALayerChoiceBox::SetLayersHotkeys( bool value )
--{
-- m_layerhotkeys = value;
-- return m_layerhotkeys;
--}
--
--
--// Get Current Item #
--int WinEDALayerChoiceBox::GetChoice()
--{
-- return GetSelection();
--}
--
--
--// Get Current Layer
--int WinEDALayerChoiceBox::GetLayerSelection()
--{
-- return (long) GetClientData( GetSelection() );
--}
--
--
--// Set Layer #
--int WinEDALayerChoiceBox::SetLayerSelection( int layer )
--{
-- int elements = GetCount();
--
-- for( int i = 0; i < elements; i++ )
-- {
-- if( GetClientData( i ) == (void*) layer )
-- {
-- if( GetSelection() != i ) // Element (i) is not selected
-- {
-- SetSelection( i );
-- return i;
-- }
-- else
-- return i; //If element already selected; do nothing
-- }
-- }
--
-- // Not Found
-- SetSelection( -1 );
-- return -1;
--}
--
--
--// Reload the Layers
--void WinEDALayerChoiceBox::Resync()
--{
-- WinEDA_BasePcbFrame* pcbFrame = (WinEDA_BasePcbFrame*) GetParent()->GetParent();
-- BOARD* board = pcbFrame->GetBoard();
--
-- wxASSERT( board != NULL );
--
-- Clear();
--
-- static DECLARE_LAYERS_ORDER_LIST( layertranscode );
-- static DECLARE_LAYERS_HOTKEY( layerhk );
--
-- for( int i = 0; i < LAYER_COUNT; i++ )
-- {
-- wxBitmap layerbmp( 14, 14 );
-- wxMemoryDC bmpDC;
-- wxBrush brush;
-- wxString layername;
-- int layerid = i;
--
-- if( m_layerorder )
-- layerid = layertranscode[i];
--
-- if( !board->IsLayerEnabled( layerid ) )
-- continue;
--
-- // Prepare Bitmap
-- bmpDC.SelectObject( layerbmp );
-- brush.SetColour( MakeColour( board->GetLayerColor( layerid ) ) );
-- brush.SetStyle( wxSOLID );
--
-- bmpDC.SetBrush( brush );
-- bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
-- bmpDC.SetBrush( *wxTRANSPARENT_BRUSH );
-- bmpDC.SetPen( *wxBLACK_PEN );
-- bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
--
-- layername = board->GetLayerName( layerid );
--
-- if( m_layerhotkeys && m_hotkeys != NULL )
-- layername = AddHotkeyName( layername, m_hotkeys, layerhk[layerid], false );
--
-- Append( layername, layerbmp, (void*) layerid );
-- }
--}
--
--void WinEDALayerChoiceBox::ResyncBitmapOnly()
--{
-- WinEDA_BasePcbFrame* pcbFrame = (WinEDA_BasePcbFrame*) GetParent()->GetParent();
-- BOARD* board = pcbFrame->GetBoard();
--
-- int elements = GetCount();
-- for( int i = 0; i < elements; i++ )
-- {
-- wxBitmap layerbmp( 14, 14 );
-- wxMemoryDC bmpDC;
-- wxBrush brush;
-- wxString layername;
-- int layerid = i;
--
-- // Prepare Bitmap
-- bmpDC.SelectObject( layerbmp );
-- brush.SetColour( MakeColour( board->GetLayerColor( layerid ) ) );
-- brush.SetStyle( wxSOLID );
--
-- bmpDC.SetBrush( brush );
-- bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
-- bmpDC.SetBrush( *wxTRANSPARENT_BRUSH );
-- bmpDC.SetPen( *wxBLACK_PEN );
-- bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
--
-- SetItemBitmap(i, layerbmp);
-- }
--}
-diff -d -urpN kicad-2011.01.28/common/CMakeLists.txt kicad-origin/common/CMakeLists.txt
---- kicad-2011.01.28/common/CMakeLists.txt 2011-03-01 20:24:28.000000000 +0100
-+++ kicad-origin/common/CMakeLists.txt 2011-03-21 23:58:27.691625676 +0100
-@@ -28,7 +28,6 @@ set(COMMON_SRCS
- block_commande.cpp
- build_version.cpp
- class_colors_design_settings.cpp
-- class_layerchoicebox.cpp
- class_marker_base.cpp
- class_plotter.cpp
- class_undoredo_container.cpp
-@@ -101,6 +100,7 @@ set(PCB_COMMON_SRCS
- ../pcbnew/classpcb.cpp
- ../pcbnew/collectors.cpp
- ../pcbnew/sel_layer.cpp
-+ ../pcbnew/class_layerchoicebox.cpp
- )
-
- add_library(pcbcommon ${PCB_COMMON_SRCS})
-diff -d -urpN kicad-2011.01.28/pcbnew/class_layerchoicebox.cpp kicad-origin/pcbnew/class_layerchoicebox.cpp
---- kicad-2011.01.28/pcbnew/class_layerchoicebox.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ kicad-origin/pcbnew/class_layerchoicebox.cpp 2011-03-01 20:24:28.000000000 +0100
-@@ -0,0 +1,180 @@
-+#include "common.h"
-+#include "pcbnew.h"
-+#include "wxPcbStruct.h"
-+#include "class_board_design_settings.h"
-+#include "colors_selection.h"
-+
-+#include "bitmaps.h"
-+
-+#include "hotkeys.h"
-+#include "help_common_strings.h"
-+
-+#include <wx/ownerdrw.h>
-+#include <wx/menuitem.h>
-+#include <wx/bmpcbox.h>
-+#include <wx/wx.h>
-+
-+#include "class_layerchoicebox.h"
-+
-+/* class to display a layer list.
-+ *
-+ */
-+
-+WinEDALayerChoiceBox::WinEDALayerChoiceBox( WinEDA_Toolbar* parent, wxWindowID id,
-+ const wxPoint& pos, const wxSize& size,
-+ int n, const wxString choices[] ) :
-+ wxBitmapComboBox( parent, id, wxEmptyString, pos, size,
-+ n, choices, wxCB_READONLY )
-+{
-+ m_layerorder = true;
-+ m_layerhotkeys = true;
-+ m_hotkeys = NULL;
-+
-+ if( choices != NULL )
-+ ResyncBitmapOnly();
-+}
-+
-+
-+WinEDALayerChoiceBox::WinEDALayerChoiceBox( WinEDA_Toolbar* parent, wxWindowID id,
-+ const wxPoint& pos, const wxSize& size,
-+ const wxArrayString& choices ) :
-+ wxBitmapComboBox( parent, id, wxEmptyString, pos, size,
-+ choices, wxCB_READONLY )
-+{
-+ m_layerorder = true;
-+ m_layerhotkeys = true;
-+ m_hotkeys = NULL;
-+
-+ if( !choices.IsEmpty() )
-+ ResyncBitmapOnly();
-+}
-+
-+
-+bool WinEDALayerChoiceBox::SetLayersOrdered( bool value )
-+{
-+ m_layerorder = value;
-+ return m_layerorder;
-+}
-+
-+
-+bool WinEDALayerChoiceBox::SetLayersHotkeys( bool value )
-+{
-+ m_layerhotkeys = value;
-+ return m_layerhotkeys;
-+}
-+
-+
-+// Get Current Item #
-+int WinEDALayerChoiceBox::GetChoice()
-+{
-+ return GetSelection();
-+}
-+
-+
-+// Get Current Layer
-+int WinEDALayerChoiceBox::GetLayerSelection()
-+{
-+ return (long) GetClientData( GetSelection() );
-+}
-+
-+
-+// Set Layer #
-+int WinEDALayerChoiceBox::SetLayerSelection( int layer )
-+{
-+ int elements = GetCount();
-+
-+ for( int i = 0; i < elements; i++ )
-+ {
-+ if( GetClientData( i ) == (void*) layer )
-+ {
-+ if( GetSelection() != i ) // Element (i) is not selected
-+ {
-+ SetSelection( i );
-+ return i;
-+ }
-+ else
-+ return i; //If element already selected; do nothing
-+ }
-+ }
-+
-+ // Not Found
-+ SetSelection( -1 );
-+ return -1;
-+}
-+
-+
-+// Reload the Layers
-+void WinEDALayerChoiceBox::Resync()
-+{
-+ WinEDA_BasePcbFrame* pcbFrame = (WinEDA_BasePcbFrame*) GetParent()->GetParent();
-+ BOARD* board = pcbFrame->GetBoard();
-+
-+ wxASSERT( board != NULL );
-+
-+ Clear();
-+
-+ static DECLARE_LAYERS_ORDER_LIST( layertranscode );
-+ static DECLARE_LAYERS_HOTKEY( layerhk );
-+
-+ for( int i = 0; i < LAYER_COUNT; i++ )
-+ {
-+ wxBitmap layerbmp( 14, 14 );
-+ wxMemoryDC bmpDC;
-+ wxBrush brush;
-+ wxString layername;
-+ int layerid = i;
-+
-+ if( m_layerorder )
-+ layerid = layertranscode[i];
-+
-+ if( !board->IsLayerEnabled( layerid ) )
-+ continue;
-+
-+ // Prepare Bitmap
-+ bmpDC.SelectObject( layerbmp );
-+ brush.SetColour( MakeColour( board->GetLayerColor( layerid ) ) );
-+ brush.SetStyle( wxSOLID );
-+
-+ bmpDC.SetBrush( brush );
-+ bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
-+ bmpDC.SetBrush( *wxTRANSPARENT_BRUSH );
-+ bmpDC.SetPen( *wxBLACK_PEN );
-+ bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
-+
-+ layername = board->GetLayerName( layerid );
-+
-+ if( m_layerhotkeys && m_hotkeys != NULL )
-+ layername = AddHotkeyName( layername, m_hotkeys, layerhk[layerid], false );
-+
-+ Append( layername, layerbmp, (void*) layerid );
-+ }
-+}
-+
-+void WinEDALayerChoiceBox::ResyncBitmapOnly()
-+{
-+ WinEDA_BasePcbFrame* pcbFrame = (WinEDA_BasePcbFrame*) GetParent()->GetParent();
-+ BOARD* board = pcbFrame->GetBoard();
-+
-+ int elements = GetCount();
-+ for( int i = 0; i < elements; i++ )
-+ {
-+ wxBitmap layerbmp( 14, 14 );
-+ wxMemoryDC bmpDC;
-+ wxBrush brush;
-+ wxString layername;
-+ int layerid = i;
-+
-+ // Prepare Bitmap
-+ bmpDC.SelectObject( layerbmp );
-+ brush.SetColour( MakeColour( board->GetLayerColor( layerid ) ) );
-+ brush.SetStyle( wxSOLID );
-+
-+ bmpDC.SetBrush( brush );
-+ bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
-+ bmpDC.SetBrush( *wxTRANSPARENT_BRUSH );
-+ bmpDC.SetPen( *wxBLACK_PEN );
-+ bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
-+
-+ SetItemBitmap(i, layerbmp);
-+ }
-+}
diff --git a/kicad-2011.01.28-real-version.patch b/kicad-2011.01.28-real-version.patch
deleted file mode 100644
index 2e09cc2..0000000
--- a/kicad-2011.01.28-real-version.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- common/build_version.cpp.orig 2011-03-01 20:24:28.000000000 +0100
-+++ common/build_version.cpp 2011-03-02 15:10:11.000000000 +0100
-@@ -6,11 +6,11 @@
- #endif
-
- #ifndef KICAD_BUILD_VERSION
--#define KICAD_BUILD_VERSION "(2011-01-26 BZR 2759)"
-+#define KICAD_BUILD_VERSION "(2011-01-28 BZR 2765)"
- #endif
-
--//#define VERSION_STABILITY "stable"
--#define VERSION_STABILITY "testing"
-+#define VERSION_STABILITY "stable"
-+//#define VERSION_STABILITY "testing"
-
-
- /**
diff --git a/kicad-2011.07.12-fix-linking.patch b/kicad-2011.07.12-fix-linking.patch
new file mode 100644
index 0000000..85ad839
--- /dev/null
+++ b/kicad-2011.07.12-fix-linking.patch
@@ -0,0 +1,10 @@
+--- common/CMakeLists.txt.orig 2011-06-17 18:15:55.000000000 +0200
++++ common/CMakeLists.txt 2011-07-12 19:26:20.000000000 +0200
+@@ -67,6 +67,7 @@
+ wxwineda.cpp
+ xnode.cpp
+ zoom.cpp
++ ../pcbnew/class_drc_item.cpp
+ )
+
+ add_library(common ${COMMON_SRCS})
diff --git a/kicad-2011.07.12-real-version.patch b/kicad-2011.07.12-real-version.patch
new file mode 100644
index 0000000..ae78c3c
--- /dev/null
+++ b/kicad-2011.07.12-real-version.patch
@@ -0,0 +1,11 @@
+--- common/build_version.cpp.orig 2011-07-12 19:16:32.000000000 +0200
++++ common/build_version.cpp 2011-07-12 19:22:59.000000000 +0200
+@@ -6,7 +6,7 @@
+ #endif
+
+ #ifndef KICAD_BUILD_VERSION
+-#define KICAD_BUILD_VERSION "(2011-07-08)"
++#define KICAD_BUILD_VERSION "(2011-07-12 BZR 3047)"
+ #endif
+
+
diff --git a/kicad.spec b/kicad.spec
index ca4efc1..6064cd7 100644
--- a/kicad.spec
+++ b/kicad.spec
@@ -1,6 +1,6 @@
Name: kicad
-Version: 2011.01.28
-Release: 3.rev2765%{?dist}
+Version: 2011.07.12
+Release: 1.rev3047%{?dist}
Summary: Electronic schematic diagrams and printed circuit board artwork
Summary(fr): Saisie de schéma électronique et routage de circuit imprimé
@@ -9,9 +9,9 @@ License: GPLv2+
URL: https://launchpad.net/kicad
# Source files created from upstream's bazaar repository
-# bzr export -r 2765 kicad-2011.01.28
-# bzr export -r 109 kicad-libraries-2011.01.28
-# bzr export -r 163 kicad-doc-2011.01.28
+# bzr export -r 3047 kicad-2011.07.12
+# bzr export -r 109 kicad-libraries-07.12
+# bzr export -r 225 kicad-doc-2011.07.12
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-doc-%{version}.tar.bz2
@@ -20,10 +20,10 @@ Source3: %{name}-ld.conf
Source4: %{name}-2010.05.09.x-kicad-pcbnew.desktop
Source5: pcbnew.desktop
Source6: %{name}-icons.tar.bz2
+Source7: Epcos-MKT-1.0.tar.bz2
Patch10: %{name}-%{version}-real-version.patch
-Patch11: %{name}-%{version}-fix-build.patch
-Patch12: %{name}-%{version}-3DViewer-crash.patch
+Patch11: %{name}-%{version}-fix-linking.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -134,6 +134,19 @@ BuildArch: noarch
Documentation and tutorials for Kicad in Italian
+%package doc-pl
+Summary: Documentation for Kicad in Polish
+Summary(fr): Documentations pour kicad en polonais
+Group: Documentation
+Requires: %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch: noarch
+%endif
+
+%description doc-pl
+Documentation and tutorials for Kicad in Polish
+
+
%package doc-pt
Summary: Documentation for Kicad in Portuguese
Summary(fr): Documentations pour kicad en portugais
@@ -174,11 +187,10 @@ Documentation and tutorials for Kicad in Chinese
%prep
-%setup -q -a 1 -a 2 -a 6
+%setup -q -a 1 -a 2 -a 6 -a 7
-%patch10 -p0 -b .real-version
-%patch11 -p1 -b .fix-build
-%patch12 -p1 -b .3Dviewer-crash
+%patch10 -p1 -b .real-version
+%patch11 -p1 -b .fix-linking
#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
@@ -193,11 +205,17 @@ iconv -f iso8859-1 -t utf-8 AUTHORS.txt > AUTHORS.conv && mv -f AUTHORS.conv AUT
%build
+# Add Epcos library
+cd Epcos-MKT-1.0
+cp -pR library ../%{name}-libraries-%{version}/
+cp -pR modules ../%{name}-libraries-%{version}/
+cd ..
+
#
# Symbols libraries
#
pushd %{name}-libraries-%{version}/
-%cmake -DCMAKE_BUILD_TYPE=Release .
+%cmake -DKICAD_STABLE_VERSION=ON
%{__make} %{?_smp_mflags} VERBOSE=1
popd
@@ -205,7 +223,7 @@ popd
#
# Core components
#
-%cmake -DCMAKE_BUILD_TYPE=Release
+%cmake -DKICAD_STABLE_VERSION=ON
%{__make} %{?_smp_mflags} VERBOSE=1
@@ -219,7 +237,7 @@ 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 -m 644 -D ${dir}/%{name}.mo %{buildroot}%{_datadir}/locale/${dir}/%{name}.mo
+ install -m 644 -D ${dir}/%{name}.mo %{buildroot}%{_datadir}/locale/${dir}/LC_MESSAGES/%{name}.mo
done
cd ../..
@@ -385,6 +403,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%defattr(-,root,root,-)
%doc %{_docdir}/%{name}/help/it
+%files doc-pl
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}/help/pl
+
%files doc-pt
%defattr(-,root,root,-)
%doc %{_docdir}/%{name}/help/pt
@@ -400,6 +422,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Mon Jul 12 2011 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2011.07.12-1.rev3047
+- New upstream version
+- Update versioning patch
+- Add Polish documentation
+- Add Epcos MKT capacitors library
+- Fix localisation installation path
+
* Mon Apr 4 2011 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2011.01.28-3.rev2765
- Fix 3D viewer crash (BZ #693008)
diff --git a/sources b/sources
index e5200ef..7695346 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
-7b8eee890ae6505f6e3fd647885921f4 kicad-2011.01.28.tar.bz2
-68edb60747234183dfdb0d89fea7d908 kicad-doc-2011.01.28.tar.bz2
-6d1821eaf22301dc1f21123415bd3d4d kicad-libraries-2011.01.28.tar.bz2
+0d189ead83da60ce086cb64594bc4621 kicad-2011.07.12.tar.bz2
+d81bd043824d44188b39bd71f73b2755 kicad-doc-2011.07.12.tar.bz2
+f5016e1e6ad9be8677091c9e3f8867d3 kicad-libraries-2011.07.12.tar.bz2
+4dba5eca85fcec9bba491c1815963f80 Epcos-MKT-1.0.tar.bz2
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/kicad.git/commit/?h=epel7&id=b9a3639158c4384e30016a8f15f3e095e12331a3
More information about the scm-commits
mailing list