[kicad/f18] - New upstream release - Added symbols and modules (with 3d view) from Walter Lain

Alain Portal dionysos at fedoraproject.org
Sun Jun 23 12:34:56 UTC 2013 

commit afbe70aff9775872ca93a88c590da0078e1df77f
Author: Alain Portal <alain.portal at univ-montp2.fr>
Date:   Sun Jun 23 14:34:37 2013 +0200

    - New upstream release
    - Added symbols and modules (with 3d view) from Walter Lain

 ....12-boost-polygon-declare-gtlsort-earlier.patch |   11 -
 kicad-2011.07.12-fix-linking.patch                 |   10 -
 kicad-2012.01.19-cvpcb-preview.rev3303.patch       |  152 ----
 kicad-2012.01.19-fix-bom-in-python.patch           |   17 -
 kicad-2012.01.19-fix-linking.patch                 |   11 -
 kicad-2012.01.19-fix-plotting-scale.patch          |   11 -
 ...012.01.19-move-up-junction-button.rev3371.patch |   21 -
 kicad-2012.01.19-pcb-calculation.rev3328.patch     |   11 -
 ...1.19-ps-plotting-width-correction.rev3342.patch |  740 --------------------
 kicad-2012.01.19-real-version.patch                |   14 -
 kicad-2012.01.19-thermal-relief.rev3281.patch      |   13 -
 kicad-2012.01.19-undo-redo-auto.rev3297.patch      |  177 -----
 kicad.spec                                         |   82 +--
 sources                                            |    7 +-
 14 files changed, 43 insertions(+), 1234 deletions(-)
---
diff --git a/kicad.spec b/kicad.spec
index fb82a27..c474e57 100644
--- a/kicad.spec
+++ b/kicad.spec
@@ -1,6 +1,6 @@
 Name:           kicad
-Version:        2012.01.19
-Release:        2.rev3256%{?dist}
+Version:        2013.06.11
+Release:        1.rev4021%{?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,13 @@ License:        GPLv2+
 URL:            https://launchpad.net/kicad
 
 # Source files created from upstream's bazaar repository
-# bzr export -r 3256 kicad-2012.01.19
-# bzr export -r 114 kicad-libraries-2012.01.19
-# bzr export -r 309 kicad-doc-2012.01.19
+# bzr export -r 4021 kicad-2013.06.11
+# bzr export -r 263 kicad-libraries-2013.06.11
+# bzr export -r 464 kicad-doc-2013.06.11
+
+# Additional librairies from Walter Lain
+# http://smisioto.no-ip.org/elettronica/kicad/kicad-en.htm
+# kicad-walter-libraries is manually built by downloading all available files
 
 Source:         %{name}-%{version}.tar.bz2
 Source1:        %{name}-doc-%{version}.tar.bz2
@@ -21,20 +25,7 @@ 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}-2011.07.12-fix-linking.patch
-Patch12:        %{name}-2011.07.12-boost-polygon-declare-gtlsort-earlier.patch
-Patch13:        %{name}-%{version}-fix-linking.patch
-Patch14:        %{name}-%{version}-fix-bom-in-python.patch
-
-Patch20:        %{name}-%{version}-fix-plotting-scale.patch
-Patch21:        %{name}-%{version}-move-up-junction-button.rev3371.patch
-Patch22:        %{name}-%{version}-thermal-relief.rev3281.patch
-Patch23:        %{name}-%{version}-undo-redo-auto.rev3297.patch
-Patch24:        %{name}-%{version}-cvpcb-preview.rev3303.patch
-Patch25:        %{name}-%{version}-pcb-calculation.rev3328.patch
-Patch26:        %{name}-%{version}-ps-plotting-width-correction.rev3342.patch
+Source8:        %{name}-walter-libraries-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -146,6 +137,19 @@ BuildArch:      noarch
 Documentation and tutorials for Kicad in Italian
 
 
