- updated to 4.6.0

- removed obsolete -locale-names.patch

Changed files:
    xfce4-mixer.spec -> 1.47

diff --git a/xfce4-mixer.spec b/xfce4-mixer.spec
index aeb554653330fc092dbb37c7917c198dc93d8e56..4acf8c2fbe4fb4e010536dd47356db2ebd0fcb70 100644 (file)
--- a/xfce4-mixer.spec
+++ b/xfce4-mixer.spec
@@ -1,29 +1,25 @@
 Summary:       Volume control plugin for the Xfce panel
 Summary(pl.UTF-8):     Wtyczka sterująca głośnością dla panelu Xfce
 Name:          xfce4-mixer
-Version:       4.4.3
-Release:       2
-License:       GPL
+Version:       4.6.0
+Release:       1
+License:       GPL v2
 Group:         X11/Applications/Sound
 Source0:       http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5: 0d7b402acaffdb5d8b292f2ce3ea1441
-Patch0:                %{name}-locale-names.patch
-URL:           http://www.xfce.org/
-BuildRequires: alsa-lib-devel >= 1.0.11
+# Source0-md5: ee7956a73efe43da4b27ad9cd1f4d20b
+URL:           http://www.xfce.org/projects/xfce4-mixer/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: gettext-devel
+BuildRequires: gstreamer-plugins-base-devel >= 0.10.14
+BuildRequires: gtk+2-devel >= 2:2.10.6
 BuildRequires: intltool >= 0.35.0
 BuildRequires: libtool
-BuildRequires: libxfce4mcs-devel >= %{version}
+BuildRequires: libxfcegui4-devel >= %{version}
 BuildRequires: pkgconfig >= 1:0.9.0
-BuildRequires: rpmbuild(macros) >= 1.311
-BuildRequires: xfce-mcs-manager-devel >= %{version}
-BuildRequires: xfce4-dev-tools >= 4.4.0.1
+BuildRequires: xfce4-dev-tools >= 4.6.0
 BuildRequires: xfce4-panel-devel >= %{version}
-Requires(post,postun): gtk+2
-Requires(post,postun): hicolor-icon-theme
-Requires:      alsa-lib >= 1.0.11
+BuildRequires: xfconf-devel >= %{version}
 Requires:      xfce4-panel >= %{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -37,12 +33,6 @@ prosty mikser dźwięku.
 
 %prep
 %setup -q
-%patch0 -p1
-
-mv -f po/{nb_NO,nb}.po
-mv -f po/{pt_PT,pt}.po
-
-rm -f panel-plugin/xfce4-mixer.desktop
 
 %build
 %{__intltoolize}
@@ -51,11 +41,8 @@ rm -f panel-plugin/xfce4-mixer.desktop
 %{__autoheader}
 %{__automake}
 %{__autoconf}
-%configure \
-       --disable-static \
-       --with-sound=alsa
-
-%{__make} -j1
+%configure
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -63,28 +50,20 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/*/*.la
+mv $RPM_BUILD_ROOT%{_datadir}/locale/nb{_NO,}
+mv $RPM_BUILD_ROOT%{_datadir}/locale/pt{_PT,}
 
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-%update_icon_cache hicolor
-
-%postun
-%update_icon_cache hicolor
-
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING README TODO
+%doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_bindir}/xfce4-mixer
-%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/xfce4-mixer-plugin
-%{_datadir}/xfce4/panel-plugins/xfce4-mixer.desktop
-%{_iconsdir}/hicolor/*/*/*
-
-%{_desktopdir}/xfce-mixer-settings.desktop
+%{_datadir}/xfce4/panel-plugins/xfce4-mixer-plugin.desktop
+%{_datadir}/xfce4-mixer
+%{_desktopdir}/xfce4-mixer.desktop
+%{_pixmapsdir}/xfce4-mixer