X-Git-Url: http://git.pld-linux.org/?p=packages%2Fblueman.git;a=blobdiff_plain;f=blueman.spec;h=555b334fe5f1b16dc306546ece008d1beca4be46;hp=c6ca73c21eac70622fb08766c0b290fbfdda6fd6;hb=15e758607260ab9ee4850a4b149fd97beaac50a6;hpb=c6c66b9e4aed1ebe57e20df27fe9466568780c4c

diff --git a/blueman.spec b/blueman.spec
index c6ca73c..555b334 100644
--- a/blueman.spec
+++ b/blueman.spec
@@ -1,25 +1,34 @@
-%define		rev	106
+# TODO
+# unpackaged
+#   /usr/lib/nautilus-sendto/plugins/libnstblueman.a
+#   /usr/lib/nautilus-sendto/plugins/libnstblueman.la
+#   /usr/lib/nautilus-sendto/plugins/libnstblueman.so
 Summary:	Blueman - bluetooth management utility for GNOME
 Name:		blueman
-Version:	1.21
-Release:	1
+Version:	1.23
+Release:	3
 License:	GPL
 Group:		Applications
 Source0:	http://download.tuxfamily.org/blueman/%{name}-%{version}.tar.gz
-# Source0-md5:	26b70341b3d3da28da62c917c8b20377
+# Source0-md5:	f0bee59589f4c23e35bf08c2ef8acaef
+Patch0:		missing-icons.patch
+Patch1:		icon-active.patch
 URL:		http://blueman.tuxfamily.org/
 BuildRequires:	bluez-libs-devel
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-tools
 BuildRequires:	gnome-bluetooth-devel
 BuildRequires:	intltool
+BuildRequires:	librsvg
+BuildRequires:	pkgconfig
 BuildRequires:	python-Pyrex
 BuildRequires:	python-dbus-devel
 BuildRequires:	python-devel >= 2.5
 BuildRequires:	python-distutils-extra
 BuildRequires:	python-pynotify-devel
 BuildRequires:	rpm-pythonprov
-BuildRequires:	sed
 BuildRequires:	startup-notification-devel
+Requires(post,postun):	gtk-update-icon-cache
+Requires(post,postun):	hicolor-icon-theme
 Requires:	bluez-libs >= 4.25
 Requires:	bluez-utils >= 4.25
 Requires:	gtk+2 >= 2.12
@@ -53,12 +62,13 @@ Features:
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
-%configure
-# enable default path for fdi installation
-sed -i -e s/#hal_fdi/hal_fdi/g data/configs/Makefile
-#--with-dhcp-config=PATH
+%configure \
+	--disable-hal
+
 %{__make}
 
 %install
@@ -67,11 +77,29 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+for s in 16 32 48 ; do
+	install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${s}x${s}/status
+	rsvg-convert -w $s -h $s -o $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${s}x${s}/status/blueman-tray.png \
+		data/icons/hicolor/scalable/status/blueman-tray.svg
+	rsvg-convert -w $s -h $s -o $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${s}x${s}/status/blueman-tray-active.png \
+		data/icons/hicolor/scalable/status/blueman-tray-active.svg
+	rsvg-convert -w $s -h $s -o $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${s}x${s}/status/blueman-tray-disabled.png \
+		data/icons/hicolor/scalable/status/blueman-tray-disabled.svg
+done
+install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/scalable/status
+install data/icons/hicolor/scalable/status/*.svg $RPM_BUILD_ROOT%{_iconsdir}/hicolor/scalable/status
+
 %find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%update_icon_cache hicolor
+
+%postun
+%update_icon_cache hicolor
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README
@@ -81,7 +109,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 %{_datadir}/dbus-1/system-services/org.blueman.Mechanism.service
 %{_iconsdir}/hicolor/scalable/*/*.svg
-%{_iconsdir}/hicolor/*/apps/*.png
+%{_iconsdir}/hicolor/*/*/*.png
 %{_datadir}/polkit-1/actions/org.blueman.policy
 %{_desktopdir}/blueman-manager.desktop
 %{py_sitedir}/*.so
@@ -90,5 +118,4 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/autostart/blueman.desktop
 %{_mandir}/man1/*.1*
 %{_datadir}/dbus-1/services/blueman-applet.service
-%{_datadir}/hal/fdi/information/20thirdparty/11-blueman-bnep.fdi
 %{py_sitescriptdir}/%{name}