[meego-commits] 24408: Changes to MeeGo:1.2.0:oss:Update:Testing/xfdesktop

[Tracy Graydon]

Hi,
I have made the following changes to xfdesktop in project MeeGo:1.2.0:oss:Update:Testing. Please review and accept ASAP.

Thank You,
Tracy Graydon

[This message was auto-generated]

---

Request #24408:

  submit:   devel:xfce:1.2/xfdesktop(r2)(update) -> MeeGo:1.2.0:oss:Update:Testing/xfdesktop


Message:
    Fix the libnotify1/gnome-keyring1,libwnck1 dependencies for MeeGo:1.2.0 xfce. BMC#17502

State:   new          2011-10-26T19:23:41 tracyg
Comment: None



changes files:
--------------
--- xfdesktop.changes
+++ xfdesktop.changes
@@ -0,0 +1,3 @@
+* Wed Oct 26 2011 Tracy Graydon <tracy.graydon at intel.com> - 4.8.2
+- Fix the libnotify1 conflict for MeeGo:1.2.0 xfce. BMC#17502 
+

spec files:
-----------
--- xfdesktop.spec
+++ xfdesktop.spec
@@ -1,6 +1,6 @@
 # 
 # Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.22
+# Generated by: spectacle version 0.23
 # 
 # >> macros
 # << macros
@@ -16,15 +16,15 @@
 Source1:    xfce4-desktop.xml
 Source100:  xfdesktop.yaml
 Requires(post): /bin/touch
-Requires(post): gtk2
+Requires(post): %{_bindir}/gtk-update-icon-cache
 BuildRequires:  pkgconfig(libxfce4ui-1)
 BuildRequires:  pkgconfig(libxfconf-0)
 BuildRequires:  pkgconfig(exo-1)
 BuildRequires:  pkgconfig(garcon-1)
 BuildRequires:  intltool >= 0.31
 BuildRequires:  Thunar
-BuildRequires:  libnotify1-devel
-BuildRequires:  libwnck1-devel
+BuildRequires:  libnotify-devel
+BuildRequires:  libwnck-devel
 BuildRequires:  desktop-file-utils
 
 

other changes:
--------------

++++++ xfdesktop.yaml
--- xfdesktop.yaml
+++ xfdesktop.yaml
@@ -14,8 +14,8 @@
 PkgBR:
     - intltool >= 0.31
     - Thunar
-    - libnotify1-devel
-    - libwnck1-devel
+    - libnotify-devel
+    - libwnck-devel
 PkgConfigBR:
     - libxfce4ui-1
     - libxfconf-0