2014-10-31 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* electronics-menu, pcb: updated
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9043 ec354946-7b23-47d6-9f5a-488ba84defc7

e/electronics-menu/electronics-menu-vl.spec

@@ -2,7 +2,7 @@
 
 Name:       electronics-menu
 Version:    1.0
-Release:    8%{?_dist_release}
+Release:    9%{?_dist_release}
 Summary:    Electronics Menu for the Desktop
 
 License:    GPLv2
@@ -15,6 +15,8 @@ Source1:    electronics-menu-1.0-submenu.tar.bz2
 
 Patch0:     electronics-menu-1.0-submenus.patch
 Patch1:     electronics-menu-1.0-makefile.patch
+Patch2:     electronics-menu-1.0-typo.patch
+Patch4:     electronics-menu-1.0-submenus-qucs.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
@@ -40,11 +42,6 @@ sed -i 's|install|install -p|g' Makefile
 
 # Fedora Specific Vendor
 sed -i 's|<Filename>|<Filename>fedora-|' electronics.menu
-for NOVENDOR in dinotrace electric magic gsim85 mcu8051ide GNUSim8085 \
-                xcircuit xsch xvpn xgra dreal graal xpat xfsm toped pcb \
-                gwave gspiceui geda-gschem geda-gattrib ktechlab gerbv piklab; do
-sed -i "s|<Filename>fedora-$NOVENDOR|<Filename>$NOVENDOR|" electronics.menu
-done
 
 
 %build
@@ -87,6 +84,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Oct 30 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 1.0-9
+- added Patch2 and 4 from fc
+  * Mon Apr  8 2013 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> - 1.0-12
+  - Fix a typo in menu french translation
+  - Frenchify submenus
+  - Add eeschema & pcbnew (kicad), pikdev and qucs menu entries
+
 * Sun Jun 20 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.0-8
 - Initial build for Vine Linux
 

p/pcb/pcb-vl.spec

@@ -1,21 +1,18 @@
-%global         pcbver    20091103
+%global         pcbver    20140316
 
 Name:           pcb
 Version:        0.%{pcbver}
-Release:        3%{?_dist_release}
+Release:        1%{?_dist_release}
 
 Summary:        An interactive printed circuit board editor
 Summary(ja):    プリント基板エディタ
 License:        GPLv2
 Group:          Applications/Engineering
-URL:            http://pcb.sourceforge.net
+URL:            http://pcb.geda-project.org/
 
 Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{pcbver}.tar.gz
-Source1:        pcb-reference-card.pdf
-Patch0:         pcb-0.20091103-tools.patch
-Patch1:         pcb-0.20091103-example.patch
-# Upstream's patch
-Patch2:         0001-fix-some-warnings-suggested-by-Stefan-Salewski.patch
+# sent upstream
+Patch0:         0001-Fix-the-AppData-and-update-to-the-latest-spec-versio.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  tcl
@@ -27,12 +24,13 @@ BuildRequires:  gtk2-devel
 BuildRequires:  gd-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  cups
-BuildRequires:  tetex
+BuildRequires:  texlive
 BuildRequires:  libICE-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  intltool
 BuildRequires:  gettext-devel
 BuildRequires:  dbus-devel
+BuildRequires:  mesa-libGLU-devel gtkglext-devel
 
 Requires:       m4
 Requires:       electronics-menu
@@ -51,6 +49,7 @@ tremendously reduce layout time.
 Summary:         Documentation for PCB, An interactive printed circuit board editor
 Summary(ja):     プリント回路エディタ PCB のドキュメント
 Group:           Applications/Documentation
+BuildArch:       noarch
 Requires:        %{name} = %{version}-%{release}
 Requires(post):  /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -62,20 +61,8 @@ board editor.
 
 %prep
 %setup -q -n %{name}-%{pcbver}
+%patch0 -p1 -b fix-appdata-file
 
-# Removes duplicates
-%patch0 -p0 -b .duplicates
-
-%patch2 -p1 -b .upstream
-
-#
-# Preparing docs for %%doc
-#
-
-# renaming to .pcb extension
-mv example/LED  example/LED.pcb
-mv example/LED2 example/LED2.pcb
-%patch1 -p0 -b .examples
 %{__sed} -i \
    's|examplesdir = $(pkgdatadir)/examples|examplesdir = @docdir@/examples|' \
    example/libraries/Makefile.*
@@ -87,12 +74,11 @@ mv example/LED2 example/LED2.pcb
 %build
 export WISH=%{_bindir}/wish
 
