devel/amarok .cvsignore, 1.4, 1.5 amarok.spec, 1.4, 1.5 sources, 1.4, 1.5 amarok.desktop, 1.1, NONE amarok.servicemenu, 1.1, NONE

Mon Feb 14 16:07:34 UTC 2005

Author: abompard

Update of /cvs/extras/devel/amarok
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30786

Modified Files:
	.cvsignore amarok.spec sources 
Removed Files:
	amarok.desktop amarok.servicemenu 
Log Message:
- update to version 1.2
- big update, see changelog for more info



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/amarok/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5

--- .cvsignore	8 Nov 2004 04:02:19 -0000	1.4
+++ .cvsignore	14 Feb 2005 16:07:32 -0000	1.5
@@ -1 +1 @@
-amarok-1.1.tar.bz2
+amarok-1.2.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/devel/amarok/amarok.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- amarok.spec	10 Dec 2004 22:03:01 -0000	1.4
+++ amarok.spec	14 Feb 2005 16:07:32 -0000	1.5
@@ -6,27 +6,22 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.1.0
-Release:    2
-Epoch:      0
+Version:    1.2
+Release:    1
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.1.tar.bz2
-Source1:    amarok.desktop
-Source2:    amarok.servicemenu
+Source0:    http://dl.sf.net/amarok/amarok-1.2.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	kdelibs-devel >= 6:3.2, libjpeg-devel, libpng-devel 
-BuildRequires:  glib2-devel kdemultimedia-devel >= 6:3.2
-BuildRequires:  libmng-devel alsa-lib-devel 
-BuildRequires:  taglib-devel >= 0:1.3, esound-devel, xmms-devel
+BuildRequires:  kdemultimedia-devel >= 6:3.2
+BuildRequires:  taglib-devel >= 0:1.3, esound-devel
 BuildRequires:  desktop-file-utils, gettext
 BuildRequires:  xorg-x11-Mesa-libGL
-BuildRequires:  gstreamer-devel >= 0:0.8.1
-BuildRequires:  gstreamer-plugins-devel >= 0:0.8.1
+BuildRequires:  gstreamer-plugins-devel >= 0:0.8.4
 BuildRequires:  libmusicbrainz-devel, xmms-devel >= 1:1.2
+BuildRequires:  libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel
 
 %if  0%{?use_xine}
 BuildRequires:  xine-lib-devel >= 0:1.0.0
@@ -40,16 +35,38 @@
 %description
 Amarok is a KDE multimedia player with:
  - fresh playlist concept, very fast to use, with drag and drop
- - plays all formats supported by aRts or gstreamer
+ - plays all formats supported by aRts, gstreamer or xine
  - audio effects, like reverb and compressor
  - compatible with the .m3u and .pls formats for playlists
  - nice GUI, integrates into the KDE look, but with a unique touch
 
+
+%package visualisation
+Summary:    Visualisation plugins for Amarok
+Group:      Applications/Multimedia
+Requires:   %{name} = %{version}
+
+%description visualisation
+Amarok can use visualisation plugins from different origins.
+Right now, only xmms is supported, which means that you can
+use any of xmms' visualisation plugins with Amarok.
+
+
+%package arts
+Summary:    Arts engine for Amarok
+Group:      Applications/Multimedia
+Requires:   %{name} = %{version}
+
+%description arts
+Amarok can also use the arts engine to decode sound. This package
+enables it.
+
+
 %if 0%{?use_xine}
 %package xine
 Summary:    Xine engine for Amarok
 Group:      Applications/Multimedia
-Requires:   %{name} = %{epoch}:%{version}
+Requires:   %{name} = %{version}
 
 %description xine
 Amarok can also use the xine engine to decode sound. This package
@@ -58,19 +75,17 @@
 
 
 %prep
-%setup  -q -n %{name}-1.1
-perl -pi -e 's,\$\(KDE_LANG\)//,\$\(KDE_LANG\)/amarok/,g' doc/??/Makefile.in
-perl -pi -e 's,\$\(KDE_LANG\)/$,\$\(KDE_LANG\)/amarok,g' doc/??/Makefile.in
+%setup -q
 
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 %configure \
-     --disable-rpath \
      --disable-debug \
-%if 0%{?use_xine}
-     --with-xine
+%if %{?use_xine:0}%{!?use_xine:1}
+     --without-xine
 %endif
