From 49fc4cf3a84463b7997efc97522f407f2a5677de Mon Sep 17 00:00:00 2001
From: Chitlesh GOORAH <chitlesh@fedoraproject.org>
Date: Aug 28 2009 18:29:10 +0000
Subject: submenus support


---

diff --git a/electronics-menu-1.0-submenus.patch b/electronics-menu-1.0-submenus.patch
index 6ed38e2..c3819cb 100644
--- a/electronics-menu-1.0-submenus.patch
+++ b/electronics-menu-1.0-submenus.patch
@@ -1,6 +1,6 @@
 --- 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 @@
+@@ -8,5 +8,112 @@
      <Include>
        <Category>Electronics</Category>
      </Include>
@@ -11,6 +11,7 @@
 +      <Filename>xpat.desktop</Filename>
 +      <Filename>xsch.desktop</Filename>
 +      <Filename>xvpn.desktop</Filename>
++      <Filename>xgra.desktop</Filename>
 +      <Filename>electric.desktop</Filename>
 +      <Filename>magic.desktop</Filename>
 +      <Filename>netgen.desktop</Filename>
@@ -29,6 +30,9 @@
 +      <Filename>gwave.desktop</Filename>
 +      <Filename>LabPlot.desktop</Filename>
 +      <Filename>dinotrace.desktop</Filename>
++      <Filename>GNUSim8085.desktop</Filename>
++      <Filename>gsim85.desktop</Filename>
++      <Filename>mcu8051ide.desktop</Filename>
 +    </Exclude>
 +    <Menu>
 +      <Name>Automation</Name>
@@ -38,7 +42,7 @@
 +      </Include>
 +    </Menu>
 +    <Menu>
-+      <Name>Analog/Mixed Signal Design</Name>
++      <Name>Analog Mixed-Signal Design</Name>
 +      <Directory>electronics-Analog.directory</Directory>
 +      <Include>
 +        <Category>Analog</Category>
@@ -59,8 +63,10 @@
 +        <Filename>xfsm.desktop</Filename>
 +        <Filename>xpat.desktop</Filename>
 +        <Filename>xsch.desktop</Filename>
++        <Filename>xgra.desktop</Filename>
 +        <Filename>xvpn.desktop</Filename>
 +        <Filename>tkgate.desktop</Filename>
++        <Filename>dinotrace.desktop</Filename>
 +      </Include>
 +    </Menu>
 +    <Menu>
@@ -71,6 +77,9 @@
 +        <Filename>ktechlab.desktop</Filename>
 +        <Filename>piklab.desktop</Filename>
 +        <Filename>pikloops.desktop</Filename>
++        <Filename>GNUSim8085.desktop</Filename>
++        <Filename>gsim85.desktop</Filename>
++        <Filename>mcu8051ide.desktop</Filename>
 +      </Include>
 +    </Menu>
 +    <Menu>
@@ -100,7 +109,6 @@
 +        <Category>Waveform</Category>
 +        <Filename>gwave.desktop</Filename>
 +        <Filename>LabPlot.desktop</Filename>
-+        <Filename>dinotrace.desktop</Filename>
 +      </Include>
 +    </Menu>
    </Menu>
diff --git a/electronics-menu.spec b/electronics-menu.spec
index 11c24f4..3c1edf4 100644
--- a/electronics-menu.spec
+++ b/electronics-menu.spec
@@ -2,7 +2,7 @@
 
 Name:       electronics-menu
 Version:    1.0
-Release:    4%{?dist}
+Release:    6%{?dist}
 Summary:    Electronics Menu for the Desktop
 
 License:    GPLv2
@@ -40,7 +40,8 @@ sed -i 's|install|install -p|g' Makefile
 
 # Fedora Specific Vendor
 sed -i 's|<Filename>|<Filename>fedora-|' electronics.menu
-for NOVENDOR in dinotrace ; do
+for NOVENDOR in dinotrace electric magic gsim85 mcu8051ide GNUSim8085 \
+                xcircuit xsch xvpn xgra dreal graal xpat xfsm toped; do
 sed -i "s|<Filename>fedora-$NOVENDOR|<Filename>$NOVENDOR|" electronics.menu
 done
 
@@ -69,12 +70,15 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %doc COPYING README
 %{_icondir}/hicolor/??x??/categories/applications-electronics*.png
 %{_icondir}/hicolor/scalable/categories/applications-electronics*.svg
-%{_sysconfdir}/xdg/menus/applications-merged/electronics.menu
+%config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/electronics.menu
 %{_datadir}/desktop-directories/*.directory
 
 
 
 %changelog
+* Sat Aug 28 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0-6
+- Improved submenus structure for F-12
+
 * 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
diff --git a/import.log b/import.log
index 19f5ab9..8e2493a 100644
--- a/import.log
+++ b/import.log
@@ -1,2 +1,3 @@
 electronics-menu-1_0-2_fc9:HEAD:electronics-menu-1.0-2.fc9.src.rpm:1215375997
 electronics-menu-1_0-4_fc11:F-11:electronics-menu-1.0-4.fc11.src.rpm:1247179075
+electronics-menu-1_0-6_fc11:F-11:electronics-menu-1.0-6.fc11.src.rpm:1251483984
diff --git a/sources b/sources
index df466ad..2b426b6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 d340b07ac342c8c39029c5d70c58bdb0  electronics-menu-1.0.tar.gz
-ee8b7fdac3f49242772f016cb7a880c3  electronics-menu-1.0-submenu.tar.bz2
+3521870e1a89e86f9b333478cf4e9cec  electronics-menu-1.0-submenu.tar.bz2