[meego-commits] 24411: Changes to MeeGo:1.2.0:oss:Update:Testing/xfce4-mixer

[Tracy Graydon]

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

Thank You,
Tracy Graydon

[This message was auto-generated]

---

Request #24411:

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


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

State:   new          2011-10-26T19:24:50 tracyg
Comment: None



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

spec files:
-----------
--- xfce4-mixer.spec
+++ xfce4-mixer.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
@@ -14,7 +14,7 @@
 Source0:    http://archive.xfce.org/src/apps/xfce4-mixer/4.8/xfce4-mixer-%{version}.tar.bz2
 Source100:  xfce4-mixer.yaml
 Requires(post): /bin/touch
-Requires(post): gtk2
+Requires(post): %{_bindir}/gtk-update-icon-cache
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gstreamer-plugins-base-0.10) >= 0.10.14
 BuildRequires:  pkgconfig(gthread-2.0)
@@ -24,7 +24,7 @@
 BuildRequires:  pkgconfig(libxfce4util-1.0)
 BuildRequires:  pkgconfig(libxfconf-0)
 BuildRequires:  intltool
-BuildRequires:  libwnck1-devel
+BuildRequires:  libwnck-devel
 BuildRequires:  desktop-file-utils
 
 

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

++++++ xfce4-mixer.yaml
--- xfce4-mixer.yaml
+++ xfce4-mixer.yaml
@@ -23,7 +23,7 @@
     - libxfconf-0
 PkgBR:
     - intltool
-    - libwnck1-devel
+    - libwnck-devel
 Files:
     - "%doc COPYING"
     - /usr/bin/xfce4-mixer