- rel 5

- full support for xfce 4.10

Changed files:
    applnk.spec -> 1.120
    xfce-4.10.patch -> 1.2

diff --git a/applnk.spec b/applnk.spec
index 4169abd0da3ae4667cd0b7ad8e4e8dd1aeaf4765..7a2b8b4caa368337f5d501cb228f9416c5911bdd 100644 (file)
--- a/applnk.spec
+++ b/applnk.spec
@@ -2,14 +2,14 @@ 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:       4
+Release:       5
 License:       GPL
 Group:         Base
 Source0:       ftp://ep09.pld-linux.org/software/applnk/%{name}-%{version}.tar.bz2
 # Source0-md5: 0af5401b44bb2c91c771da76c627b4f5
 Patch0:                xfce-4.10.patch
 Provides:      xdg-menus
-Conflicts:     xfdesktop < 4.8.0
+Conflicts:     xfdesktop < 4.10.0
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 

diff --git a/xfce-4.10.patch b/xfce-4.10.patch
index b95a97030401fb6e580738c3b2dadc3226e50887..d8f079ece26abd52822294f29c8ceb2f51b46f56 100644 (file)
--- a/xfce-4.10.patch
+++ b/xfce-4.10.patch
@@ -1,6 +1,24 @@
---- applnk-2.2.0/menus/applnk-applications.menu~       2011-02-22 11:20:34.000000000 +0100
-+++ applnk-2.2.0/menus/applnk-applications.menu        2012-05-17 19:53:29.962100171 +0200
-@@ -621,6 +621,7 @@
+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
+@@ -26,7 +26,7 @@
+       </Include>
+ 
+       <Layout>
+-              <Filename>xfrun4.desktop</Filename>
++              <Filename>xfce4-run.desktop</Filename>
+               <Separator/>
+               <Filename>exo-terminal-emulator.desktop</Filename>
+               <Filename>exo-file-manager.desktop</Filename>
+@@ -38,7 +38,6 @@
+               <Separator/>
+               <Menuname>Settings</Menuname>
+               <Separator/>
+-              <Filename>xfhelp4.desktop</Filename>
+               <Filename>xfce4-about.desktop</Filename>
+               <Filename>xfce4-session-logout.desktop</Filename>
+       </Layout>
+@@ -621,6 +620,7 @@
                        <Category>PackageManager</Category>
                        <Category>Printing</Category>
                        </Or>
@@ -8,7 +26,7 @@
                        <Not><Category>X-XFCE</Category></Not>
                        <Not><Category>GNOME</Category></Not>
                        </And>
-@@ -632,6 +633,7 @@
+@@ -632,6 +632,7 @@
                                <And>
                                <Category>Settings</Category>
                                <Category>X-XFCE</Category>
@@ -16,3 +34,12 @@
                                </And>
                        </Include>
                        <Layout>
+@@ -640,6 +641,7 @@
+                               <Merge type="menus"/>
+                               <Merge type="files"/>
+                       </Layout>
++                      <MergeFile>xfce-settings-manager.menu</MergeFile>
+               </Menu>
+               <Menu>
+                       <Name>GNOME</Name>
+Only in applnk-2.2.0/menus: applnk-applications.menu~