rpms/amarok/FC-5 .cvsignore, 1.20, 1.21 amarok.spec, 1.45, 1.46 sources, 1.20, 1.21

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10544/FC-5

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
update to beta3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	14 Mar 2006 08:38:52 -0000	1.20
+++ .cvsignore	14 Apr 2006 07:29:14 -0000	1.21
@@ -1 +1 @@
-amarok-1.4-beta2.tar.bz2
+amarok-1.4-beta3c.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- amarok.spec	21 Mar 2006 23:08:40 -0000	1.45
+++ amarok.spec	14 Apr 2006 07:29:14 -0000	1.46
@@ -1,21 +1,14 @@
-# Rebuild switch: 
-#  --with nonfree    Enables nonfree plugins (xine engine, MP4 support, iPod...)
-#
-
-%{?_with_nonfree: %define use_nonfree 1}
-
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4
-Release:    0.9.beta2%{?dist}
+Release:    0.11.beta3%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.4-beta2.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.4-beta3c.tar.bz2
 Patch0:     amarok-1.4beta1-gst10.patch
-Patch1:     amarok-1.4-helix.patch
-#Patch1:     amarok-1.3.6-libtunepimp040.patch
+#Patch1:     amarok-1.4-helix.patch
 Patch2:     amarok-1.4-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,10 +23,11 @@
 BuildRequires:  libtunepimp-devel >= 0.4.0
 BuildRequires:  kdebase-devel
 BuildRequires:  alsa-lib-devel
-BuildRequires:  akode-devel
+#BuildRequires:  akode-devel
 BuildRequires:  libifp-devel, libusb-devel
 %if "%fedora" >= "5"
 BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel
+BuildRequires:  libgpod-devel
 %else
 BuildRequires:  gstreamer-plugins-devel >= 0.8.4
 %endif
@@ -41,12 +35,6 @@
 BuildRequires:  HelixPlayer
 %endif
 
-%if  0%{?use_nonfree}
-BuildRequires:  xine-lib-devel >= 0:1.0.0
-BuildRequires:  libmad-devel
-BuildRequires:  faad2-devel
-%endif
-
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -79,32 +67,13 @@
 use any of xmms' visualisation plugins with Amarok.
 
 
-%if 0%{?use_nonfree}
-%package nonfree
-Summary:    Non-free plugins for Amarok
-Group:      Applications/Multimedia
-Requires:   %{name} = %{version}
-Obsoletes:  %{name}-xine < %{version}
-Provides:   %{name}-xine = %{version}
-
-%description nonfree
-This package adds the patented/non-free plugins for Amarok:
- - xine engine
- - mp4 tagging support (not yet done)
- - iPod support (not yet done)
-%endif
-
 
 %prep
-%setup -q -n %{name}-%{version}-beta2
+%setup -q -n %{name}-%{version}-beta3c
 # Discover the helix libs
-%patch1 -p1 -b .helix
-# Use libtunepimp 0.4.0 (api changed)
-#%patch1 -p1 -b .libtunepimp040
+#%patch1 -p1 -b .helix
 # Gstreamer default sink should be autoaudiosink
 %patch2 -p1 -b .engines-cfg
-# Don't use cache to detect gst 0.10 or it will fail because gst 0.8 is not present
-#%patch0 -p1 -b .gst10
 
 
 %build
@@ -118,17 +87,11 @@
      --enable-mysql \
      --enable-postgresql \
      --with-ifp \
-%ifnarch ppc64 x86_64 s390 s390x ia64
-     --with-helix=%{_libdir}/helix \
-%endif
-%if 0%{?use_nonfree}
-     --with-xine \
-#     --with-mp4v2 \  # Compile fails
-#     --with-libgpod \ # Not packaged yet
-%else
+     --with-libgpod \
      --without-xine \
      --without-mp4v2 \
-#     --without-libgpod \
+%ifnarch ppc64 x86_64 s390 s390x ia64
+     --with-helix=%{_libdir}/helix \
 %endif
 #     --enable-final \
 #     --with-nmm \
@@ -147,13 +110,6 @@
 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 "" \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
         --delete-original \
@@ -161,7 +117,7 @@
         --add-category X-Fedora \
         $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarokapp.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 {} ';'
 # Remove the *.la file in /usr/lib though, those are OK to delete
@@ -207,16 +163,19 @@
 %{_bindir}/amarokapp
 %{_bindir}/amarokcollectionscanner
 %{_datadir}/apps/%{name}
+%exclude %{_datadir}/apps/%{name}/images/xine_logo.png
 %{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/services/amarok_void-engine_plugin.desktop
 %{_datadir}/services/amarok_ifp-mediadevice.desktop
 %{_datadir}/services/amarok_vfat-mediadevice.desktop
+%{_datadir}/services/amarok_ipod-mediadevice.desktop
 %{_datadir}/servicetypes/*.desktop
 %{_datadir}/apps/konqueror/servicemenus/*.desktop
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
 %{_libdir}/kde3/libamarok_ifp-mediadevice.*
 %{_libdir}/kde3/libamarok_vfat-mediadevice.*
+%{_libdir}/kde3/libamarok_ipod-mediadevice.*
 %{_libdir}/kde3/konqsidebar_universalamarok.*
 %{_libdir}/libamarok.*
 %{_datadir}/apps/konqsidebartng/*/amarok.desktop
@@ -231,9 +190,9 @@
 %{_datadir}/services/amarok_gstengine_plugin.desktop
 %{_libdir}/kde3/libamarok_gstengine_plugin.*
 %endif
-# Akode engine
-%{_datadir}/services/amarok_aKode-engine.desktop
-%{_libdir}/kde3/libamarok_aKode-engine.*
+# Akode engine - disabled in beta3
+#%{_datadir}/services/amarok_aKode-engine.desktop
+#%{_libdir}/kde3/libamarok_aKode-engine.*
 # Helix engine
 %ifnarch ppc64 x86_64 s390 s390x ia64
 %{_libdir}/kde3/libamarok_helixengine_plugin.*
@@ -241,22 +200,21 @@
 %endif
 
 
-
 %files visualisation
 %defattr(-,root,root)
 %{_bindir}/amarok_libvisual
 %{_bindir}/amarok_xmmswrapper2
 
 
-%if 0%{?use_nonfree}
-%files nonfree
-%defattr(-,root,root)
-%{_libdir}/kde3/libamarok_xine-engine.*
-%{_datadir}/services/amarok_xine-engine.desktop
-%endif
-
 
 %changelog
+* Sun Apr 09 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.11.beta3
+- drop the non-free bits
+- beta 3 (akode has been disabled)
+
+* Wed Mar 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.10.beta2
+- enable libgpod support
+
 * Wed Mar 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.9.beta2
 - make amarok build even with gstreamer only
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	14 Mar 2006 08:38:52 -0000	1.20
+++ sources	14 Apr 2006 07:29:14 -0000	1.21
@@ -1 +1 @@
-0c7e2a5e8ea2d73d8e73b986090cfc37  amarok-1.4-beta2.tar.bz2
+b92433b46005f0b2fc31e0ce0bf4cb3a  amarok-1.4-beta3c.tar.bz2