rpms/kdeplasma-addons/F-10 .cvsignore, 1.8, 1.9 kdeplasma-addons.spec, 1.12, 1.13

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27591

Modified Files:
	.cvsignore kdeplasma-addons.spec 
Log Message:
* Mon Mar 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-2
- make bball applet work (ship .svg instead of .svgz)
- use new %_qt45 macro
- spec housecleaning



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Jan 2009 14:50:54 -0000	1.8
+++ .cvsignore	17 Mar 2009 19:17:42 -0000	1.9
@@ -3,3 +3,4 @@
 kdeplasma-addons-4.1.85.tar.bz2
 kdeplasma-addons-4.1.96.tar.bz2
 kdeplasma-addons-4.2.0.tar.bz2
+kdeplasma-addons-4.2.1.tar.bz2


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-10/kdeplasma-addons.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kdeplasma-addons.spec	27 Feb 2009 18:21:20 -0000	1.12
+++ kdeplasma-addons.spec	17 Mar 2009 19:17:42 -0000	1.13
@@ -1,27 +1,29 @@
+
 Name:           kdeplasma-addons
 Version:        4.2.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeplasma-addons-%{version}.tar.bz2
+# http://ivan.fomentgroup.org/blog/2009/03/09/patch-for-lancelot-and-qt4/
+# http://bugs.gentoo.org/258758
+Patch0:         kdeplasma-addons-4.2.1-lancelot-qt45.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel
 BuildRequires:  gettext
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  plasma-devel >= %{version}
 # for libplasmaclock
 BuildRequires:  kdebase-workspace-devel >= %{version}
-BuildRequires:  openldap-devel
-BuildRequires:  qimageblitz-devel
-%if 0%{?fedora} >= 10
+%if 0%{?fedora} > 9
 # Optional (but recommended), enables automatic rotation for frame applet
-# Not available on Fedora 9
 BuildRequires:  libkexiv2-devel >= 0.4.0
 %endif
+BuildRequires:  plasma-devel >= %{version}
+BuildRequires:  qimageblitz-devel
 
 # most of former kdeaddons for KDE3 is now here
 Obsoletes: kdeaddons < 4
@@ -46,6 +48,9 @@
 
 %prep
 %setup -q -n kdeplasma-addons-%{version}
+%if 0%{?_qt45:1}
+%patch0 -p0 -b .lancelot-qt45
+%endif
 
 
 %build
@@ -55,7 +60,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -63,11 +68,19 @@
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+# fixup bball 
+pushd %{buildroot}%{_kde4_appsdir}/bball/
+for svgz in *.svgz ; do
+  mv $svgz `basename $svgz .svgz`.svg.gz
+  gunzip `basename $svgz .svgz`.svg.gz
+done
+popd
+
 # unpackaged files
 # omit -devel type stuff, for now
 rm -f %{buildroot}%{_kde4_libdir}/libplasma*.so
 rm -f %{buildroot}%{_kde4_libdir}/liblancelot*.so
-rm -rf %{buildroot}%{_kde4_includedir}/
+rm -rf %{buildroot}%{_kde4_includedir}/lancelot
 
 
 %post
@@ -79,7 +92,6 @@
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 
-
 %clean
 rm -rf %{buildroot}
 
@@ -93,22 +105,31 @@
 %{_kde4_appsdir}/plasma/services/*
 %{_kde4_appsdir}/plasma-bluemarble/
 %{_kde4_appsdir}/rssnow/
-%{_kde4_datadir}/config/*
-%{_kde4_datadir}/kde4/services/*
-%{_kde4_datadir}/kde4/servicetypes/*
+%{_kde4_datadir}/config/comic.knsrc
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/*.desktop
+%{_kde4_datadir}/kde4/servicetypes/*.desktop
 %{_kde4_datadir}/mime/packages/lancelotpart-mime.xml
 %{_kde4_datadir}/dbus-1/services/org.kde.lancelot.service
-%{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/liblancelot.so.*
 %{_kde4_libdir}/libplasmaconverter.so.*
 %{_kde4_libdir}/libplasmacomicprovidercore.so.*
-# %{_kde4_libdir}/libplasmaappletdialog.so.*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 
 
 %changelog
-* Fri Feb 27 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* Mon Mar 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-2
+- make bball applet work (ship .svg instead of .svgz)
+- use new %%_qt45 macro
+- spec housecleaning
+
+* Fri Mar 13 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.1-2
+- fix Lancelot rendering issues with Qt 4.5 (F11+ only, as the effect of that
+  patch with 4.4.3 is unknown)
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-2