updading blueman to version 2.1.3

diff --git a/blueman.spec b/blueman.spec
index 426d98ba63b7d3513e2c617aca36e3da556f6937..605b5e354ac28060918e1c7e3c111353d4690c8f 100644 (file)
--- a/blueman.spec
+++ b/blueman.spec
@@ -1,38 +1,41 @@
 Summary:       Blueman - bluetooth management utility for GNOME
 Name:          blueman
 Summary:       Blueman - bluetooth management utility for GNOME
 Name:          blueman

-Version:       2.0.5
+Version:       2.1.3

 Release:       1
 License:       GPL
 Group:         X11/Applications
 Source0:       https://github.com/blueman-project/blueman/releases/download/%{version}/%{name}-%{version}.tar.xz
 Release:       1
 License:       GPL
 Group:         X11/Applications
 Source0:       https://github.com/blueman-project/blueman/releases/download/%{version}/%{name}-%{version}.tar.xz

-# Source0-md5: 677afd610bd893745ee5ae506bede2dd
+# Source0-md5: b341822c8362bf9619fbbc22c957b00c

 URL:           https://github.com/blueman-project/blueman
 BuildRequires: autoconf
 BuildRequires: automake
 URL:           https://github.com/blueman-project/blueman
 BuildRequires: autoconf
 BuildRequires: automake

-BuildRequires: bluez-libs-devel >= 4.61
+BuildRequires: bluez-libs-devel >= 5.0
+BuildRequires: caja-python-devel
+BuildRequires: cinnamon-nemo-python-devel

 BuildRequires: gettext-tools
 BuildRequires: glib2-devel >= 2.32
 BuildRequires: gtk+3-devel >= 3.12
 BuildRequires: intltool >= 0.35.0
 BuildRequires: libtool
 BuildRequires: gettext-tools
 BuildRequires: glib2-devel >= 2.32
 BuildRequires: gtk+3-devel >= 3.12
 BuildRequires: intltool >= 0.35.0
 BuildRequires: libtool

+BuildRequires: nautilus-python-devel

 BuildRequires: pkgconfig >= 0.9.0
 BuildRequires: python-Cython
 BuildRequires: pkgconfig >= 0.9.0
 BuildRequires: python-Cython

-BuildRequires: python-dbus
-BuildRequires: python-devel >= 2.7
-BuildRequires: python-pygobject3-common-devel
+BuildRequires: python-devel >= 3.3
+BuildRequires: python-pygobject3-common-devel >= 3.27.2

 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.219
 Requires(post,postun): gtk-update-icon-cache
 Requires(post,postun): hicolor-icon-theme
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.219
 Requires(post,postun): gtk-update-icon-cache
 Requires(post,postun): hicolor-icon-theme

-Requires:      bluez-libs >= 4.25
-Requires:      bluez-utils >= 4.25
+Requires(post,preun,postun):   systemd-units >= 38
+Requires:      bluez-libs >= 5.0
+Requires:      bluez-utils >= 5.0

 Requires:      gtk+3 >= 3.12
 Requires:      python >= %py_ver
 Requires:      python-appindicator-gtk2
 Requires:      python-bluetooth
 Requires:      gtk+3 >= 3.12
 Requires:      python >= %py_ver
 Requires:      python-appindicator-gtk2
 Requires:      python-bluetooth

-Requires:      python-dbus

 Requires:      python-pygtk-gtk
 Requires:      python-pygtk-gtk

-Requires:      python-pynotify
+Suggests:      pulseaudio-bluetooth
+Suggests:      pulseaudio-hal

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description


@@ -56,10 +59,50 @@ Features:
 - Connect and receive connections from: audio, network, input and
   serial devices
 
 - Connect and receive connections from: audio, network, input and
   serial devices
 

+%package caja
+Summary:       Blueman plugin for Caja
+Summary(pl.UTF-8):     Wtyczka Blueman-a dla managera plików Caja
+Group:         X11/Applications
+Requires:      %{name} = %{version}
+Requires:      caja-python
+
+%description caja
+Blueman plugin for Caja.
+
+%description caja -l pl.UTF-8
+Wtyczka Blueman-a dla managera plików Caja.
+
+%package nautilus
+Summary:       Blueman plugin for Nautilus
+Summary(pl.UTF-8):     Wtyczka Blueman-a dla Nautilus-a
+Group:         X11/Applications
+Requires:      %{name} = %{version}
+Requires:      nautilus-python
+
+%description nautilus
+Blueman plugin for Nautilus.
+
+%description nautilus -l pl.UTF-8
+Wtyczka Blueman-a dla Nautilus-a.
+
+%package nemo
+Summary:       Blueman plugin for Nemo
+Summary(pl.UTF-8):     Wtyczka Blueman-a dla managera plików Nemo.
+Group:         X11/Applications
+Requires:      %{name} = %{version}
+Requires:      cinnamon-nemo-python
+
+%description nemo
+Blueman plugin for Nautilus.
+
+%description nemo -l pl.UTF-8
+Wtyczka Blueman-a dla managera plików Nemo.
+

 %package thunar
 Summary:       Blueman plugin for Thunar
 Summary(pl.UTF-8):     Wtyczka Blueman-a dla Thunar-a
 Group:         X11/Applications
 %package thunar
 Summary:       Blueman plugin for Thunar
 Summary(pl.UTF-8):     Wtyczka Blueman-a dla Thunar-a
 Group:         X11/Applications

+Requires:      %{name} = %{version}

 
 %description thunar
 Blueman plugin for Thunar.
 
 %description thunar
 Blueman plugin for Thunar.


@@ -72,9 +115,14 @@ Wtyczka Blueman-a dla Thunar-a.
 
 %build
 %configure \
 
 %build
 %configure \

