- rel 6

- proper support for xfce 4.10, without merging external menus

Changed files:
    applnk.spec -> 1.121
    xfce-4.10.patch -> 1.3

diff --git a/applnk.spec b/applnk.spec
index 7a2b8b4caa368337f5d501cb228f9416c5911bdd..3ae1ed34d279b568deedbaa08069917b9f3a537a 100644 (file)
--- a/applnk.spec
+++ b/applnk.spec
@@ -2,7 +2,7 @@ Summary:        Applnk - base directories tree used for storing desktop/kdelnk menu ent
 Summary(pl.UTF-8):     Applnk - bazowa struktura katalogów z opisami do plików desktop/kdelnk
 Name:          applnk
 Version:       2.2.0
-Release:       5
+Release:       6
 License:       GPL
 Group:         Base
 Source0:       ftp://ep09.pld-linux.org/software/applnk/%{name}-%{version}.tar.bz2

diff --git a/xfce-4.10.patch b/xfce-4.10.patch
index d8f079ece26abd52822294f29c8ceb2f51b46f56..7668eac559d300c889cc7e0d6da9cb7db065107d 100644 (file)
--- a/xfce-4.10.patch
+++ b/xfce-4.10.patch
@@ -1,6 +1,6 @@
-diff -ur applnk-2.2.0.orig/menus/applnk-applications.menu applnk-2.2.0/menus/applnk-applications.menu
---- applnk-2.2.0.orig/menus/applnk-applications.menu   2011-02-22 11:20:34.000000000 +0100
-+++ applnk-2.2.0/menus/applnk-applications.menu        2012-05-18 02:07:20.098461411 +0200
+diff -ur applnk-2.2.0/menus/applnk-applications.menu applnk-2.2.0-xfce/menus/applnk-applications.menu
+--- applnk-2.2.0/menus/applnk-applications.menu        2011-02-22 11:20:34.000000000 +0100
++++ applnk-2.2.0-xfce/menus/applnk-applications.menu   2012-05-18 08:35:37.000000000 +0200
 @@ -26,7 +26,7 @@
        </Include>
  
@@ -26,20 +26,79 @@ diff -ur applnk-2.2.0.orig/menus/applnk-applications.menu applnk-2.2.0/menus/app
                        <Not><Category>X-XFCE</Category></Not>
                        <Not><Category>GNOME</Category></Not>
                        </And>
-@@ -632,6 +632,7 @@
+@@ -631,15 +631,71 @@
+                       <Include>
                                <And>
                                <Category>Settings</Category>
++                              <Or>
                                <Category>X-XFCE</Category>
 +                              <Category>XFCE</Category>
++                              </Or>
++                              <Not>
++                              <Or>
++                              <Category>X-XFCE-PersonalSettings</Category>
++                              <Category>X-XFCE-HardwareSettings</Category>
++                              <Category>X-XFCE-SystemSettings</Category>
++                              </Or>
++                              </Not>
                                </And>
                        </Include>
                        <Layout>
-@@ -640,6 +641,7 @@
-                               <Merge type="menus"/>
-                               <Merge type="files"/>
+-                              <Filename>xfce-settings-manager.desktop</Filename>
+-                              <Separator/>
+-                              <Merge type="menus"/>
+-                              <Merge type="files"/>
++                              <Menuname>Personal</Menuname>
++                              <Menuname>Hardware</Menuname>
++                              <Menuname>System</Menuname>
++                              <Merge type="all"/>
                        </Layout>
-+                      <MergeFile>xfce-settings-manager.menu</MergeFile>
++                      <Menu>
++                              <Name>Personal</Name>
++                              <Directory>xfce-personal.directory</Directory>
++                              <Include>
++                                      <And>
++                                      <Category>Settings</Category>
++                                      <Or>
++                                      <Category>X-XFCE</Category>
++                                      <Category>XFCE</Category>
++                                      </Or>
++                                      <Category>X-XFCE-SettingsDialog</Category>
++                                      <Category>X-XFCE-PersonalSettings</Category>
++                                      </And>
++                                      <Filename>xscreensaver-properties.desktop</Filename>
++                              </Include>
++                      </Menu>
++                      <Menu>
++                              <Name>Hardware</Name>
++                              <Directory>xfce-hardware.directory</Directory>
++                              <Include>
++                                      <And>
++                                      <Category>Settings</Category>
++                                      <Or>
++                                      <Category>X-XFCE</Category>
++                                      <Category>XFCE</Category>
++                                      </Or>
++                                      <Category>X-XFCE-SettingsDialog</Category>
++                                      <Category>X-XFCE-HardwareSettings</Category>
++                                      </And>
++                              </Include>
++                      </Menu>
++                      <Menu>
++                              <Name>System</Name>
++                              <Directory>xfce-system.directory</Directory>
++                              <Include>
++                                      <And>
++                                      <Category>Settings</Category>
++                                      <Or>
++                                      <Category>X-XFCE</Category>
++                                      <Category>XFCE</Category>
++                                      </Or>
++                                      <Category>X-XFCE-SettingsDialog</Category>
++                                      <Category>X-XFCE-SystemSettings</Category>
++                                      </And>
++                              </Include>
++                      </Menu>
                </Menu>
                <Menu>
                        <Name>GNOME</Name>
-Only in applnk-2.2.0/menus: applnk-applications.menu~