diff --git a/blueberry-1.1.10_fix_AutostartCondition.patch b/blueberry-1.1.10_fix_AutostartCondition.patch new file mode 100644 index 0000000..1f61c96 --- /dev/null +++ b/blueberry-1.1.10_fix_AutostartCondition.patch @@ -0,0 +1,22 @@ +From ae3d40bedf95a493d0da96f70b83325381861cbd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Sun, 19 Feb 2017 10:48:50 +0100 +Subject: [PATCH] Fix AutostartCondition + +--- + etc/xdg/autostart/blueberry-obex-agent.desktop | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/etc/xdg/autostart/blueberry-obex-agent.desktop b/etc/xdg/autostart/blueberry-obex-agent.desktop +index 558b9bc..3c35ddd 100644 +--- a/etc/xdg/autostart/blueberry-obex-agent.desktop ++++ b/etc/xdg/autostart/blueberry-obex-agent.desktop +@@ -2,7 +2,7 @@ + Name=Bluetooth OBEX Agent + Comment=Allows to receive files via Bluetooth + Keywords=files;bluetooth;obex;receive; +-AutostartCondition=GSETTINGS org.blueberry obex-enabled ++AutostartCondition=GSettings org.blueberry obex-enabled + Icon=blueberry + Exec=/usr/lib/blueberry/blueberry-obex-agent.py + Terminal=false diff --git a/blueberry.spec b/blueberry.spec index 3ec05e3..d986cd1 100644 --- a/blueberry.spec +++ b/blueberry.spec @@ -11,6 +11,8 @@ Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch0: %{url}/pull/27.patch#/%{name}-1.1.9_license.patch # Remove debug log -- Left there by mistake. Patch1: %{url}/commit/f33e32479f77f91dfa02bbf79643926f446b403a.patch#/%{name}-1.1.10_remove_debug_log.patch +# GSETTINGS should be GSettings. desktop-file-validate compains about that. +Patch2: %{url}/pull/30.patch#/%{name}-1.1.10_fix_AutostartCondition.patch BuildArch: noarch @@ -33,6 +35,16 @@ Requires: wmctrl %{summary} depending on gnome-bluetooth. +%package -n cinnamon-applet-%{name} +Summary: Cinnamon applet for %{name} + +Requires: %{name} == %{version}-%{release} +Requires: cinnamon + +%description -n cinnamon-applet-%{name} +Cinnamon applet for %{name}. + + %prep %autosetup -p1 @@ -40,8 +52,8 @@ Requires: wmctrl for file in .%{_bindir}/* $(%{_bindir}/find .%{_prefix} -name '*.py' -type f) do %{__sed} -i.orig \ - -e 's~#![ \t]*%{_bindir}/python~#!%{__python2}~'\ - -e 's~#![ \t]*%{_bindir}/env[ \t]*python[2]*~#!%{__python2}~' \ + -e 's~#![ \t]*%{_bindir}/python$~#!%{__python2}~'\ + -e 's~#![ \t]*%{_bindir}/env[ \t]*python[2]*$~#!%{__python2}~' \ ${file} /bin/touch -r ${file}.orig ${file} %{__rm} -f ${file}.orig @@ -95,18 +107,22 @@ fi %license debian/copyright COPYING %doc debian/changelog # Desktop-file for xdg/autostart. -%config %{_sysconfdir}/xdg/autostart/%{name}-tray.desktop +%config %{_sysconfdir}/xdg/autostart/*%{name}*.desktop %{_bindir}/%{name}* -%{_datadir}/icons/hicolor/*/status/%{name}*.png -%{_datadir}/icons/hicolor/*/status/%{name}*.svg %{_datadir}/applications/%{name}.desktop %{_datadir}/glib-2.0/schemas/org.%{name}.gschema.xml +%{_datadir}/icons/hicolor/*/status/%{name}*.png +%{_datadir}/icons/hicolor/*/status/%{name}*.svg %{_prefix}/lib/%{name} +%files -n cinnamon-applet-%{name} +%{_datadir}/cinnamon/applets/%{name}* + %changelog * Sun Feb 19 2017 Björn Esser - 1.1.10-1 - New upstream release +- Add sub-pkg for new Cinnamon applet * Fri Feb 10 2017 Fedora Release Engineering - 1.1.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild