rpms/amarok/devel .cvsignore, 1.18, 1.19 amarok.spec, 1.36, 1.37 sources, 1.18, 1.19

Fri Feb 17 11:00:42 UTC 2006

Author: abompard

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

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
- version 1.4 beta1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19

--- .cvsignore	22 Jan 2006 09:07:44 -0000	1.18
+++ .cvsignore	17 Feb 2006 11:00:41 -0000	1.19
@@ -1 +1 @@
-amarok-1.3.8.tar.bz2
+amarok-1.4-beta1.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- amarok.spec	12 Feb 2006 11:52:12 -0000	1.36
+++ amarok.spec	17 Feb 2006 11:00:41 -0000	1.37
@@ -1,20 +1,20 @@
 # Rebuild switch: 
-#  --with xine    Enables xine engine
+#  --with nonfree    Enables nonfree plugins (xine engine, MP4 support, iPod...)
 #
 
-%{?_with_xine: %define use_xine 1}
+%{?_with_nonfree: %define use_nonfree 1}
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.3.8
-Release:    2%{?dist}
+Version:    1.4
+Release:    0.1.beta1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.3.8.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.4-beta1.tar.bz2
 #Patch0:     amarok-1.3.4-helix-libs.patch
-Patch1:     amarok-1.3.6-libtunepimp040.patch
+#Patch1:     amarok-1.3.6-libtunepimp040.patch
 Patch2:     amarok-1.3-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,10 +29,10 @@
 BuildRequires:  libtunepimp-devel >= 0.4.0
 BuildRequires:  kdebase-devel
 BuildRequires:  alsa-lib-devel
+BuildRequires:  akode-devel
+BuildRequires:  libifp-devel, libusb-devel
 %if "%fedora" >= "5"
-# Support for gstreamer 0.10 is not there yet
-#BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel
-BuildRequires:  gstreamer08-plugins-devel
+BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel
 %else
 BuildRequires:  gstreamer-plugins-devel >= 0.8.4
 %endif
@@ -40,9 +40,10 @@
 BuildRequires:  HelixPlayer
 %endif
 
-%if  0%{?use_xine}
+%if  0%{?use_nonfree}
 BuildRequires:  xine-lib-devel >= 0:1.0.0
 BuildRequires:  libmad-devel
+BuildRequires:  faad2-devel
 %endif
 
 Requires:   kdemultimedia >= 6:3.2
@@ -50,6 +51,7 @@
 Requires(postun): desktop-file-utils
 
 Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
+Provides:  amarok-devel = %{version}-%{release}
 
 
 %description
@@ -77,24 +79,28 @@
 use any of xmms' visualisation plugins with Amarok.
 
 
-%if 0%{?use_xine}
-%package xine
-Summary:    Xine engine for 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 xine
-Amarok can also use the xine engine to decode sound. This package
-enables it
+%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
+%setup -q -n %{name}-%{version}-beta1
 # Discover the helix libs
 #%patch0 -p1 -b .helix-libs
 # Use libtunepimp 0.4.0 (api changed)
-%patch1 -p1 -b .libtunepimp040
+#%patch1 -p1 -b .libtunepimp040
 # Gstreamer default sink should be autoaudiosink
 %patch2 -p1 -b .engines-cfg
 
@@ -109,14 +115,23 @@
      --with-helix=%{_libdir}/helix \
      --enable-mysql \
      --enable-postgresql \
-%if %{?use_xine:0}%{!?use_xine:1}
-     --without-xine
+     --with-ifp \
+%if 0%{?use_nonfree}
+     --with-xine \
+#     --with-mp4v2 \  # Compile fails
+#     --with-libgpod \ # Not packaged yet
+%else
+     --without-xine \
+     --without-mp4v2 \
+#     --without-libgpod \
 %endif
 #     --enable-final \
 #     --with-nmm \
 #     --with-mas
 
-make %{?_smp_mflags}
+# fails with smp flags
+#make %{?_smp_mflags}
+make
 
 
 %install
@@ -144,6 +159,9 @@
 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
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
 
 %find_lang %{name}
 # HTML
@@ -161,6 +179,7 @@
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database &> /dev/null ||:
+ldconfig
 
 %postun
 # update icon themes if necessary
@@ -169,6 +188,7 @@
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database &> /dev/null ||:
+ldconfig
 
 
 %clean
@@ -180,16 +200,24 @@
 %doc COPYING AUTHORS ChangeLog README
 %{_bindir}/amarok
 %{_bindir}/amarokapp
+%{_bindir}/amarokcollectionscanner
 %{_datadir}/apps/%{name}
 %{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/services/amarok_gstengine_plugin.desktop
 %{_datadir}/services/amarok_void-engine_plugin.desktop
+%{_datadir}/services/amarok_aKode-engine.desktop
+%{_datadir}/services/amarok_ifp-mediadevice.desktop
+%{_datadir}/services/amarok_vfat-mediadevice.desktop
 %{_datadir}/servicetypes/*.desktop
 %{_datadir}/apps/konqueror/servicemenus/*.desktop
 %{_libdir}/kde3/libamarok_gstengine_plugin.*
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
+%{_libdir}/kde3/libamarok_aKode-engine.*
+%{_libdir}/kde3/libamarok_ifp-mediadevice.*
+%{_libdir}/kde3/libamarok_vfat-mediadevice.*
 %{_libdir}/kde3/konqsidebar_universalamarok.*
+%{_libdir}/libamarok.*
 %{_datadir}/apps/konqsidebartng/*/amarok.desktop
 %{_datadir}/apps/profiles/amarok.profile.xml
 %{_libdir}/mcop/Amarok
@@ -207,22 +235,25 @@
 %endif
 
 
+
 %files visualisation
 %defattr(-,root,root)
 %{_bindir}/amarok_libvisual
 %{_bindir}/amarok_xmmswrapper2
 
 
-%if 0%{?use_xine}
-%files xine
+%if 0%{?use_nonfree}
+%files nonfree
 %defattr(-,root,root)
 %{_libdir}/kde3/libamarok_xine-engine.*
 %{_datadir}/services/amarok_xine-engine.desktop
-#%{_datadir}/services/amarok_xine-engine_plugin.desktop
 %endif
 
 
 %changelog
+* Wed Feb 15 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.1.beta1
+- version 1.4-beta1
+
 * Sun Feb 12 2006 Aurelien Bompard <gauret[AT]free.fr> 1.3.8-2
 - fix BR for gstreamer < 0.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	22 Jan 2006 09:07:44 -0000	1.18
+++ sources	17 Feb 2006 11:00:41 -0000	1.19
@@ -1 +1 @@
-fd1ee0509568e5f9f7d0aeb9af094786  amarok-1.3.8.tar.bz2
+78dfa2c8c65cb7fe1cf26aaa6cc193e8  amarok-1.4-beta1.tar.bz2