+%package        doc-ja
+Summary:        Documentation for Kicad in Japanese
+Summary(fr):    Documentations pour kicad en japonais
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+%description    doc-ja
+Documentation and tutorials for Kicad in Japanese
+
+
 %package        doc-pl
 Summary:        Documentation for Kicad in Polish
 Summary(fr):    Documentations pour kicad en polonais
@@ -199,21 +203,7 @@ Documentation and tutorials for Kicad in Chinese
 
 
 %prep
-%setup -q -a 1 -a 2 -a 6 -a 7
-
-%patch10 -p0 -b .real-version
-%patch11 -p0 -b .fix-linking1
-%patch12 -p0 -b .gcc-4.7
-%patch13 -p0 -b .fix-linking2
-%patch14 -p1 -b .fix-bom-in-python
-
-%patch20 -p0 -b .fix-plotting-scale
-%patch21 -p0 -b .junction-button
-%patch22 -p0 -b .thermal-relief
-%patch23 -p1 -b .undo-redo
-%patch24 -p1 -b .cvpcb-preview
-%patch25 -p0 -b .pcb-calculation
-%patch26 -p1 -b .width-correction
+%setup -q -a 1 -a 2 -a 6 -a 7 -a 8
 
 #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
@@ -234,6 +224,12 @@ cp -pR library ../%{name}-libraries-%{version}/
 cp -pR modules ../%{name}-libraries-%{version}/
 cd ..
 
+# Add Walter libraries
+cd %{name}-walter-libraries-%{version}
+cp -pR library ../%{name}-libraries-%{version}/
+cp -pR modules ../%{name}-libraries-%{version}/
+cd ..
+
 #
 # Symbols libraries
 #
@@ -283,15 +279,6 @@ desktop-file-install \
   --remove-category Development              \
   %{SOURCE5}
 
-# Missing requires libraries
-%{__cp} -p ./3d-viewer/lib3d-viewer.so %{buildroot}%{_libdir}/%{name}
-%{__cp} -p ./bitmaps_png/libbitmaps.so %{buildroot}%{_libdir}/%{name}
-%{__cp} -p ./common/libcommon.so %{buildroot}%{_libdir}/%{name}
-%{__cp} -p ./polygon/kbool/src/libkbool.so %{buildroot}%{_libdir}/%{name}
-%{__cp} -p ./common/libpcbcommon.so %{buildroot}%{_libdir}/%{name}
-%{__cp} -p ./polygon/libpolygon.so %{buildroot}%{_libdir}/%{name}
-%{__cp} -p ./potrace/libpotrace.so %{buildroot}%{_libdir}/%{name}
-
 #
 # Symbols libraries
 #
@@ -423,6 +410,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc %{_docdir}/%{name}/help/it
 %doc %{_docdir}/%{name}/tutorials/it
 
+%files doc-ja
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}/help/ja
+%doc %{_docdir}/%{name}/tutorials/ja
+
 %files doc-pl
 %defattr(-,root,root,-)
 %doc %{_docdir}/%{name}/help/pl
@@ -443,6 +435,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Jun 22 2013 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2013.06.11-1.rev4021
+- New upstream release
+- Added symbols and modules (with 3d view) from Walter Lain
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2012.01.19-2.rev3256
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 37eb9e7..627de23 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,5 @@
-ad3ed5d41c6c5d5d520ec2f8cc6be623  kicad-2012.01.19.tar.bz2
-066a3af7bd4fbee7767758dd412fdbc7  kicad-libraries-2012.01.19.tar.bz2
-b4e8c57d915674a2df1ff99de314e15c  kicad-doc-2012.01.19.tar.bz2
+82ed9a23b9ef332621210eafd08101c2  kicad-2013.06.11.tar.bz2
+5b35e2f2e022fa4be6a03021a6c04493  kicad-libraries-2013.06.11.tar.bz2
+9eba6363258b9efb552222b24b4630f2  kicad-walter-libraries-2013.06.11.tar.bz2
+2ef38e351202f80f700a4ae96f898336  kicad-doc-2013.06.11.tar.bz2
 4dba5eca85fcec9bba491c1815963f80  Epcos-MKT-1.0.tar.bz2

More information about the scm-commits mailing list