leigh123linux pushed to blueman (epel7). "Update to 1.23 (..more)"

Tue May 26 21:42:41 UTC 2015

From 637f88236c1d7720ef92a838b2b25311ba954ded Mon Sep 17 00:00:00 2001
From: Christoph Wickert <cwickert at fedoraproject.org>
Date: Fri, 27 Apr 2012 00:40:48 +0200
Subject: Update to 1.23

- Drop upstreamed PulseAudio patch
- Fix statusicon
- Autostart blueman not only in GNOME but also in Xfce and LXDE
- Enhance description

diff --git a/.gitignore b/.gitignore
index c1b1e0a..c983977 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 blueman-1.10.tar.gz
+/blueman-1.23.tar.gz
diff --git a/blueman.spec b/blueman.spec
index 72029cd..ae1a89b 100644
--- a/blueman.spec
+++ b/blueman.spec
@@ -1,18 +1,20 @@
+# Review request: https://bugzilla.redhat.com/show_bug.cgi?id=489564
+
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")}
 
-Name:       blueman
-Version:    1.21
-Release:    11%{?dist}
-Summary:    GTK+ Bluetooth Manager
+Name:           blueman
+Version:        1.23
+Release:        1%{?dist}
+Summary:        GTK+ Bluetooth Manager
 
-Group:      Applications/System
-License:    GPLv3+
-URL:        http://blueman-project.org/
-Source0:    http://download.tuxfamily.org/%{name}/%{name}-%{version}.tar.gz
-#Fixed in Rev 640 http://bazaar.launchpad.net/~blueman/blueman/trunk/revision/640
-Patch0:     PulsePatch.patch
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Group:          Applications/System
+License:        GPLv3+
+URL:            http://blueman-project.org/
+Source0:        http://download.tuxfamily.org/%{name}/%{name}-%{version}.tar.gz
+# The statusicon uses blueman-tray, but this icon is not provided by the package
+Patch0:         blueman-1.23-statusicon.patch
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  gtk2-devel >= 2.12
 BuildRequires:  pygtk2-devel >= 2.12
@@ -25,30 +27,50 @@ BuildRequires:  dbus-python-devel
 BuildRequires:  python-devel >= 2.5
 BuildRequires:  desktop-file-utils
 BuildRequires:  bluez >= 4.25
-BuildRequires:  libtool
+#BuildRequires:  libtool
 BuildRequires:  notify-python
 
-Requires: python >= 2.5
-Requires: bluez >= 4.25
-Requires: obex-data-server >= 0.4.3
-Requires: pygtk2 >= 2.12
-Requires: dbus
-Requires: notify-python
-Requires: gnome-python2-gconf
-Requires: gnome-python2-gnome
-Requires: PolicyKit-authentication-agent
-Requires: desktop-notification-daemon
-Requires: gnome-session
+Requires:       python >= 2.5
+Requires:       bluez >= 4.25
+Requires:       obex-data-server >= 0.4.3
+Requires:       pygtk2 >= 2.12
+Requires:       dbus
+Requires:       notify-python
+Requires:       gnome-python2-gconf
+Requires:       gnome-python2-gnome
+Requires:       PolicyKit-authentication-agent
+Requires:       desktop-notification-daemon
+Requires:       gnome-session
 
-Provides: dbus-bluez-pin-helper
+Provides:       dbus-bluez-pin-helper
 
 %description
-Blueman is a tool to use Bluetooth devices.
+Blueman is a tool to use Bluetooth devices. It is designed to provide simple,
+yet effective means for controlling BlueZ API and simplifying bluetooth tasks
+such as:
+- Connecting to 3G/EDGE/GPRS via dial-up
+- Connecting to/Creating bluetooth networks
+- Connecting to input devices
+- Connecting to audio devices
+- Sending/Receiving/Browsing files via OBEX
+- Pairing
+
+
+%package        nautilus
+Summary:        Blueman Nautilus plugin
+Group:          User Interface/Desktops
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       nautilus-sendto%{?_isa}
+
+%description    nautilus
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
 
 %prep
 %setup -q
 %patch0 -p1
 
+
 %build
 #./autogen.sh
 #make dist
@@ -59,10 +81,14 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{python_sitearch}/*.la
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/
-mv $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ $RPM_BUILD_ROOT%{_datadir}/gnome/
+desktop-file-install --vendor="" \
+ --add-category="GTK;GNOME;" \
+ --add-only-show-in="GNOME;XFCE;LXDE" \
+ --delete-original \
+ --dir=$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/  \
+ $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart//blueman.desktop
 
 desktop-file-install --vendor=""     \
  --delete-original     \
@@ -95,7 +121,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{python_sitearch}/*.so
 %{_libexecdir}/blueman-mechanism
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.blueman.Mechanism.conf
-%{_datadir}/gnome/autostart/blueman.desktop
+%{_sysconfdir}/xdg/autostart/blueman.desktop
 %{_datadir}/applications/blueman-manager.desktop
 %{_datadir}/polkit-1/actions/org.blueman.policy
 %{_datadir}/icons/hicolor/*/apps/*
@@ -105,8 +131,18 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #%{_datadir}/hal/fdi/information/20thirdparty/11-blueman-bnep.fdi
 %{_mandir}/man1/*
 
+%files nautilus
+%defattr(-,root,root,-)
+%{_libdir}/nautilus-sendto/plugins/libnstblueman.so
 
 %changelog
+* Thu Apr 26 2012 Christoph Wickert <cwickert at fedoraproject.org> - 1.23-1
+- Update to 1.23
+- Drop upstreamed PulseAudio patch
+- Fix statusicon
+- Autostart blueman not only in GNOME but also in Xfce and LXDE
+- Enhance description
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.21-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 8cd2680..cea46d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-26b70341b3d3da28da62c917c8b20377  blueman-1.21.tar.gz
+f0bee59589f4c23e35bf08c2ef8acaef  blueman-1.23.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/blueman.git/commit/?h=epel7&id=637f88236c1d7720ef92a838b2b25311ba954ded
