rpms/amarok/devel amarok-2.0.2-no_qtscriptgenerator.patch, NONE, 1.1 amarok.spec, 1.142, 1.143

[Rex Dieter]

Author: rdieter

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

Modified Files:
	amarok.spec 
Added Files:
	amarok-2.0.2-no_qtscriptgenerator.patch 
Log Message:
* Tue Mar 10 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-4
- Req: qtscriptgenerator (f11+) (not enabled, pending review)
- use desktop-file-validate


amarok-2.0.2-no_qtscriptgenerator.patch:

--- NEW FILE amarok-2.0.2-no_qtscriptgenerator.patch ---
diff -up amarok-2.0.2/CMakeLists.txt.no_qtscriptgenerator amarok-2.0.2/CMakeLists.txt
--- amarok-2.0.2/CMakeLists.txt.no_qtscriptgenerator	2009-03-01 11:36:24.000000000 -0600
+++ amarok-2.0.2/CMakeLists.txt	2009-03-10 13:37:21.000000000 -0500
@@ -20,7 +20,7 @@ set( CMAKE_MODULE_PATH    ${CMAKE_MODULE
 
 #this line has to be before add_defintions, but after the KDE4 cmake includes
 #because they are used to determine install locations
-add_subdirectory( src/scriptengine/generator )
+#add_subdirectory( src/scriptengine/generator )
 add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 
 include(CheckLibraryExists)


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- amarok.spec	7 Mar 2009 01:21:14 -0000	1.142
+++ amarok.spec	10 Mar 2009 19:27:41 -0000	1.143
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -15,6 +15,10 @@
 Patch0:  amarok-libgpod-0.7.0.patch
 Patch1:  amarok-2.0.1.1-gcc44.patch
 
+# qtscriptgenerator review, http://bugzilla.redhat.com/489550
+#define no_qtscriptgenerator 1
+Patch2:  amarok-2.0.2-no_qtscriptgenerator.patch
+
 Patch100: amarok-2.0.1.1-qt45.patch
 
 BuildRequires: curl-devel
@@ -40,6 +44,10 @@
 %{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
 %{?kdelibs4_version:Requires: kdelibs4 >= %{kdelibs4_version}}
 
+%if 0%{?no_qtscriptgenerator}
+Requires: qtscriptgenerator
+%endif
+
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
@@ -58,12 +66,19 @@
 %prep
 %setup -q
 
-%if 0%{?fedora} > 10
+%if "%(pkg-config --modversion libgpod-1.0)" >=  "0.7.0"
 %patch0 -p0 -b .libgpod-0.7.0
-%patch100 -p0 -b .qt45
 %endif
+
 %patch1 -p1 -b .gcc4
 
+%if 0%{?no_qscriptgenerator}
+%patch2 -p1 -b .no_qtscriptgenerator
+#rm -rf src/scriptengine/generator
+%else
+%{?_qt45:%patch100 -p0 -b .qt45}
+%endif
+
 
 %build
 mkdir -p %{_target_platform}
@@ -86,18 +101,16 @@
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-# desktop files
-desktop-file-install  --vendor "" \
-  --dir %{buildroot}%{_kde4_datadir}/applications/kde4 \
-  --delete-original \
-  %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
-
-%find_lang amarok || touch amarok.lang
+%find_lang amarok
 
 # unpackaged files
 rm -f %{buildroot}%{_kde4_libdir}/libamarok{_taglib,lib,plasma,pud}.so
 
 
+%check
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/amarok.desktop
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -122,13 +135,15 @@
 %{_kde4_appsdir}/desktoptheme/amarok-default.desktop
 %{_kde4_appsdir}/desktoptheme/default/widgets/*
 %{_kde4_configdir}/*
-%{_kde4_datadir}/applications/kde4/*.desktop
+%{_kde4_datadir}/applications/kde4/amarok.desktop
 %{_kde4_datadir}/config.kcfg/*
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/kde4/*.so
+%if ! 0%{?no_qtscriptgenerator}
 %{_kde4_libdir}/kde4/plugins/script/*.so
+%endif
 %{_kde4_libdir}/libamarok*.so.*
 %{_kde4_libdir}/libamarok_service_liblastfm.so
 %{_kde4_libdir}/strigi/*
@@ -136,6 +151,10 @@
 
 
 %changelog
+* Tue Mar 10 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-4
+- Req: qtscriptgenerator (f11+) (not enabled, pending review)
+- use desktop-file-validate
+
 * Fri Mar 06 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-3
 - add minimal qt4,kdelibs4 deps