- merged from DEVEL

Changed files:
    xfce4-mixer.spec -> 1.33

diff --git a/xfce4-mixer.spec b/xfce4-mixer.spec
index 85c19160b97d89fc0d0b0fdabd6a784b910aaaf4..9530edbcba55661c95924898816a222119cd8558 100644 (file)
--- a/xfce4-mixer.spec
+++ b/xfce4-mixer.spec
@@ -1,25 +1,27 @@
 Summary:       Volume control plugin for the Xfce panel
 Summary(pl):   Wtyczka steruj±ca g³o¶no¶ci± dla panelu Xfce
 Name:          xfce4-mixer
-Version:       4.2.3
+Version:       4.3.90.2
 Release:       1
 License:       BSD
 Group:         X11/Applications/Sound
-Source0:       http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-%{version}/src/%{name}-%{version}.tar.gz
-# Source0-md5: b57fd602b3612fb84a92b124f3468511
+Source0:       http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
+# Source0-md5: 27bb4b4a6d1ccd598e8402ed7bb280d0
 Patch0:                %{name}-locale-names.patch
 URL:           http://www.xfce.org/
-BuildRequires: alsa-lib-devel >= 0.9.0
+BuildRequires: alsa-lib-devel >= 1.0.11
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: gettext-devel
+BuildRequires: intltool >= 0.35.0
 BuildRequires: libtool
 BuildRequires: libxfce4mcs-devel >= %{version}
 BuildRequires: pkgconfig >= 1:0.9.0
-BuildRequires: xfce-mcs-manager-devel >= %{version}
-BuildRequires: xfce4-dev-tools
+BuildRequires: xfce4-dev-tools >= %{version}
 BuildRequires: xfce4-panel-devel >= %{version}
-Requires:      alsa-lib >= 0.9.0
+BuildRequires: xfce-mcs-manager-devel >= %{version}
+Requires(post,postun): gtk+2 >= 2:2.10.0
+Requires:      alsa-lib >= 1.0.11
 Requires:      xfce4-panel >= %{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -40,13 +42,15 @@ mv -f po/{pt_PT,pt}.po
 
 %build
 %{__libtoolize}
-%{__aclocal} -I %{_datadir}/xfce4/dev-tools/m4macros
+%{__aclocal}
 %{__autoheader}
 %{__automake}
 %{__autoconf}
+LDFLAGS="%{rpmldflags} -Wl,--as-needed"
 %configure \
-       --disable-static
-
+       --disable-static \
+       --with-sound=alsa
+       
 %{__make}
 
 %install
@@ -62,6 +66,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/*/*.la
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
+
+%postun
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING README TODO
@@ -69,7 +79,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/xfce4/mcs-plugins/*.so
 # why no -avoid-version?
 %attr(755,root,root) %{_libdir}/xfce4/modules/lib*.so*
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/*.so
+%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/xfce4-mixer-plugin
+%{_datadir}/xfce4/panel-plugins/xfce4-mixer.desktop
 %{_iconsdir}/hicolor/*/*/*
 
 %{_desktopdir}/xfce-mixer-settings.desktop