!21 update to version 1.0.3

From: @dou33 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang

0001-fix-Bluetooth-pulled-up-by-the-session-manager-and-exits-abnormally.patch

@@ -1,48 +0,0 @@
-From 5163effc944fb312888b84ec6033c0ab19d4197a Mon Sep 17 00:00:00 2001
-From: tanyulong <tanyulong@kylinos.cn>
-Date: Fri, 29 Oct 2021 15:26:14 +0800
-Subject: [PATCH] fix Bluetooth pulled up by the session manager and exits
- abnormally
-
----
- debian/control                         | 2 +-
- ukui-bluetooth/main/featureswidget.cpp | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/debian/control b/debian/control
-index ca3fd8e..4f12e6c 100644
---- a/debian/control
-+++ b/debian/control
-@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 9),
-                libxinerama-dev,
-                libxi-dev,
-                libxcursor-dev,
--               libukui-log4qt-dev
-+#               libukui-log4qt-dev
- #               libkf5bluezqt6-dev
- Standards-Version: 4.4.1
- Homepage: https://github.com/supreme886/ukui-bluetooth
-diff --git a/ukui-bluetooth/main/featureswidget.cpp b/ukui-bluetooth/main/featureswidget.cpp
-index bec6773..300f51f 100644
---- a/ukui-bluetooth/main/featureswidget.cpp
-+++ b/ukui-bluetooth/main/featureswidget.cpp
-@@ -610,6 +610,7 @@ void FeaturesWidget::Turn_on_or_off_bluetooth(bool f)
-             if(p->error() == 0){
-                 flag = true;
-                 qDebug() << Q_FUNC_INFO << m_adapter->isPowered();
-+		m_manager->setBluetoothBlocked(true);
- //                Connect_the_last_connected_device();
-             }else
-                 qDebug() << "Failed to turn off Bluetooth:" << p->errorText();
-@@ -894,7 +895,7 @@ void FeaturesWidget::adapterPoweredChanged(bool value)
-     if (value == true) {//开启
-         bluetooth_tray_icon->setIcon(QIcon::fromTheme("bluetooth-active-symbolic"));
-         bluetooth_tray_icon->show();
--        Connect_the_last_connected_device();
-+        //Connect_the_last_connected_device();
-     }else {//关闭
-         if(QIcon::hasThemeIcon("bluetooth-error"))
-             bluetooth_tray_icon->setIcon(QIcon::fromTheme("bluetooth-error"));
--- 
-2.30.0
-

0002-fix-ukui-bluetooth-will-have-a-segfault-when-times-out.patch

@@ -1,25 +0,0 @@
-From 20277829b38feb83ec7da521c9e9a581f710931c Mon Sep 17 00:00:00 2001
-From: tanyulong <tanyulong@kylinos.cn>
-Date: Sat, 30 Oct 2021 16:50:00 +0800
-Subject: [PATCH] fix ukui-bluetooth will have a segfault
-
----
- ukui-bluetooth/agent/bluetoothagent.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/ukui-bluetooth/agent/bluetoothagent.cpp b/ukui-bluetooth/agent/bluetoothagent.cpp
-index 842c275..067d910 100644
---- a/ukui-bluetooth/agent/bluetoothagent.cpp
-+++ b/ukui-bluetooth/agent/bluetoothagent.cpp
-@@ -123,8 +123,6 @@ void BluetoothAgent::requestConfirmation(BluezQt::DevicePtr device, const QStrin
-     connect(m_device.data(), &BluezQt::Device::pairedChanged, this, [=](bool st){
-         if (st == false) {
-             request.reject();
--            if (pincodewidget != nullptr)
--                pincodewidget->close();
-         }
-         return;
-     });
--- 
-2.30.0
-

0003-fix-restart-the-system-Bluetooth-core-dump.patch

@@ -1,45 +0,0 @@
-From e62a6729d4457b7e77fa4968e045866c16e24a6d Mon Sep 17 00:00:00 2001
-From: tanyulong <tanyulong@kylinos.cn>
-Date: Mon, 1 Nov 2021 10:32:54 +0800
-Subject: [PATCH] fix restart the system Bluetooth core dump
-
----
- ukui-bluetooth/main/featureswidget.cpp | 21 ++++++++++++++-------
- 1 file changed, 14 insertions(+), 7 deletions(-)
-
-diff --git a/ukui-bluetooth/main/featureswidget.cpp b/ukui-bluetooth/main/featureswidget.cpp
-index 300f51f..ff3f623 100644
---- a/ukui-bluetooth/main/featureswidget.cpp
-+++ b/ukui-bluetooth/main/featureswidget.cpp
-@@ -86,14 +86,21 @@ FeaturesWidget::FeaturesWidget(QWidget *parent)
-     qDebug() << m_manager->registerAgent(bluetoothAgent)->errorText();
-     qDebug() << m_adapter->isPowered() << "===========" << m_manager->isBluetoothBlocked();
- 
--    if(settings->get("switch").toString() == "false"){
--        if (!m_manager->isBluetoothBlocked())
--            m_manager->setBluetoothBlocked(true);
--    }else{
--        if(m_manager->isBluetoothBlocked()){
--            m_manager->setBluetoothBlocked(false);
--        }
-+//    if(settings->get("switch").toString() == "false"){
-+//        if (!m_manager->isBluetoothBlocked())
-+//            m_manager->setBluetoothBlocked(true);
-+//    }else{
-+//        if(m_manager->isBluetoothBlocked()){
-+//            m_manager->setBluetoothBlocked(false);
-+//        }
-+//    }
-+
-+    bool value;
-+    if(value != settings->get("switch").toBool()){
-+	    Turn_on_or_off_bluetooth(value);
-     }
-+    if (value = settings->get("switch").toBool() )
-+
- 
-     if(File_save_path.isEmpty()){
-         settings->set("file-save-path",QVariant::fromValue(QDir::homePath()));
--- 
-2.30.0
-

0004-fix-repair-bug.patch

@@ -1,30 +0,0 @@
-From 1eed1d15318d93969903cf03ada0dec6633c6f43 Mon Sep 17 00:00:00 2001
-From: tanyulong <tanyulong@kylinos.cn>
-Date: Mon, 1 Nov 2021 10:40:37 +0800
-Subject: [PATCH] fix repair bug
-
----
- ukui-bluetooth/main/featureswidget.cpp | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/ukui-bluetooth/main/featureswidget.cpp b/ukui-bluetooth/main/featureswidget.cpp
-index ff3f623..171506e 100644
---- a/ukui-bluetooth/main/featureswidget.cpp
-+++ b/ukui-bluetooth/main/featureswidget.cpp
-@@ -95,12 +95,7 @@ FeaturesWidget::FeaturesWidget(QWidget *parent)
- //        }
- //    }
- 
--    bool value;
--    if(value != settings->get("switch").toBool()){
--	    Turn_on_or_off_bluetooth(value);
--    }
--    if (value = settings->get("switch").toBool() )
--
-+    Turn_on_or_off_bluetooth(settings->get("switch").toBool());
- 
-     if(File_save_path.isEmpty()){
-         settings->set("file-save-path",QVariant::fromValue(QDir::homePath()));
--- 
-2.30.0
-

0005-fix-control-files.patch

@@ -1,25 +0,0 @@
-From c2dd7b21afd60a8f30520f3724ae1c3d4d8aeda2 Mon Sep 17 00:00:00 2001
-From: tanyulong <tanyulong@kylinos.cn>
-Date: Tue, 16 Nov 2021 16:12:18 +0800
-Subject: [PATCH] fix control files
-
----
- debian/control | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/debian/control b/debian/control
-index 4f12e6c..c7447ea 100644
---- a/debian/control
-+++ b/debian/control
-@@ -26,7 +26,7 @@ Depends: libkf5bluezqt6,
-          libnotify-bin,
- 	 bluez (>= 5), 
-          bluez-obexd, 
--         peony-bluetooth (>= 3.2.2),
-+         peony-extensions (>= 3.2.2+0611),
-          ${shlibs:Depends}, ${misc:Depends}
- Recommends: pulseaudio-module-bluetooth
- Conflicts: blueman
--- 
-2.30.0
-

0006-Update-changelog-and-format.patch

@@ -1,32 +0,0 @@
-From 06dff81a70eea70f970f642fd2f01954ae86198b Mon Sep 17 00:00:00 2001
-From: tanyulong <tanyulong@kylinos.cn>
-Date: Thu, 2 Dec 2021 10:33:15 +0800
-Subject: [PATCH] Update changelog and format
-
----
- debian/changelog     | 4 ++++
- debian/source/format | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/debian/changelog b/debian/changelog
-index 32d6aff..9e72d1d 100644
---- a/debian/changelog
-+++ b/debian/changelog
-@@ -1,3 +1,7 @@
-+ukui-bluetooth (1.0.1-1~0820) focal; urgency=medium
-+
-+  * New upstream release.
-+
- ukui-bluetooth (1.0.0-49+0612) focal; urgency=medium
- 
-   * Build for Ubuntukylin
-diff --git a/debian/source/format b/debian/source/format
-index 89ae9db..163aaf8 100644
---- a/debian/source/format
-+++ b/debian/source/format
-@@ -1 +1 @@
--3.0 (native)
-+3.0 (quilt)
--- 
-2.30.0
-

0007-Update-Debian-changelog-info.patch

@@ -1,31 +0,0 @@
-From 5aa5335b84bfb9a40b52894aa13b4103f0ca1725 Mon Sep 17 00:00:00 2001
-From: tanyulong <tanyulong@kylinos.cn>
-Date: Fri, 3 Dec 2021 10:10:17 +0800
-Subject: [PATCH] Update Debian changelog info
-
----
- debian/changelog | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/debian/changelog b/debian/changelog
-index 9e72d1d..151f11b 100644
---- a/debian/changelog
-+++ b/debian/changelog
-@@ -1,3 +1,14 @@
-+ukui-bluetooth (1.0.0-1kylin1k53) v101; urgency=medium
-+  * Bug  :
-+    - bug#63674
-+      手机与系统蓝牙配对超时后，1分钟之后点击确认，ukui-bluetooth会出现段错误(lixiang)
-+    - bug#63675
-+      手机与系统蓝牙配对，点击取消配对后，手机的蓝牙未从配对列表移除(lixiang)
-+  * Task :
-+  * Other: 
-+
-+ -- guang tang <tangguang@kylinos.cn>  Wed, 30 Jun 2021 08:37:51 +0800
-+
- ukui-bluetooth (1.0.1-1~0820) focal; urgency=medium
- 
-   * New upstream release.
--- 
-2.30.0
-

ukui-bluetooth.spec

@@ -1,21 +1,11 @@
-%define debug_package %{nil}
-
 Name:          ukui-bluetooth
-Version:        1.0.0
+Version:       1.0.3
-Release:        8
+Release:       3
 Summary:       Advanced ukui bluetooth
 License:       GPLv2+
 URL:           http://www.ukui.org
 Source0:       %{name}-%{version}.tar.gz
 
-patch0:		0001-fix-Bluetooth-pulled-up-by-the-session-manager-and-exits-abnormally.patch
-patch1:		0002-fix-ukui-bluetooth-will-have-a-segfault-when-times-out.patch
-patch2:		0003-fix-restart-the-system-Bluetooth-core-dump.patch
-patch3:		0004-fix-repair-bug.patch
-patch4:         0005-fix-control-files.patch
-patch5:         0006-Update-changelog-and-format.patch
-patch6:         0007-Update-Debian-changelog-info.patch
-
 BuildRequires: gsettings-qt-devel
 BuildRequires: glib2-devel
 BuildRequires: kf5-bluez-qt-devel
@@ -25,44 +15,38 @@ BuildRequires: libXrandr-devel
 BuildRequires: libXinerama-devel
 BuildRequires: libXi-devel
 BuildRequires: libXcursor-devel
-
+BuildRequires: ukui-interface
-
+BuildRequires: libukcc-devel
-Requires: kf5-bluez-qt
+BuildRequires: polkit-qt5-1-devel
-Requires: kf5-bluez-qt-common
+Requires: kf5-bluez-qt-devel
 Requires: libnotify
 Requires: bluez >= 5.0
 Requires: bluez-obexd
+Requires: peony-extensions
 Requires: pulseaudio-module-bluetooth
 
-
-
-
 %description
-Simple bluetooth tool for ukui desktop environment 
+A lightweight Bluetooth tool based on libkf5bluezqt6 on the UKUI desktop environment
-.The package contains executable file.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 mkdir build && cd build
-qmake-qt5 ..
+%{qmake_qt5} ..
-make
+%{make_build}
 
 %install
 rm -rf $RPM_BUILD_ROOT 
-cd %{_builddir}/%{name}-%{version}/build
+pushd build
-make INSTALL_ROOT=%{buildroot} install
+%{make_install} INSTALL_ROOT=%{buildroot}
-mkdir -p %{buildroot}/usr/share/ukui-bluetooth/translations/
+popd 
-cp -r %{_builddir}/%{name}-%{version}/translations/*.qm %{buildroot}/usr/share/ukui-bluetooth/translations/
 
+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}/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/
@@ -80,11 +64,39 @@ 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
+* Sat Apr 08 2023 douyan <douyan@kylinos.cn> - 1.0.3-3
+- add requires pulseaudio-module-bluetooth
+
+* Wed Feb 08 2023 peijiankang <peijiankang@kylinos.cn> - 1.0.3-2
+- add build debuginfo and debugsource
+
+* Fri Nov 18 2022 douyan <douyan@kylinos.cn> - 1.0.3-1
+- update to upstream version 1.0.3
+
+* Wed Aug 03 2022 tanyulong <tanyulong@kylinos.cn> - 1.0.2-3
+- fix startup segfault issue
+
+* Tue Jun 21 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.2-2
+- Remove kf5-bluez-qt-common
+
+* Tue Jun 21 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.2-1
+- update version to 1.0.2
+
+* Wed Dec 08 2021 tanyulong <tanyulong@kylinos.cn> - 1.0.0-10
+- add patch: 0009-Update-README-info.patch
+
+* Tue Dec 07 2021 tanyulong <tanyulong@kylinos.cn> - 1.0.0-9
+- add patch:0008-add-and-update-chanageinfo.patch
+
 * Fri Dec 03 2021 tanyulong <tanyulong@kylinos.cn> - 1.0.0-8
 - add patch:0007-Update-Debian-changelog-info.patch
 

ukui-bluetooth.yaml

@@ -0,0 +1,4 @@
+version_control: github
+src_repo: https://github.com/ukui/ukui-bluetooth.git
+tag_prefix: "v"
+separator: "."