- merged from DEVEL

Changed files:
    xfce4-mixer.spec -> 1.18

diff --git a/xfce4-mixer.spec b/xfce4-mixer.spec
index 7ba6fde128c16cffe1f88c583d6f38af33d0101e..32d9b92c87c76d3eb62d290f2053708b8edb845e 100644 (file)
--- a/xfce4-mixer.spec
+++ b/xfce4-mixer.spec
@@ -1,23 +1,27 @@
+#
+# TODO there's not a single word about startup-notification
+# in configure.ac
 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.0.6
+Version:       4.1.99.1
 Release:       1
 License:       BSD
 Group:         X11/Applications/Sound
-#Source0:      ftp://ftp.berlios.de/pub/xfce-goodies/%{version}/%{name}-%{version}.tar.gz
-Source0:       http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-%{version}/src/%{name}-%{version}.tar.gz
-# Source0-md5: 2261901f5f8cb0e794e8cfd00c25952e
+Source0:       ftp://ftp.berlios.de/pub/xfce-goodies/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 935091fdd3860ea51db949fdec14cc75
 Patch0:                %{name}-locale-names.patch
 URL:           http://www.xfce.org/
+BuildRequires: alsa-lib-devel >= 0.9.0
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: pkgconfig >= 0.9.0
-BuildRequires: startup-notification-devel >= 0.5
-BuildRequires: xfce4-panel-devel >= %{version}
-Requires:      startup-notification >= 0.5
-Requires:      xfce4-panel >= %{version}
+#BuildRequires:        startup-notification-devel >= 0.4
+BuildRequires: xfce4-panel-devel >= 4.1.0
+Requires:      alsa-lib >= 0.9.0
+#Requires:     startup-notification >= 0.4
+Requires:      xfce4-panel >= 4.1.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -32,17 +36,17 @@ prosty mikser d
 %setup -q
 %patch0 -p1
 
-mv -f po/{fa_IR,fa}.po
 mv -f po/{no,nb}.po
 mv -f po/{pt_PT,pt}.po
 
 %build
 %{__libtoolize}
 %{__aclocal} -I m4
-%{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%{__autoconf}
+%configure \
+       --disable-static
 
 %{__make}
 
@@ -52,7 +56,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/panel-plugins/*.{la,a}
+rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/*/*.{la,a}
 
 %find_lang %{name}
 
@@ -62,4 +66,8 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING README TODO
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/*.so
+%attr(755,root,root) %{_bindir}/xfce4-mixer
+%attr(755,root,root) %{_libdir}/xfce4/*/*.so*
+%{_iconsdir}/hicolor/*/*/*
+
+%{_desktopdir}/xfce-mixer-settings.desktop