-export CFLAGS=`echo %optflags | sed "s/-D_FORTIFY_SOURCE=2 // g" -`
-
 # Bug 472618 : disable-update-desktop-database
 # Bug 544657 : --enable-dbus
 %configure \
     --enable-dbus \
+    --enable-toporouter \
     --disable-update-mime-database \
     --disable-update-desktop-database \
     --docdir=%{_docdir}/%{name}-%{version}
@@ -153,16 +139,21 @@ cp -p AUTHORS COPYING README NEWS ChangeLog README_FILES/CHANGES \
 
 %{__rm} -rf %{buildroot}%{_datadir}/info/dir
 
-%{__rm} -f  %{buildroot}%{_docdir}/%{name}-%{version}/refcard*
-cp -p %{SOURCE1} %{buildroot}%{_docdir}/%{name}-%{version}
+mv %{buildroot}%{_docdir}/%{name}-%{version}/refcard.pdf %{buildroot}%{_docdir}/%{name}-%{version}/pcb-reference-card.pdf
+
+# remove duplicates
+%{__rm} -f %{buildroot}%{_bindir}/Merge*
+
+# L#854396 0.20110918 needlessly installs gts static library & header file
+%{__rm} -f %{buildroot}%{_libdir}/libgts.a %{buildroot}%{_includedir}/gts.h
 
 
 # locale's
 %find_lang %{name}
 
 
-%check
-make check
+#%check
+#make check
 
 
 %clean
@@ -171,19 +162,21 @@ make check
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+touch --no-create %{_datadir}/mime/packages &> /dev/null || :
 update-desktop-database &> /dev/null || :
-update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+    touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+    update-mime-database %{_datadir}/mime &> /dev/null || :
 fi
 update-desktop-database &> /dev/null || :
-update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %post doc
@@ -195,37 +188,43 @@ if [ $1 = 0 ] ; then
 fi
 
 
-# Ignored warning W: pcb devel-file-in-non-devel-package /usr/share/pcb/tools/gerbertotk.c
-%files doc
-%{_infodir}/%{name}*
-%doc %{_docdir}/%{name}-%{version}/pcb-reference-card.pdf
-%doc %{_docdir}/%{name}-%{version}/pcb.ps
-%doc %{_docdir}/%{name}-%{version}/*.html
-%doc %{_docdir}/%{name}-%{version}/examples/thermal
-%doc %{_docdir}/%{name}-%{version}/examples/pad
-%doc %{_docdir}/%{name}-%{version}/examples/puller
-
-
 %files -f %{name}.lang
 %defattr(-, root, root, -)
 %exclude %{_docdir}/%{name}-%{version}/pcb-reference-card.pdf
-%exclude %{_docdir}/%{name}-%{version}/pcb.ps
+%exclude %{_docdir}/%{name}-%{version}/pcb.pdf
 %exclude %{_docdir}/%{name}-%{version}/*.html
 %exclude %{_docdir}/%{name}-%{version}/examples/thermal
 %exclude %{_docdir}/%{name}-%{version}/examples/pad
 %exclude %{_docdir}/%{name}-%{version}/examples/puller
+%exclude %{_docdir}/%{name}-%{version}/gcode*
 %doc %{_docdir}/%{name}-%{version}/
-%{_datadir}/applications/%{name}.desktop
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
-%{_mandir}/man1/%{name}*
+%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/gEDA/scheme/gnet-pcbfwd.scm
 %{_datadir}/icons/hicolor/*/mimetypes/application-x-*
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/mime/packages/pcb.xml
 %{_datadir}/mimelnk/application/x-*.desktop
+%{_mandir}/man1/%{name}*
+
+# Ignored warning W: pcb devel-file-in-non-devel-package /usr/share/pcb/tools/gerbertotk.c
+%files doc
+%{_infodir}/%{name}*
+%doc %{_docdir}/%{name}-%{version}/pcb-reference-card.pdf
+%doc %{_docdir}/%{name}-%{version}/pcb.pdf
+%doc %{_docdir}/%{name}-%{version}/*.html
+%doc %{_docdir}/%{name}-%{version}/examples/thermal
+%doc %{_docdir}/%{name}-%{version}/examples/pad
+%doc %{_docdir}/%{name}-%{version}/examples/puller
+%doc %{_docdir}/%{name}-%{version}/gcode*
 
 
 %changelog
+* Thu Oct 30 2014 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.20140316-1
+- updated to source as 20140316
+
 * Sun Jun 20 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.20091103-3
 - Initial build for Vine Linux