diff --git a/fix-plugin-icon.patch b/fix-plugin-icon.patch deleted file mode 100644 index bb98ef8..0000000 --- a/fix-plugin-icon.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ur ukui-sidebar-1.1.0/src/sidebarpluginswidgets.cpp ukui-sidebar-1.1.0~/src/sidebarpluginswidgets.cpp ---- ukui-sidebar-1.1.0/src/sidebarpluginswidgets.cpp 2020-06-18 14:31:44.000000000 +0800 -+++ ukui-sidebar-1.1.0~/src/sidebarpluginswidgets.cpp 2020-06-24 16:51:03.000000000 +0800 -@@ -407,7 +407,14 @@ - { - QToolButton *p_ToolButton = new QToolButton(); - p_ToolButton->setFixedSize(90,90); -- QPixmap pixmap = QIcon::fromTheme(icon).pixmap(QSize(45, 45)); -+ //显示错误,暂时读qrc文件中的icon -+ //QPixmap pixmap = QIcon::fromTheme(icon).pixmap(QSize(45, 45)); -+ QPixmap pixmap; -+ if(icon.contains("feedback")) { -+ pixmap = QIcon(QString(":/data/images/%1.png").arg(icon)).pixmap(QSize(45, 45)); -+ } else { -+ pixmap = QIcon(QString(":/data/images/%1.svg").arg(icon)).pixmap(QSize(45, 45)); -+ } - QLabel *IconLabel = new QLabel(); - IconLabel->setFixedSize(45, 45); - IconLabel->setPixmap(pixmap); -Only in ukui-sidebar-1.1.0~: ukui-sidebar.pro.user diff --git a/ukui-sidebar-1.1.2.tar.gz b/ukui-sidebar-1.1.2.tar.gz deleted file mode 100644 index e196bf2..0000000 Binary files a/ukui-sidebar-1.1.2.tar.gz and /dev/null differ diff --git a/ukui-sidebar-3.0.1.tar.gz b/ukui-sidebar-3.0.1.tar.gz new file mode 100644 index 0000000..5bd9de6 Binary files /dev/null and b/ukui-sidebar-3.0.1.tar.gz differ diff --git a/ukui-sidebar.spec b/ukui-sidebar.spec index 6aa79ce..455520c 100644 --- a/ukui-sidebar.spec +++ b/ukui-sidebar.spec @@ -1,6 +1,6 @@ %define debug_package %{nil} Name: ukui-sidebar -Version: 1.1.2 +Version: 3.0.1 Release: 1 Summary: parallels toolbox for UKUI License: GPL-3+ @@ -14,6 +14,9 @@ BuildRequires: qt5-qtmultimedia-devel BuildRequires: qt5-qttools-devel BuildRequires: gsettings-qt-devel BuildRequires: dconf-devel +BuildRequires: libX11-devel +BuildRequires: kf5-kwindowsystem-devel +BuildRequires: libXtst-devel Requires: glib2-devel Requires: qt5-qtbase-devel @@ -23,7 +26,7 @@ Requires: qt5-qttools-devel Requires: gsettings-qt-devel Requires: dconf-devel -patch0: fix-plugin-icon.patch +#patch0: fix-plugin-icon.patch %description The ukui-sidebar is mainly used in the desktop operating system. @@ -33,7 +36,7 @@ patch0: fix-plugin-icon.patch %prep %setup -q -%patch0 -p1 +#%%patch0 -p1 %build mkdir build && cd build @@ -48,23 +51,38 @@ make INSTALL_ROOT=%{buildroot} install %clean rm -rf $RPM_BUILD_ROOT +%postun +set -e + +home="/home/" + +db_file="/.config/ukui/Clock_database.db" +feedback="/.config/ukui/url.conf" + +for file in $(ls /home) +do + db_file_path=${home}${file}${db_file} + feedback_path=${home}${file}${feedback} + if [ -f "$db_file_path" ]; then + rm "$db_file_path" + fi + if [ -f "$feedback_path" ]; then + rm "$feedback_path" + fi +done + %files %doc debian/copyright debian/changelog %{_sysconfdir}/xdg/autostart/ukui-sidebar.desktop -%{_bindir}/ukui-sidebar -%{_prefix}/lib/ukui-sidebar -%{_datadir}/ukui-sidebar-notification -%{_bindir}/feedback -%{_bindir}/kylin-clock -%{_datadir}/applications/clock.desktop -%{_datadir}/applications/feedback.desktop -%{_bindir}/ukui-notebook -%{_datadir}/applications/ukui_notebook.desktop -%{_datadir}/ukui-clock/bark.ogg -%{_datadir}/ukui-clock/drip.ogg -%{_datadir}/ukui-clock/glass.ogg -%{_datadir}/ukui-clock/sonar.ogg +%{_bindir}/* +%{_libdir}/ukui-sidebar +%{_datadir}/ukui-sidebar* +%{_datadir}/applications/* +%{_datadir}/ukui-clock/ %changelog +* Mon Oct 26 2020 douyan - 3.0.1-1 +- update to upstream version 3.0.0-1+1103 + * Thu Jul 9 2020 douyan - 1.1.2-1 - Init package for openEuler