- Updated to 040511 snap (1.0 beta 3 or sth near here)

- Sucks a bit fewer

Changed files:
    amarok.spec -> 1.9

diff --git a/amarok.spec b/amarok.spec
index 9a44426cf79f00f1691fbc96a34ab3c66290eec6..efde37c6be70466979da1262643dae52d0447d11 100644 (file)
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,12 +1,18 @@
+
+%define                _ver            1.0
+%define                _snap           040511
+%define                _packeger       adgor
+
 Summary:       A KDE audio player
 Summary(pl):   Odtwarzacz audio dla KDE
 Name:          amarok
-Version:       0.8.3
-Release:       1
+Version:       %{_ver}
+Release:       0.%{_snap}.1
 License:       GPL
 Group:         X11/Applications/Multimedia
-Source0:       http://dl.sourceforge.net/amarok/%{name}-%{version}.tar.bz2
-# Source0-md5: bdd9532e983ca85711e93929c008a5ba
+Source0:       http://ep09.pld-linux.org/~%{_packager}/kde/%{name}-%{_snap}.tar.bz2
+# Source0-md5: ad33ab910393bba33f27bd90400498e9
+#Source0:      http://dl.sourceforge.net/amarok/%{name}-%{version}.tar.bz2
 URL:           http://amarok.sf.net/
 Buildrequires: arts-qt-devel
 Buildrequires: automake
@@ -25,14 +31,18 @@ A KDE audio player.
 Odtwarzacz audio dla KDE.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{_snap}
 
 %build
 cp -f /usr/share/automake/config.sub admin
+
+export UNSERMAKE=/usr/share/unsermake/unsermake
+
+%{__make} -f admin/Makefile.common cvs
+
 %configure \
-       --with-qt-libraries=%{_libdir} \
        --disable-rpath \
-       --enable-final
+       --with-qt-libraries=%{_libdir}
 
 %{__make}
 
@@ -41,15 +51,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       kde_appsdir=%{_applnkdir} \
        kde_htmldir=%{_kdedocdir}
-install -d $RPM_BUILD_ROOT%{_desktopdir}/kde
-
-mv $RPM_BUILD_ROOT{%{_applnkdir}/Multimedia/amarok.desktop,%{_desktopdir}/kde}
-
-# Grrr...
-sed -i 's/Categories=Audio/Categories=AudioVideo/' \
-       $RPM_BUILD_ROOT%{_desktopdir}/kde/amarok.desktop
 
 %find_lang %{name} --with-kde
 
@@ -59,12 +61,19 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/amarok
+%attr(755,root,root) %{_bindir}/amarok_xmmswrapper
+%attr(755,root,root) %{_bindir}/amarokapp
+%{_libdir}/kde3/libamarok_artsengine_plugin.la
+%attr(755,root,root) %{_libdir}/kde3/libamarok_artsengine_plugin.so
 %{_libdir}/libamarokarts.la
 %attr(755,root,root) %{_libdir}/libamarokarts.so
 %{_libdir}/mcop/Amarok
 %{_libdir}/mcop/amarokarts.mcopclass
 %{_libdir}/mcop/amarokarts.mcoptype
 %{_datadir}/apps/amarok
+%{_datadir}/config.kcfg/amarok.kcfg
+%{_datadir}/services/amarok_artsengine_plugin.desktop
+%{_datadir}/servicetypes/amarok_plugin.desktop
 %{_desktopdir}/kde/amarok.desktop
 %{_iconsdir}/[!l]*/*/apps/amarok.png
 %{_datadir}/config/*