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

[Chitlesh GOORAH]

Author: chitlesh

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

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

electronics-menu-1.0-submenus.patch:
 electronics.menu |  107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)

Index: electronics-menu-1.0-submenus.patch
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/F-10/electronics-menu-1.0-submenus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- electronics-menu-1.0-submenus.patch	9 Jul 2009 22:45:44 -0000	1.1
+++ electronics-menu-1.0-submenus.patch	28 Aug 2009 18:27:36 -0000	1.2
@@ -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>


Index: electronics-menu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/F-10/electronics-menu.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- electronics-menu.spec	9 Jul 2009 22:45:44 -0000	1.3
+++ electronics-menu.spec	28 Aug 2009 18:27:36 -0000	1.4
@@ -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/hico
 %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


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	9 Jul 2009 22:45:44 -0000	1.2
+++ import.log	28 Aug 2009 18:27:36 -0000	1.3
@@ -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-10:electronics-menu-1.0-4.fc11.src.rpm:1247179383
+electronics-menu-1_0-6_fc11:F-10:electronics-menu-1.0-6.fc11.src.rpm:1251483901


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Jul 2009 22:45:44 -0000	1.3
+++ sources	28 Aug 2009 18:27:36 -0000	1.4
@@ -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