+#     --disable-rpath \
 #     --enable-final \
 #     --with-nmm \
 #     --with-mas
@@ -84,55 +99,76 @@
 
 # desktop files
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus
+
+# The desktop file contains both the desktop entry and the service menu, we have to split.
+# Tail from the blank line:
+perl -ne '/^$/...do{print;0}' $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop \
+    > $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/%name.desktop
+# Head until the blank line:
+perl -pi -e '/^$/ && exit' $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
 desktop-file-install  --vendor fedora \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+        --delete-original \
         --add-only-show-in KDE \
         --add-category Application \
         --add-category X-Fedora \
-        %{SOURCE1}
+        $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus
-install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/%name.desktop
-
-rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Multimedia/%{name}.desktop
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarokapp.desktop
 # Amarok crashes without the *.la files !
 #find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
-# rename .mo files from amarok-%version.mo to amarok.mo
-#for file in $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/amarok-%version.mo; do
-#    mv "$file" "`dirname $file`/`basename $file -%version.mo`.mo"
-#done    
 %find_lang %{name}
 
+
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+
 %clean
 rm -fr $RPM_BUILD_ROOT
 
+
 %files -f %{name}.lang
 %defattr(-,root,root)
-%_bindir/*
+%{_bindir}/amarok
+%{_bindir}/amarokapp
+%{_bindir}/release_amarok
 %_datadir/apps/%{name}
 %_datadir/icons/*/*/*
-%{_datadir}/applications/*.desktop
-%{_datadir}/services/amarok_artsengine_plugin.desktop
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/services/amarok_gstengine_plugin.desktop
 %{_datadir}/services/amarok_void-engine_plugin.desktop
 %{_datadir}/servicetypes/*.desktop
 %{_datadir}/apps/konqueror/servicemenus/*.desktop
-%{_libdir}/lib*
-%{_libdir}/kde3/libamarok_artsengine_plugin.*
 %{_libdir}/kde3/libamarok_gstengine_plugin.*
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
+%{_libdir}/kde3/konqsidebar_universalamarok.*
+%{_datadir}/apps/konqsidebartng/add/amarok.desktop
+%{_datadir}/apps/profiles/amarok.profile.xml
+
 %{_libdir}/mcop/Amarok
 %{_libdir}/mcop/amarok*
 %{_datadir}/config/amarokrc
 %{_datadir}/config.kcfg/*.kcfg
 %{_datadir}/doc/HTML/*/amarok
 
+
+%files visualisation
+%defattr(-,root,root)
+%{_bindir}/amarok_libvisual
+%{_bindir}/amarok_xmmswrapper2
+
+
+%files arts
+%defattr(-,root,root)
+%{_libdir}/libamarokarts*
+%{_libdir}/kde3/libamarok_artsengine_plugin.*
+%{_datadir}/services/amarok_artsengine_plugin.desktop
+
+
 %if 0%{?use_xine}
 %files xine
 %defattr(-,root,root)
@@ -143,6 +179,28 @@
 
 
 %changelog
+* Sun Feb 13 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2-1
+- version 1.2 final
+- drop --disable-rpath, won't build with it.
+- drop epoch
+
+* Thu Feb 10 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.2-0.2.beta4
+- version 1.2 beta 4
+
+* Sat Nov 27 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.2-0.fdr.0.1.beta1
+- version 1.2beta 1
+- minor cleanups
+- don't ship the desktop files, split the provided one instead
+
+* Sun Oct 24 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.1.1-0.fdr.2
+- clean-up buildrequires
+- fix --with xine switch
+- make a -visualisation subpackage for visualisation plugins
+- make a -arts subpackage to lower dependencies
+
+* Wed Oct 20 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.1.1-0.fdr.1
+- version 1.1.1
+
 * Mon Sep 27 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.1.0-0.fdr.2
 - improve buildrequires
 


Index: sources
===================================================================
RCS file: /cvs/extras/devel/amarok/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Nov 2004 04:02:19 -0000	1.4
+++ sources	14 Feb 2005 16:07:32 -0000	1.5
@@ -1 +1 @@
-d898293eecd2a64bea92f50777e5131d  amarok-1.1.tar.bz2
+8db7d8985152ff29e8fb7377ada74527  amarok-1.2.tar.bz2


--- amarok.desktop DELETED ---


--- amarok.servicemenu DELETED ---


