rpms/kdeplasma-addons/devel kdeplasma-addons.spec,1.26,1.27

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23300

Modified Files:
	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: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- kdeplasma-addons.spec	13 Mar 2009 13:09:27 -0000	1.26
+++ kdeplasma-addons.spec	16 Mar 2009 19:08:42 -0000	1.27
@@ -1,10 +1,7 @@
-%if 0%{?fedora} > 10
-%define have_qt45 1
-%endif
 
 Name:           kdeplasma-addons
 Version:        4.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -19,16 +16,14 @@
 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
@@ -53,7 +48,7 @@
 
 %prep
 %setup -q -n kdeplasma-addons-%{version}
-%if 0%{?have_qt45}
+%if 0%{?_qt45:1}
 %patch0 -p0 -b .lancelot-qt45
 %endif
 
@@ -65,7 +60,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -73,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
@@ -89,7 +92,6 @@
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 
-
 %clean
 rm -rf %{buildroot}
 
@@ -103,21 +105,26 @@
 %{_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
+* 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)