From b2116e8a463116b12106604ce98896196ff931cd Mon Sep 17 00:00:00 2001 From: liuzhilin Date: Wed, 27 Mar 2024 17:44:17 +0800 Subject: [PATCH] del smbd service patch --- 0001-fix-smbd.service-error.patch | 25 ------------------------- dde-file-manager.spec | 7 ++++--- 2 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 0001-fix-smbd.service-error.patch diff --git a/0001-fix-smbd.service-error.patch b/0001-fix-smbd.service-error.patch deleted file mode 100644 index f47f3b4..0000000 --- a/0001-fix-smbd.service-error.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 710c4ffd170056e089950d7ae1fb8d33d41e4329 Mon Sep 17 00:00:00 2001 -From: root -Date: Fri, 15 Mar 2024 10:45:30 +0800 -Subject: [PATCH] fix-smbd.service-error - ---- - src/dde-file-manager-daemon/usershare/usersharemanager.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/dde-file-manager-daemon/usershare/usersharemanager.cpp b/src/dde-file-manager-daemon/usershare/usersharemanager.cpp -index f30c4ce..ae9c447 100644 ---- a/src/dde-file-manager-daemon/usershare/usersharemanager.cpp -+++ b/src/dde-file-manager-daemon/usershare/usersharemanager.cpp -@@ -124,7 +124,7 @@ bool UserShareManager::createShareLinkFile() - }*/ - - QProcess sh; -- static QString cmd("ln -sf /lib/systemd/system/smbd.service /etc/systemd/system/multi-user.target.wants/smbd.service"); -+ static QString cmd("ln -sf /lib/systemd/system/smb.service /etc/systemd/system/multi-user.target.wants/smbd.service"); - sh.start(cmd); - auto ret = sh.waitForFinished(); - return ret; --- -2.39.3 - diff --git a/dde-file-manager.spec b/dde-file-manager.spec index 95e5577..b5d0334 100644 --- a/dde-file-manager.spec +++ b/dde-file-manager.spec @@ -2,7 +2,7 @@ ## (rpmautospec version 0.3.5) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 5; + release_number = 6; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} @@ -25,8 +25,6 @@ Patch0001: 0001-fix-use-Q_GLOBAL_STATIC-to-initialize-eventHanlder-a.patch # Drop unused pcre.h Patch0006: 0001-Drop-unused-pcre.h.patch -Patch0007: 0001-fix-smbd.service-error.patch - BuildRequires: gcc-c++ BuildRequires: desktop-file-utils BuildRequires: deepin-gettext-tools @@ -205,6 +203,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-open.desktop %endif %changelog +* Wed Mar 27 2024 liuzhilin - 5.8.3-1.6 +- del smbd service patch + * Fri Mar 15 2024 liuzhilin - 5.8.3-1.5 - fix smbd service error -- Gitee