rpms/amarok/devel .cvsignore, 1.34, 1.35 amarok.spec, 1.116, 1.117 sources, 1.34, 1.35

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4867

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
* Wed Aug 20 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.90-1
- amarok-1.90 (amarok2 beta)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	22 Jul 2008 19:39:28 -0000	1.34
+++ .cvsignore	22 Aug 2008 16:37:11 -0000	1.35
@@ -1 +1 @@
-amarok-1.86.tar.bz2
+amarok-1.90.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- amarok.spec	15 Aug 2008 19:10:36 -0000	1.116
+++ amarok.spec	22 Aug 2008 16:37:11 -0000	1.117
@@ -1,15 +1,17 @@
 
 Name:    amarok
 Summary: Media player
-Version: 1.86 
+Version: 1.90
 Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
 Url:     http://amarok.kde.org/
-Source0: http://download.kde.org/unstable/amarok/1.86/src/amarok-1.86.tar.bz2
+Source0: http://download.kde.org/unstable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: amarok-1.90-lib64.patch
+
 BuildRequires: alsa-lib-devel
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -23,6 +25,7 @@
 BuildRequires: libifp-devel
 BuildRequires: libgpod-devel
 BuildRequires: libmp4v2-devel
+BuildRequires: libmtp-devel >= 0.3.0
 BuildRequires: libmusicbrainz-devel
 BuildRequires: libnjb-devel
 BuildRequires: libtunepimp-devel
@@ -54,6 +57,13 @@
 %prep
 %setup -q 
 
+# ugh, hard-coded prefix/lib (LIB_SUFFIX vs LIB_INSTALL_DIR ?)
+#sed -i --in-place=.lib64 -e 's| lib/kde4| ${LIB_INSTALL_DIR}/kde4|' \
+#  src/scriptengine/generator/generator/*.cmake \
+#  src/scripts/qtscript_debug/CMakeLists.txt
+%patch1 -p1 -b .lib64
+
+
 
 %build
 mkdir -p %{_target_platform}
@@ -112,12 +122,17 @@
 %{_kde4_datadir}/kde4/servicetypes/*.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/kde4/*.so
+%{_kde4_libdir}/kde4/plugins/script/amarok/
+%{_kde4_libdir}/kde4/plugins/script/*.so
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/strigi/*
 %{_datadir}/dbus-1/interfaces/*.xml
 
 
 %changelog
+* Wed Aug 20 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.90-1
+- amarok-1.90 (amarok2 beta)
+
 * Tue Jul 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.86-1
 - amarok-1.86 (amarok2 alpha 2)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	22 Jul 2008 19:39:28 -0000	1.34
+++ sources	22 Aug 2008 16:37:11 -0000	1.35
@@ -1 +1 @@
-acf43672687a5f261ce36d668338a4c1  amarok-1.86.tar.bz2
+823fcaea9450110bc9ea9fceba674b4e  amarok-1.90.tar.bz2