rpms/kbluetooth/F-12 kbluetooth.spec,1.2,1.3

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kbluetooth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23375/F-12

Modified Files:
	kbluetooth.spec 
Log Message:
Sync from devel:

* Fri Feb 19 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.4.1-2
- move Requires: bluez here (#566306)
- optimize %%build/scriptlets


Index: kbluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kbluetooth/F-12/kbluetooth.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kbluetooth.spec	11 Feb 2010 12:28:32 -0000	1.2
+++ kbluetooth.spec	21 Feb 2010 02:57:15 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:    The KDE Bluetooth Framework
 Name:       kbluetooth
 Version:    0.4.1
-Release:    1%{?dist}
+Release:    2%{?dist}
 License:    GPLv2+
 Group:      Applications/Communications
 URL:        http://techbase.kde.org/Kbluetooth
@@ -11,15 +11,21 @@ BuildRoot:  %{_tmppath}/%{name}-%{versio
 BuildRequires: cmake
 BuildRequires: kdebase-workspace-devel >= 4.2
 BuildRequires: kdelibs-experimental-devel
+# this can go, as soon as virtual Provides: nepomuk-devel
+# lands in kdelibs-4.4.0-9
 BuildRequires: soprano-devel
 BuildRequires: gettext
-# Depend on and track solid-bluetooth backport
 BuildRequires: solid-bluetooth-devel >= 4.3
-Requires: solid-bluetooth >= 4.3
 Requires: openobex
 Requires: obexftp
 Requires: obex-data-server
 
+# Put bluez dep here at least until we can sanely split out
+# solid-bluetooth and put it there where it belongs.
+# See https:bugzilla.redhat.com/566306
+Requires: bluez
+Requires: solid-bluetooth%{?_kde_version >= %{_kde4_version}}
+
 # Remove this by F-14, needed for kdebluetoooth -> kbluetooth rename
 Obsoletes: kdebluetooth < 1:0.3-6
 Provides:  kdebluetooth = 1:%{version}-%{release}
@@ -43,13 +49,17 @@ enabled devices as straightforward as po
 
 
 %build
-%cmake_kde4
-make %{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
-make install/fast DESTDIR=%{buildroot}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 desktop-file-install \
   --mode=644 \
@@ -60,20 +70,24 @@ desktop-file-install \
   --delete-original \
   %{buildroot}%{_datadir}/applications/kde4/kbluetooth.desktop
 
-%find_lang %{name}
+%find_lang %{name} --with-kde
+
 
 %clean
 rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||:
-
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||:
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %files -f %{name}.lang
@@ -87,6 +101,10 @@ gtk-update-icon-cache -qf %{_datadir}/ic
 
 
 %changelog
+* Fri Feb 19 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.4.1-2
+- move Requires: bluez here (#566306)
+- optimize %%build/scriptlets
+
 * Wed Feb 10 2010 Jaroslav Reznik <jreznik at redhat.com> - 0.4.1-1
 - Release update - fixes crash after receiving file (kde#225924)