rpms/amarok/devel .cvsignore, 1.35, 1.36 amarok.spec, 1.118, 1.119 sources, 1.35, 1.36 amarok-1.90-lib64.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore amarok.spec sources 
Removed Files:
	amarok-1.90-lib64.patch 
Log Message:
* Thu Oct 02 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.92-1
- amarok-1.92 (amarok2 beta2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	22 Aug 2008 16:37:11 -0000	1.35
+++ .cvsignore	2 Oct 2008 12:43:37 -0000	1.36
@@ -1 +1 @@
-amarok-1.90.tar.bz2
+amarok-1.92.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- amarok.spec	25 Aug 2008 13:23:01 -0000	1.118
+++ amarok.spec	2 Oct 2008 12:43:37 -0000	1.119
@@ -1,7 +1,7 @@
 
 Name:    amarok
 Summary: Media player
-Version: 1.90
+Version: 1.92
 Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
@@ -10,8 +10,6 @@
 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
@@ -35,17 +33,14 @@
 BuildRequires: libvisual-devel
 BuildRequires: libxml2-devel
 BuildRequires: loudmouth-devel
-BuildRequires: mysql-devel
+BuildRequires: mysql-embedded-devel
 BuildRequires: soprano-devel
 BuildRequires: taglib-devel
 
-%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
-#Requires: kdelibs4 >= 4.1.0
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
-Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
-Obsoletes: amarok-devel < %{version}-%{release}
+Obsoletes: amarok-devel < 1.4.9 
 Obsoletes: amarok-konqueror < 1.5
 Obsoletes: amarok-visualisation < 1.5
 
@@ -57,17 +52,9 @@
  - compatible with the .m3u and .pls formats for playlists
  - nice GUI, integrates into the KDE look, but with a unique touch
 
-
 %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}
@@ -126,7 +113,6 @@
 %{_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/*
@@ -134,6 +120,9 @@
 
 
 %changelog
+* Thu Oct 02 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.92-1
+- amarok-1.92 (amarok2 beta2)
+
 * Wed Aug 20 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.90-1
 - amarok-1.90 (amarok2 beta)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	22 Aug 2008 16:37:11 -0000	1.35
+++ sources	2 Oct 2008 12:43:37 -0000	1.36
@@ -1 +1 @@
-823fcaea9450110bc9ea9fceba674b4e  amarok-1.90.tar.bz2
+235a8d3adcb691f46d25df44d7979efd  amarok-1.92.tar.bz2


--- amarok-1.90-lib64.patch DELETED ---