lkundrak pushed to kicad (epel7). "- Update to the latest available revisions (..more)"

Fri Jun 5 07:28:20 UTC 2015

From 0a0f27cb720f2c6cda18c6a9b78105b54095d086 Mon Sep 17 00:00:00 2001
From: Jaromir Capik <jcapik at redhat.com>
Date: Thu, 13 Mar 2014 22:55:23 +0100
Subject: - Update to the latest available revisions - Creating scripts for
 source downloading & postprocessing - Fixing bogus dates in the changelog

diff --git a/.gitignore b/.gitignore
index 2c5df42..c6a6e08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,7 @@ kicad-libraries-2010.05.27.tar.bz2
 /kicad-libraries-2013.06.11.tar.bz2
 /kicad-walter-libraries-2013.06.11.tar.bz2
 /kicad-doc-2013.06.11.tar.bz2
+/kicad-2014.03.13.tar.xz
+/kicad-libraries-2014.03.13.tar.xz
+/kicad-doc-2014.03.13.tar.xz
+/kicad-walter-libraries-2014.03.13.tar.xz
diff --git a/kicad-2010.05.09.x-kicad-pcbnew.desktop b/kicad-2010.05.09.x-kicad-pcbnew.desktop
deleted file mode 100644
index 4c612d5..0000000
--- a/kicad-2010.05.09.x-kicad-pcbnew.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=MimeType
-MimeType=application/x-kicad-pcbnew
-Icon=pcbnew
-Patterns=*.brd
-Comment=KiCad PCB
-Comment[fr]=Circuit imprimé KiCad
diff --git a/kicad-clone.sh b/kicad-clone.sh
new file mode 100755
index 0000000..d6ac8ec
--- /dev/null
+++ b/kicad-clone.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+bzr checkout lp:kicad kicad.bzr
+bzr checkout lp:~kicad-product-committers/kicad/library kicad-library.bzr
+bzr branch --stacked lp:~kicad-developers/kicad/doc kicad-doc.bzr
diff --git a/kicad-export.sh b/kicad-export.sh
new file mode 100755
index 0000000..b680b92
--- /dev/null
+++ b/kicad-export.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+TIMESTAMP="2014.03.13"
+MAIN_REV=4744
+LIB_REV=333
+DOC_REV=560
+
+cd kicad.bzr
+bzr export -r $MAIN_REV kicad-$TIMESTAMP
+echo "Creating kicad-$TIMESTAMP.tar.xz ..."
+tar cJf kicad-$TIMESTAMP.tar.xz kicad-$TIMESTAMP
+cd ../kicad-library.bzr
+bzr export -r $LIB_REV kicad-libraries-$TIMESTAMP
+echo "Creating kicad-libraries-$TIMESTAMP.tar.xz ..."
+tar cJf kicad-libraries-$TIMESTAMP.tar.xz kicad-libraries-$TIMESTAMP
+cd ../kicad-doc.bzr
+bzr export -r $DOC_REV kicad-doc-$TIMESTAMP
+echo "Creating kicad-doc-$TIMESTAMP.tar.xz ..."
+tar cJf kicad-doc-$TIMESTAMP.tar.xz kicad-doc-$TIMESTAMP
+cd ..
diff --git a/kicad-icons.tar.bz2 b/kicad-icons.tar.bz2
deleted file mode 100644
index bed1433..0000000
Binary files a/kicad-icons.tar.bz2 and /dev/null differ
diff --git a/kicad-ld.conf b/kicad-ld.conf
deleted file mode 100644
index a1aa597..0000000
--- a/kicad-ld.conf
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/kicad
diff --git a/kicad-update.sh b/kicad-update.sh
new file mode 100755
index 0000000..5ce43df
--- /dev/null
+++ b/kicad-update.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+cd kicad.bzr
+bzr update
+cd ../kicad-library.bzr
+bzr update
+cd ../kicad-doc.bzr
+bzr update
+cd ..
diff --git a/kicad-walter-libs.sh b/kicad-walter-libs.sh
new file mode 100755
index 0000000..82b4da6
--- /dev/null
+++ b/kicad-walter-libs.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+TIMESTAMP="2014.03.13"
+
+mkdir -p kicad-walter
+cd kicad-walter
+wget -r -l 1 -A zip http://smisioto.no-ip.org/elettronica/kicad/kicad-en.htm
+cd smisioto.no-ip.org/kicad_libs/library
+for i in *.zip ; do
+  unzip -o $i
+  rm -f $i
+done
+mv -f power.dcm w_power.dcm
+mv -f power.lib w_power.lib
+mv -f license.txt w_license.txt
+cd ../modules
+mv -f ../packages3d/* ./
+for i in *.zip ; do
+  unzip -o $i
+  rm -f $i
+done
+mv -f license.txt w_license.txt
+cd ..
+rmdir packages3d
+cd ..
+mv -f kicad_libs kicad-walter-libraries-$TIMESTAMP
+echo "Creating kicad-walter-libraries-$TIMESTAMP.tar.xz ..."
+tar cJf kicad-walter-libraries-$TIMESTAMP.tar.xz kicad-walter-libraries-$TIMESTAMP
diff --git a/kicad.spec b/kicad.spec
index acc19b6..5ec3334 100644
--- a/kicad.spec
+++ b/kicad.spec
@@ -1,37 +1,35 @@
 Name:           kicad
-Version:        2013.06.11
-Release:        2.rev4021%{?dist}
+Version:        2014.03.13
+Release:        1.rev4744%{?dist}
 Summary:        Electronic schematic diagrams and printed circuit board artwork
 Summary(fr):    Saisie de schéma électronique et routage de circuit imprimé
 
 Group:          Applications/Engineering
 License:        GPLv2+
-URL:            https://launchpad.net/kicad
+URL:            http://www.kicad-pcb.org
+# URL2:         https://launchpad.net/kicad
+# URL3:         http://orson.net.pl/pub/kicad/
+# Additional librairies from Walter Lain
+# URL4:         http://smisioto.no-ip.org/elettronica/kicad/kicad-en.htm
 
-# Source files created from upstream's bazaar repository
-# 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
+# Source files created with the following scripts ...
+#   kicad-clone.sh ... clone BZR repositories of main, libraries, doc
+#   kicad-update.sh ... update BZR repositories
+#   kicad-export.sh ... export BZR repositories and create tarballs
+#   kicad-walter-libs.sh ... download, unpack and prepare tarball with walter libs
 
-# 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
-Source2:        %{name}-libraries-%{version}.tar.bz2
-#Source3:        %{name}-ld.conf
-Source4:        %{name}-2010.05.09.x-kicad-pcbnew.desktop
-Source5:        pcbnew.desktop
-Source6:        %{name}-icons.tar.bz2
+Source:         %{name}-%{version}.tar.xz
+Source1:        %{name}-doc-%{version}.tar.xz
+Source2:        %{name}-libraries-%{version}.tar.xz
 Source7:        Epcos-MKT-1.0.tar.bz2
-Source8:        %{name}-walter-libraries-%{version}.tar.bz2
+Source8:        %{name}-walter-libraries-%{version}.tar.xz
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  wxGTK-devel
 BuildRequires:  boost-devel
 BuildRequires:  cmake
 BuildRequires:  doxygen
+BuildRequires:  glew-devel
 
 Requires:       electronics-menu
 
@@ -177,7 +175,7 @@ Documentation and tutorials for Kicad in Chinese
 
 
 %prep
-%setup -q -a 1 -a 2 -a 6 -a 7 -a 8
+%setup -q -a 1 -a 2 -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
@@ -208,7 +206,7 @@ cd ..
 # Symbols libraries
 #
 pushd %{name}-libraries-%{version}/
-%cmake -DKICAD_STABLE_VERSION=ON
+%cmake -DKICAD_STABLE_VERSION=OFF
 %{__make} %{?_smp_mflags} VERBOSE=1
 popd
 
@@ -216,7 +214,7 @@ popd
 #
 # Core components
 #
-%cmake -DKICAD_STABLE_VERSION=ON
+%cmake -DKICAD_STABLE_VERSION=OFF -DKICAD_SKIP_BOOST=ON
 %{__make} %{?_smp_mflags} VERBOSE=1
 
 
@@ -236,22 +234,13 @@ cd ../..
 
 
 # install desktop
-desktop-file-install \
+for desktopfile in %{buildroot}%{_datadir}/applications/*.desktop ; do
+  desktop-file-install \
   --dir %{buildroot}%{_datadir}/applications \
   --remove-category Development              \
   --delete-original                          \
-  %{buildroot}%{_datadir}/applications/kicad.desktop
-
-desktop-file-install \
-  --dir %{buildroot}%{_datadir}/applications \
-  --remove-category Development              \
-  --delete-original                          \
-  %{buildroot}%{_datadir}/applications/eeschema.desktop
-
-desktop-file-install \
-  --dir %{buildroot}%{_datadir}/applications \
-  --remove-category Development              \
-  %{SOURCE5}
+  ${desktopfile}
+done
 
 #
 # Symbols libraries
@@ -260,41 +249,10 @@ pushd %{name}-libraries-%{version}/
 %{__make} INSTALL="install -p" DESTDIR=%{buildroot} install
 popd
 
-# install ld.conf
-# install -m 644 -D -p %{SOURCE3} %{buildroot}%{_sysconfdir}/ld.so.conf.d/kicad.conf
-
 # install template
 install -d %{buildroot}%{_datadir}/%{name}/template
 install -m 644 template/%{name}.pro %{buildroot}%{_datadir}/%{name}/template
 
-# install new mime type
-install -pm 644 %{SOURCE4} %{buildroot}%{_datadir}/mimelnk/application/x-%{name}-pcbnew.desktop
-
-# install mimetype and application icons
-install -pm 644 %{name}-icons/resources/linux/mime/icons/hicolor/32x32/mimetypes/application-x-kicad-eeschema.png %{buildroot}%{_datadir}/icons/hicolor/32x32/mimetypes/application-x-kicad-eeschema.png
-install -m 644 -D -p %{name}-icons/resources/linux/mime/icons/hicolor/32x32/apps/eeschema.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/eeschema.png
-install -pm 644 %{name}-icons/resources/linux/mime/icons/hicolor/24x24/mimetypes/application-x-kicad-eeschema.png %{buildroot}%{_datadir}/icons/hicolor/24x24/mimetypes/application-x-kicad-eeschema.png
-install -m 644 -D -p %{name}-icons/resources/linux/mime/icons/hicolor/24x24/apps/eeschema.png %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/eeschema.png
-install -pm 644 %{name}-icons/resources/linux/mime/icons/hicolor/22x22/mimetypes/application-x-kicad-eeschema.png %{buildroot}%{_datadir}/icons/hicolor/22x22/mimetypes/application-x-kicad-eeschema.png
-install -m 644 -D -p %{name}-icons/resources/linux/mime/icons/hicolor/22x22/apps/eeschema.png %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/eeschema.png
-install -pm 644 %{name}-icons/resources/linux/mime/icons/hicolor/16x16/mimetypes/application-x-kicad-eeschema.png %{buildroot}%{_datadir}/icons/hicolor/16x16/mimetypes/application-x-kicad-eeschema.png
-install -m 644 -D -p %{name}-icons/resources/linux/mime/icons/hicolor/16x16/apps/eeschema.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/eeschema.png
-
-install -pm 644 %{name}-icons/resources/linux/mime/icons/hicolor/32x32/mimetypes/application-x-kicad-pcbnew.png %{buildroot}%{_datadir}/icons/hicolor/32x32/mimetypes/application-x-kicad-pcbnew.png
-install -pm 644 %{name}-icons/resources/linux/mime/icons/hicolor/32x32/apps/pcbnew.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/pcbnew.png
-install -pm 644 %{name}-icons/resources/linux/mime/icons/hicolor/24x24/mimetypes/application-x-kicad-pcbnew.png %{buildroot}%{_datadir}/icons/hicolor/24x24/mimetypes/application-x-kicad-pcbnew.png
-install -pm 644 %{name}-icons/resources/linux/mime/icons/hicolor/24x24/apps/pcbnew.png %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/pcbnew.png
-install -pm 644 %{name}-icons/resources/linux/mime/icons/hicolor/22x22/mimetypes/application-x-kicad-pcbnew.png %{buildroot}%{_datadir}/icons/hicolor/22x22/mimetypes/application-x-kicad-pcbnew.png
-install -pm 644 %{name}-icons/resources/linux/mime/icons/hicolor/22x22/apps/pcbnew.png %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/pcbnew.png
-install -pm 644 %{name}-icons/resources/linux/mime/icons/hicolor/16x16/mimetypes/application-x-kicad-pcbnew.png %{buildroot}%{_datadir}/icons/hicolor/16x16/mimetypes/application-x-kicad-pcbnew.png
-install -pm 644 %{name}-icons/resources/linux/mime/icons/hicolor/16x16/apps/pcbnew.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/pcbnew.png
-
-install -pm 644 %{name}-icons/resources/linux/mime/icons/hicolor/32x32/apps/kicad.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/kicad.png
-install -pm 644 %{name}-icons/resources/linux/mime/icons/hicolor/24x24/apps/kicad.png %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/kicad.png
-install -pm 644 %{name}-icons/resources/linux/mime/icons/hicolor/22x22/apps/kicad.png %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/kicad.png
-install -pm 644 %{name}-icons/resources/linux/mime/icons/hicolor/16x16/apps/kicad.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/kicad.png
-
-
 # Preparing for documentation pull-ups
 %{__rm} -f  %{name}-doc-%{version}/doc/help/CMakeLists.txt
 %{__rm} -f  %{name}-doc-%{version}/doc/help/makefile
@@ -332,7 +290,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/%{name}
 %{_datadir}/%{name}/
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/mimetypes/application-x-%{name}-*.*
+%{_datadir}/icons/hicolor/*/mimetypes/application-x-*.*
 %{_datadir}/icons/hicolor/*/apps/*.*
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/mimelnk/application/x-%{name}-*.desktop
@@ -389,6 +347,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Mar 13 2014 Jaromir Capik <jcapik at redhat.com> - 2014.03.13-1.rev4744
+- Update to the latest available revisions
+- Creating scripts for source downloading & postprocessing
+- Fixing bogus dates in the changelog
+
 * Mon Dec 23 2013 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2013.06.11-2.rev4021
 - Removed kicad.pdf from kicad (Fix #1001243)
 - Clean up spec file as suggested by Michael Schwendt
@@ -396,7 +359,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 - Fix kicad-doc Group
 - kicad-doc no more requires kicad
  
-* Fri Jun 22 2013 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2013.06.11-1.rev4021
+* Sat 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
  
@@ -431,7 +394,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Fri Jul 15 2011 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2011.07.12-2.rev3047
 - Fix patch command 
 
-* Mon Jul 12 2011 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2011.07.12-1.rev3047
+* Tue 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
diff --git a/pcbnew.desktop b/pcbnew.desktop
deleted file mode 100644
index 1ada4e7..0000000
--- a/pcbnew.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Categories=Development;Electronics
-Comment=Design an printed circuit board
-Comment[fr]=Router un circuit imprimé
-Exec=pcbnew
-GenericName=PCB design
-GenericName[fr]=Routage de circuits imprimés
-Icon=pcbnew
-MimeType=application/x-kicad-pcbnew;
-Name=Pcbnew
-Type=Application
diff --git a/sources b/sources
index 627de23..b26321c 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-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
+f0a45487c81db32d7c97ea0fb59fc7d4  kicad-2014.03.13.tar.xz
+1e8870c0b80a9526b5285e5c90dead50  kicad-libraries-2014.03.13.tar.xz
+b886bbec5fc0e05f0d9a5d4f35119577  kicad-doc-2014.03.13.tar.xz
+7d6f1b15a2ef24b77ac5982c06d889e6  kicad-walter-libraries-2014.03.13.tar.xz
 4dba5eca85fcec9bba491c1815963f80  Epcos-MKT-1.0.tar.bz2
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kicad.git/commit/?h=epel7&id=0a0f27cb720f2c6cda18c6a9b78105b54095d086
