rpms/electronics-menu/F-10 electronics-menu-1.0-makefile.patch, NONE, 1.1 electronics-menu-1.0-submenus.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 electronics-menu.spec, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3

Thu Jul 9 22:45:45 UTC 2009

Author: chitlesh

Update of /cvs/pkgs/rpms/electronics-menu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16615/F-10

Modified Files:
	.cvsignore electronics-menu.spec import.log sources 
Added Files:
	electronics-menu-1.0-makefile.patch 
	electronics-menu-1.0-submenus.patch 
Log Message:
submenus

electronics-menu-1.0-makefile.patch:

--- NEW FILE electronics-menu-1.0-makefile.patch ---
--- Makefile	2009-07-08 20:07:35.735572739 +0200
+++ Makefile.submenus	2009-07-08 21:22:43.133572159 +0200
@@ -14,5 +14,18 @@
 	install -m 0644 -D applications-electronics-22.png $(DESTDIR)$(themedir)/22x22/categories/applications-electronics.png
 	install -m 0644 -D applications-electronics-24.png $(DESTDIR)$(themedir)/24x24/categories/applications-electronics.png
 	install -m 0644 -D applications-electronics-48.png $(DESTDIR)$(themedir)/48x48/categories/applications-electronics.png
+	pushd electronics-menu-1.0-submenu;\
+	for SUBMENU in Automation Analog Digital Embedded SchematicPCB Spice Waveform; do \
+		echo "Submenu $${SUBMENU}";\
+		install -m 0644 electronics-$${SUBMENU}.directory $(DESTDIR)/usr/share/desktop-directories;\
+		install -m 0644 -D applications-electronics-$${SUBMENU}.svg \
+			$(DESTDIR)$(themedir)/scalable/categories/applications-electronics-$${SUBMENU}.svg;\
+		for SIZE in 48 32 22 16; do\
+			install -m 0644 -D applications-electronics-$${SUBMENU}-$${SIZE}.png \
+				$(DESTDIR)$(themedir)/$${SIZE}x$${SIZE}/categories/applications-electronics-$${SUBMENU}.png;\
+		done;\
+	done;\
+	popd
+
 
 .PHONY: all clean install

electronics-menu-1.0-submenus.patch:

--- NEW FILE electronics-menu-1.0-submenus.patch ---
--- electronics.menu	2007-12-07 19:25:39.000000000 +0100
+++ electronics.menu.submenus	2009-07-08 22:30:00.510572856 +0200
@@ -8,5 +8,104 @@
     <Include>
       <Category>Electronics</Category>
     </Include>
+    <Exclude>
+      <Filename>dreal.desktop</Filename>
+      <Filename>graal.desktop</Filename>
+      <Filename>xfsm.desktop</Filename>
+      <Filename>xpat.desktop</Filename>
+      <Filename>xsch.desktop</Filename>
+      <Filename>xvpn.desktop</Filename>
+      <Filename>electric.desktop</Filename>
+      <Filename>magic.desktop</Filename>
+      <Filename>netgen.desktop</Filename>
+      <Filename>xcircuit.desktop</Filename>
+      <Filename>toped.desktop</Filename>
+      <Filename>tkgate.desktop</Filename>
+      <Filename>ktechlab.desktop</Filename>
+      <Filename>piklab.desktop</Filename>
+      <Filename>pikloops.desktop</Filename>
+      <Filename>geda-gattrib.desktop</Filename>
+      <Filename>gerbv.desktop</Filename>
+      <Filename>geda-gschem.desktop</Filename>
+      <Filename>pcb.desktop</Filename>
+      <Filename>kicad.desktop</Filename>
+      <Filename>gspiceui.desktop</Filename>
+      <Filename>gwave.desktop</Filename>
+      <Filename>LabPlot.desktop</Filename>
+      <Filename>dinotrace.desktop</Filename>
+    </Exclude>
+    <Menu>
+      <Name>Automation</Name>
+      <Directory>electronics-Automation.directory</Directory>
+      <Include>
+        <Category>Automation</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Analog/Mixed Signal Design</Name>
+      <Directory>electronics-Analog.directory</Directory>
+      <Include>
+        <Category>Analog</Category>
+        <Filename>electric.desktop</Filename>
+        <Filename>magic.desktop</Filename>
+        <Filename>netgen.desktop</Filename>
+        <Filename>xcircuit.desktop</Filename>
+        <Filename>toped.desktop</Filename>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Digital IC Design</Name>
+      <Directory>electronics-Digital.directory</Directory>
+      <Include>
+        <Category>Digital</Category>
+        <Filename>dreal.desktop</Filename>
+        <Filename>graal.desktop</Filename>
+        <Filename>xfsm.desktop</Filename>
+        <Filename>xpat.desktop</Filename>
+        <Filename>xsch.desktop</Filename>
+        <Filename>xvpn.desktop</Filename>
+        <Filename>tkgate.desktop</Filename>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Embedded Design</Name>
+      <Directory>electronics-Embedded.directory</Directory>
+      <Include>
+        <Category>Embedded</Category>
+        <Filename>ktechlab.desktop</Filename>
+        <Filename>piklab.desktop</Filename>
+        <Filename>pikloops.desktop</Filename>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Schematic to PCB Layout</Name>
+      <Directory>electronics-SchematicPCB.directory</Directory>
+      <Include>
+        <Category>Schematic,PCB</Category>
+        <Filename>geda-gattrib.desktop</Filename>
+        <Filename>gerbv.desktop</Filename>
+        <Filename>geda-gschem.desktop</Filename>
+        <Filename>pcb.desktop</Filename>
+        <Filename>kicad.desktop</Filename>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Spice Simulation</Name>
+      <Directory>electronics-Spice.directory</Directory>
+      <Include>
+        <Category>Spice</Category>
+        <Filename>gspiceui.desktop</Filename>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Waveform Viewers</Name>
+      <Directory>electronics-Waveform.directory</Directory>
+      <Include>
+        <Category>Waveform</Category>
+        <Filename>gwave.desktop</Filename>
+        <Filename>LabPlot.desktop</Filename>
+        <Filename>dinotrace.desktop</Filename>
+      </Include>
+    </Menu>
   </Menu>
 </Menu>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Feb 2008 19:10:07 -0000	1.2
