Hello community, here is the log from the commit of package kicad for openSUSE:Factory checked in at 2018-09-04 22:53:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kicad (Old) and /work/SRC/openSUSE:Factory/.kicad.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kicad" Tue Sep 4 22:53:48 2018 rev:24 rq:627120 version:5.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kicad/kicad.changes 2018-05-29 10:44:39.241081250 +0200 +++ /work/SRC/openSUSE:Factory/.kicad.new/kicad.changes 2018-09-04 22:54:41.908699102 +0200 @@ -1,0 +2,14 @@ +Wed Jul 25 08:51:47 UTC 2018 - [email protected] + +- Update to new release version 5.0.0 +- Removed incorporated patches: + kicad-4.0.7-remove-internal-CheckCXXSymbolExists.patch, + kicad-boost-1_61-boost-context-changes.patch and + kicad-set-cxx-version.patch. +- Rebased kicad-user-library.patch. +- Upstream changes: + This version has many new features and improvments over 4.0.7. + See kicad-pcb.org/blog/2018/07/KiCad-5--a-new-generation/ for + all the details. + +------------------------------------------------------------------- Old: ---- kicad-4.0.7-remove-internal-CheckCXXSymbolExists.patch kicad-4.0.7.tar.xz kicad-boost-1_61-boost-context-changes.patch kicad-set-cxx-version.patch New: ---- kicad-5.0.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kicad.spec ++++++ --- /var/tmp/diff_new_pack.4o7Tef/_old 2018-09-04 22:54:42.776702071 +0200 +++ /var/tmp/diff_new_pack.4o7Tef/_new 2018-09-04 22:54:42.784702098 +0200 @@ -1,7 +1,7 @@ # # spec file for package kicad # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: kicad -Version: 4.0.7 +Version: 5.0.0 Release: 0 Summary: EDA software suite for the creation of schematics and PCB License: GPL-2.0-or-later AND GPL-3.0-or-later Group: Productivity/Scientific/Electronics Url: http://kicad-pcb.org -Source: https://launchpad.net/kicad/4.0/%{version}/+download/kicad-%{version}.tar.xz +Source: https://launchpad.net/kicad/5.0/%{version}/+download/kicad-%{version}.tar.xz # License file was removed due to GPL-3.0+ code # https://github.com/KiCad/kicad-source-mirror/commit/681090b8ef3a362af75e8ca4417e18622747b63b Source2: COPYRIGHT.txt @@ -34,14 +34,7 @@ # PATCH-FIX-OPENSUSE [email protected] -kicad-suse-help-path.patch - kicad looks in /usr/share/doc/kicad for help files and doesn't find them. # this patch adds packges/ befor kicad. Patch3: kicad-suse-help-path.patch -%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 -# PATCH-FIX-UPSTREAM kicad-boost-1_61-boost-context-changes.patch -- Fix build with boost 1.61 -Patch4: kicad-boost-1_61-boost-context-changes.patch -# PATCH-OPENSUSE kicad-set-cxx-standard.diff -- use C++14 by default and decay to 11, required by boost 1.61 patch -Patch5: kicad-set-cxx-version.patch -%endif -# PATCH-FIX-UPSTREAM kicad-4.0.7-remove-internal-CheckCXXSymbolExists.patch -- Fix build with latest CMake, picked from upstream -Patch6: kicad-4.0.7-remove-internal-CheckCXXSymbolExists.patch + %if 0%{?suse_version} > 1325 BuildRequires: libboost_context-devel BuildRequires: libboost_filesystem-devel @@ -49,6 +42,7 @@ BuildRequires: libboost_locale-devel BuildRequires: libboost_program_options-devel BuildRequires: libboost_regex-devel +BuildRequires: libboost_test-devel BuildRequires: libboost_thread-devel %else BuildRequires: boost-devel >= 1.56 @@ -58,9 +52,12 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libcurl-devel +BuildRequires: libngspice-devel +BuildRequires: oce-devel BuildRequires: pkg-config BuildRequires: python-devel BuildRequires: update-desktop-files +BuildRequires: cmake(glm) # Use direct version to avoid problems with wx 3.2 BuildRequires: wxWidgets-3_0-devel >= 3 # Fix bug in old python-wxWidgets-3_0-devel @@ -78,9 +75,10 @@ Requires: python-wxWidgets-3_0 >= 3 # The help function doesn't work without the doc package Requires: %{name}-doc = %{version} -Recommends: %{name}-library = %{version} +Requires: %{name}-symbols = %{version} Recommends: %{name}-library-install = %{version} Recommends: %{name}-footprints = %{version} +Recommends: %{name}-packages3D Obsoletes: kicad = 20140120 %description @@ -112,12 +110,6 @@ %patch1 -p0 %patch2 -p1 %patch3 -# patch requires C++11, CMAKE_CXX_STANDARD requires cmake 3.1 -> Leap 42.1 or TW -%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 -%patch4 -%patch5 -p0 -%endif -%patch6 -p1 cp %{SOURCE2} . @@ -125,6 +117,9 @@ sed -i 's|KICAD_PLUGINS lib/kicad/plugins|KICAD_PLUGINS %{_lib}/kicad/plugins|' CMakeLists.txt # Fix documentation directory sed -i 's|KICAD_DOCS share/doc/kicad|KICAD_DOCS share/doc/packages/kicad|' CMakeLists.txt +# Fix python shebangs +for i in `grep -rl "/usr/bin/env python"`;do sed -i '1s/^#!.*/#!\/usr\/bin\/python2/' ${i} ;done +for i in `grep -rl "/usr/bin/env python2"`;do sed -i '1s/^#!.*/#!\/usr\/bin\/python2/' ${i} ;done %build export CFLAGS="%{optflags} -fPIE" @@ -147,15 +142,23 @@ find %{buildroot}%{_datadir}/kicad/scripting/plugins -name "*.py" -exec chmod 0644 "{}" "+" #Change permissions back for executable scripts chmod -f 0755 `find %{buildroot}%{_datadir}/kicad/scripting/plugins -name "*.py" -perm 0644 -print0|xargs -0r grep -l '#!/usr'` +# Move scripts under doc to kicad directory. +mv %{buildroot}%{_datadir}/doc/%{name}/scripts %{buildroot}%{_datadir}/%{name} +rm -rf %{buildroot}%{_datadir}/doc +chmod -f 0755 `find %{buildroot}%{_datadir}/kicad/scripts -name "*py" -perm 0644 -print0|xargs -0r grep -l '#!/usr'` +chmod -f 0755 `find %{buildroot}%{_datadir}/kicad/scripts -name "*sh" -perm 0644 -print0|xargs -0r grep -l '#!/bin'` +chmod 0644 %{buildroot}%{_datadir}/kicad/scripting/kicad_pyshell/__init__.py %suse_update_desktop_file -r bitmap2component "Education;Engineering" -%suse_update_desktop_file -r cvpcb "Education;Engineering" %suse_update_desktop_file -r eeschema "Education;Engineering" %suse_update_desktop_file -r gerbview "Education;Engineering" %suse_update_desktop_file -r kicad "Education;Engineering" %suse_update_desktop_file -r pcbcalculator "Education;Engineering" %suse_update_desktop_file -r pcbnew "Education;Engineering" +# Link to library libkicad_3dsg.so.2.0.0 has no use +rm -rf %{buildroot}%{_libdir}/libkicad_3dsg.so + install -D scripts/library-repos-install.sh %{buildroot}%{_bindir}/kicad-library-install.sh %fdupes -s %{buildroot}%{_datadir}/kicad @@ -163,33 +166,37 @@ %if 0%{?suse_version} < 1330 %post +/sbin/ldconfig %desktop_database_post %icon_theme_cache_post %mime_database_post %postun +/sbin/ldconfig %desktop_database_postun %icon_theme_cache_postun %mime_database_postun +%else +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig %endif %files %defattr(-,root,root) -%doc CHANGELOG.txt +%doc README.txt Documentation/changelogs %license COPYRIGHT.txt %{_bindir}/* %exclude %{_bindir}/kicad-library-install.sh %{_libdir}/kicad/ %{_datadir}/kicad/ -%{_datadir}/doc/packages/kicad/ %{python_sitelib}/* +%{_datadir}/appdata/kicad.appdata.xml %{_datadir}/applications/*.desktop -%{_datadir}/mime/packages/kicad.xml -%{_datadir}/mimelnk/application/x-kicad-*.desktop -%dir %{_datadir}/mimelnk/ -%dir %{_datadir}/mimelnk/application/ +%{_datadir}/mime/packages/%{name}-*.xml %{_datadir}/icons/hicolor/*/mimetypes/application-x-* %{_datadir}/icons/hicolor/*/apps/*.* +%{_libdir}/libkicad_3dsg.so.2.0.0 %files library-install %defattr(-,root,root) ++++++ kicad-4.0.7.tar.xz -> kicad-5.0.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kicad/kicad-4.0.7.tar.xz /work/SRC/openSUSE:Factory/.kicad.new/kicad-5.0.0.tar.xz differ: char 25, line 1 ++++++ kicad-user-library.patch ++++++ --- /var/tmp/diff_new_pack.4o7Tef/_old 2018-09-04 22:54:42.840702290 +0200 +++ /var/tmp/diff_new_pack.4o7Tef/_new 2018-09-04 22:54:42.840702290 +0200 @@ -1,16 +1,16 @@ Index: common/kiface_i.cpp =================================================================== ---- common/kiface_i.cpp.orig -+++ common/kiface_i.cpp -@@ -53,6 +53,7 @@ static void setSearchPaths( SEARCH_STACK +--- common/kiface_i.cpp.orig 2018-07-13 21:53:52.000000000 +0200 ++++ common/kiface_i.cpp 2018-07-20 16:03:55.529317649 +0200 +@@ -54,6 +54,7 @@ static void setSearchPaths( SEARCH_STACK fn.AppendDir( wxT( "library" ) ); aDst->AddPaths( fn.GetPath() ); -+ ++ fn.AppendDir( wxT( "doc" ) ); aDst->AddPaths( fn.GetPath() ); -@@ -60,6 +61,13 @@ static void setSearchPaths( SEARCH_STACK +@@ -61,6 +62,13 @@ static void setSearchPaths( SEARCH_STACK fn.RemoveLastDir(); fn.RemoveLastDir(); // "../../" up twice, removing library/doc/ } @@ -20,7 +20,7 @@ + aDst->AddPaths( homeDir + wxT( "/.local/share/kicad/library-repos/kicad-library/modules" ) ); + aDst->AddPaths( homeDir + wxT( "/.local/share/kicad/library-repos/kicad-library/modules/packages3d" ) ); + aDst->AddPaths( homeDir + wxT( "/.local/share/kicad/library-repos/kicad-library/template" ) ); -+ ++ // Add PCB library file path to search path list. if( aId == KIWAY::FACE_PCB || aId == KIWAY::FACE_CVPCB )