-       --enable-xfce-settings=yes \

        --disable-static \
        --disable-schemas-compile \
        --disable-static \
        --disable-schemas-compile \

+       --enable-polkit \
+       --enable-caja-sendto \
+       --enable-nemo-sendto \
+       --enable-nautilus-sendto \
+       --enable-thunar-sendto \
+       --enable-settings-integration

 
 %{__make}
 
 
 %{__make}
 


@@ -84,7 +132,7 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
        DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}

-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/_blueman.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/python3.8/site-packages/_blueman.la

 
 # DO NOT RUN py_postclean - breaks plugins and everything
 
 
 # DO NOT RUN py_postclean - breaks plugins and everything
 


@@ -96,10 +144,19 @@ rm -rf $RPM_BUILD_ROOT
 %post
 %update_icon_cache hicolor
 glib-compile-schemas %{_datadir}/glib-2.0/schemas
 %post
 %update_icon_cache hicolor
 glib-compile-schemas %{_datadir}/glib-2.0/schemas

+%service %{name}-mechanism restart
+%systemd_post %{name}-mechanism.service
+
+%preun
+if [ "$1" = "0" ]; then
+        %service -q %{name}-mechanism stop
+fi
+%systemd_preun %{name}-mechanism.service

 
 %postun
 %update_icon_cache hicolor
 glib-compile-schemas %{_datadir}/glib-2.0/schemas
 
 %postun
 %update_icon_cache hicolor
 glib-compile-schemas %{_datadir}/glib-2.0/schemas

+%systemd_reload

 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)


@@ -109,19 +166,19 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 %attr(755,root,root) %{_bindir}/blueman-adapters
 %attr(755,root,root) %{_bindir}/blueman-applet
 %attr(755,root,root) %{_bindir}/blueman-assistant
 %attr(755,root,root) %{_bindir}/blueman-adapters
 %attr(755,root,root) %{_bindir}/blueman-applet
 %attr(755,root,root) %{_bindir}/blueman-assistant

-%attr(755,root,root) %{_bindir}/blueman-browse

 %attr(755,root,root) %{_bindir}/blueman-manager
 %attr(755,root,root) %{_bindir}/blueman-report
 %attr(755,root,root) %{_bindir}/blueman-sendto
 %attr(755,root,root) %{_bindir}/blueman-services
 %attr(755,root,root) %{_bindir}/blueman-manager
 %attr(755,root,root) %{_bindir}/blueman-report
 %attr(755,root,root) %{_bindir}/blueman-sendto
 %attr(755,root,root) %{_bindir}/blueman-services

+%attr(755,root,root) %{_bindir}/blueman-tray

 %{_mandir}/man1/blueman-adapters.1*
 %{_mandir}/man1/blueman-applet.1*
 %{_mandir}/man1/blueman-assistant.1*
 %{_mandir}/man1/blueman-adapters.1*
 %{_mandir}/man1/blueman-applet.1*
 %{_mandir}/man1/blueman-assistant.1*

-%{_mandir}/man1/blueman-browse.1*

 %{_mandir}/man1/blueman-manager.1*
 %{_mandir}/man1/blueman-report.1
 %{_mandir}/man1/blueman-sendto.1*
 %{_mandir}/man1/blueman-services.1*
 %{_mandir}/man1/blueman-manager.1*
 %{_mandir}/man1/blueman-report.1
 %{_mandir}/man1/blueman-sendto.1*
 %{_mandir}/man1/blueman-services.1*

+%{_mandir}/man1/blueman-tray.1*

 %attr(755,root,root) %{_libexecdir}/%{name}-mechanism
 %attr(755,root,root) %{_libexecdir}/%{name}-rfcomm-watcher
 %{_datadir}/%{name}
 %attr(755,root,root) %{_libexecdir}/%{name}-mechanism
 %attr(755,root,root) %{_libexecdir}/%{name}-rfcomm-watcher
 %{_datadir}/%{name}


@@ -133,10 +190,25 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 %dir %{_pixmapsdir}/blueman
 %{_pixmapsdir}/blueman/blueman-*.png
 %{_datadir}/glib-2.0/schemas/org.blueman.gschema.xml
 %dir %{_pixmapsdir}/blueman
 %{_pixmapsdir}/blueman/blueman-*.png
 %{_datadir}/glib-2.0/schemas/org.blueman.gschema.xml

-%{_datadir}/dbus-1/services/blueman-applet.service
+%{systemdunitdir}/blueman-mechanism.service
+%{systemduserunitdir}/blueman-applet.service
+%{_datadir}/dbus-1/services/org.blueman.Applet.service

 %{_datadir}/polkit-1/actions/org.blueman.policy
 %{_datadir}/polkit-1/actions/org.blueman.policy

-%attr(755,root,root) %{py_sitedir}/_blueman.so
-%{py_sitescriptdir}/%{name}
+%{_datadir}/polkit-1/rules.d/blueman.rules
+%attr(755,root,root) %{_libdir}/python3.8/site-packages/_blueman.so
+%{_libdir}/python3.8/site-packages/%{name}
+
+%files caja
+%defattr(644,root,root,755)
+%{_datadir}/caja-python/extensions/caja_blueman_sendto.py
+
+%files nautilus
+%defattr(644,root,root,755)
+%{_datadir}/nautilus-python/extensions/nautilus_blueman_sendto.py
+
+%files nemo
+%defattr(644,root,root,755)
+%{_datadir}/nemo-python/extensions/nemo_blueman_sendto.py

 
 %files thunar
 %defattr(644,root,root,755)
 
 %files thunar
 %defattr(644,root,root,755)