+++ .cvsignore	9 Jul 2009 22:45:44 -0000	1.3
@@ -1 +1,2 @@
 electronics-menu-1.0.tar.gz
+electronics-menu-1.0-submenu.tar.bz2


Index: electronics-menu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/F-10/electronics-menu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- electronics-menu.spec	6 Jul 2008 20:27:02 -0000	1.2
+++ electronics-menu.spec	9 Jul 2009 22:45:44 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:       electronics-menu
 Version:    1.0
-Release:    2%{?dist}
+Release:    4%{?dist}
 Summary:    Electronics Menu for the Desktop
 
 License:    GPLv2
@@ -10,6 +10,11 @@ Group:      User Interface/Desktops
 
 URL:        http://geda.seul.org/
 Source0:    http://geda.seul.org/dist/%{name}-%{version}.tar.gz
+# Created by Chitlesh
+Source1:    electronics-menu-1.0-submenu.tar.bz2
+
+Patch0:     electronics-menu-1.0-submenus.patch
+Patch1:     electronics-menu-1.0-makefile.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -18,18 +23,28 @@ Requires(pre): gtk2
 BuildArchitectures: noarch
 
 %description
-The programs from the category Electronics are currently located
+The programs from the category Electronics are normally located
 in the Edutainment directory.
 This Package adds a Electronics menu to the xdg menu structure.
 
 %{name} is listed among Fedora Electronic Lab (FEL) packages.
 
 %prep
-%setup -q
+%setup -q -a 1
+
+%patch0 -p0 -b .submenus
+%patch1 -p0 -b .submenus
 
 # allowing timestamps
 sed -i 's|install|install -p|g' Makefile
 
+# Fedora Specific Vendor
+sed -i 's|<Filename>|<Filename>fedora-|' electronics.menu
+for NOVENDOR in dinotrace ; do
+sed -i "s|<Filename>fedora-$NOVENDOR|<Filename>$NOVENDOR|" electronics.menu
+done
+
+
 %build
 
 %install
@@ -52,14 +67,21 @@ touch --no-create %{_datadir}/icons/hico
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%{_icondir}/hicolor/??x??/categories/applications-electronics.png
-%{_icondir}/hicolor/scalable/categories/applications-electronics.svg
+%{_icondir}/hicolor/??x??/categories/applications-electronics*.png
+%{_icondir}/hicolor/scalable/categories/applications-electronics*.svg
 %{_sysconfdir}/xdg/menus/applications-merged/electronics.menu
-%{_datadir}/desktop-directories/Electronics.directory
+%{_datadir}/desktop-directories/*.directory
 
 
 
 %changelog
+* Wed Jul 08 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0-4
+- patched for submenus
+- added extra icons and directory desktop files to support the submenus feature
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Jul 06 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0-2
 - Corrected yum install with requires(pre)
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	6 Jul 2008 20:27:02 -0000	1.1
+++ import.log	9 Jul 2009 22:45:44 -0000	1.2
@@ -1 +1,2 @@
 electronics-menu-1_0-2_fc9:HEAD:electronics-menu-1.0-2.fc9.src.rpm:1215375997
+electronics-menu-1_0-4_fc11:F-10:electronics-menu-1.0-4.fc11.src.rpm:1247179383


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Feb 2008 19:10:07 -0000	1.2
+++ sources	9 Jul 2009 22:45:44 -0000	1.3
@@ -1 +1,2 @@
 d340b07ac342c8c39029c5d70c58bdb0  electronics-menu-1.0.tar.gz
+ee8b7fdac3f49242772f016cb7a880c3  electronics-menu-1.0-submenu.tar.bz2


