diff --git a/0001-fix-startup-segfault-issue.patch b/0001-fix-startup-segfault-issue.patch deleted file mode 100644 index e4cf8c2..0000000 --- a/0001-fix-startup-segfault-issue.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 9904da94d3e0c259f489d56abf37834052090b99 Mon Sep 17 00:00:00 2001 -From: tanyulong2021 -Date: Wed, 3 Aug 2022 19:16:00 +0800 -Subject: [PATCH] fix startup segfault issue - ---- - ukui-bluetooth/main/featureswidget.cpp | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/ukui-bluetooth/main/featureswidget.cpp b/ukui-bluetooth/main/featureswidget.cpp -index e753930..314de45 100644 ---- a/ukui-bluetooth/main/featureswidget.cpp -+++ b/ukui-bluetooth/main/featureswidget.cpp -@@ -33,7 +33,7 @@ enum { - - static guint watch = 0; - bool spe_bt_node = false; --bool not_hci_node = true; -+bool not_hci_node = false; - bool M_adapter_flag = false; - bool M_power_on = false; - -@@ -605,10 +605,12 @@ void FeaturesWidget::InitTrayMenu() - QAction *settins_action = new QAction(tr("Bluetooth settings"),tray_Menu); - settins_action->setCheckable(true); - tray_Menu->addAction(settins_action); -- //tray_Menu->move(bluetooth_tray_icon->geometry().x()+16,bluetooth_tray_icon->geometry().y()-50); -- //tray_Menu->exec(); -- setWidgetPosition(); -- -+ if(!QFile("/usr/bin/ukui-panel").exists()){ -+ tray_Menu->move(bluetooth_tray_icon->geometry().x()+16,bluetooth_tray_icon->geometry().y()-50); -+ tray_Menu->exec(); -+ }else{ -+ setWidgetPosition(); -+ } - } - - void FeaturesWidget::setWidgetPosition() --- -2.33.0 - diff --git a/ukui-bluetooth-1.0.2.tar.gz b/ukui-bluetooth-1.0.2.tar.gz deleted file mode 100644 index c762620..0000000 Binary files a/ukui-bluetooth-1.0.2.tar.gz and /dev/null differ diff --git a/ukui-bluetooth-1.0.3.tar.gz b/ukui-bluetooth-1.0.3.tar.gz new file mode 100644 index 0000000..053496c Binary files /dev/null and b/ukui-bluetooth-1.0.3.tar.gz differ diff --git a/ukui-bluetooth.spec b/ukui-bluetooth.spec index 160169d..fe9300f 100644 --- a/ukui-bluetooth.spec +++ b/ukui-bluetooth.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: ukui-bluetooth -Version: 1.0.2 -Release: 3 +Version: 1.0.3 +Release: 1 Summary: Advanced ukui bluetooth License: GPLv2+ URL: http://www.ukui.org @@ -18,22 +18,19 @@ BuildRequires: libXinerama-devel BuildRequires: libXi-devel BuildRequires: libXcursor-devel BuildRequires: ukui-interface - - +BuildRequires: libukcc-devel +BuildRequires: polkit-qt5-1-devel Requires: kf5-bluez-qt-devel Requires: libnotify Requires: bluez >= 5.0 Requires: bluez-obexd Requires: peony-extensions -Patch0: 0001-fix-startup-segfault-issue.patch - %description A lightweight Bluetooth tool based on libkf5bluezqt6 on the UKUI desktop environment %prep %setup -q -%patch0 -p1 %build mkdir build && cd build @@ -46,8 +43,11 @@ pushd build %{make_install} INSTALL_ROOT=%{buildroot} popd +mkdir -p %{buildroot}/usr/share/ukcc-bluetooth/translations/ +cp -r %{_builddir}/%{name}-%{version}/ukcc-bluetooth/translations/*.qm %{buildroot}/usr/share/ukui-bluetooth/translations/ + mkdir -p %{buildroot}/usr/share/ukui-bluetooth/translations/ -cp -r %{_builddir}/%{name}-%{version}/translations/*.qm %{buildroot}/usr/share/ukui-bluetooth/translations/ +cp -r %{_builddir}/%{name}-%{version}/ukui-bluetooth/translations/*.qm %{buildroot}/usr/share/ukui-bluetooth/translations/ mkdir -p %{buildroot}/etc/xdg/autostart/ cp -r %{_builddir}/%{name}-%{version}/data/ukui-bluetooth.desktop* %{buildroot}/etc/xdg/autostart/ @@ -65,11 +65,18 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/dbus-1/system-services/com.bluetooth.systemdbus.service %{_datadir}/glib-2.0/schemas/org.ukui.bluetooth.gschema.xml %{_datadir}/polkit-1/actions/com.bluetooth.systemdbus.policy -%{_datadir}/ukui-bluetooth/translations/ukui-bluetooth_zh_CN.qm - +%{_datadir}/ukui-bluetooth/translations/ +%{_bindir}/profileDaemon +%{_prefix}/lib64/ukui-control-center/libukcc-bluetooth.so +%{_datadir}/ukui-bluetooth/file-transfer-failed.svg +%{_datadir}/ukui-bluetooth/file-transfer-success.svg +%{_datadir}/ukui-bluetooth/no-bluetooth.svg %changelog +* Fri Nov 18 2022 douyan - 1.0.3-1 +- update to upstream version 1.0.3 + * Wed Aug 03 2022 tanyulong - 1.0.2-3 - fix startup segfault issue