!3 update to version 3.0.2

Merge pull request !3 from dou33/master
This commit is contained in:
dou33 2020-11-03 15:23:58 +08:00 committed by Gitee
commit 2f8381c973
4 changed files with 15 additions and 19 deletions

View File

@ -1,12 +0,0 @@
diff -ur ukui-session-manager-2.0.2/ukui-session-manager-2.0.2/ukui-session/modulemanager.cpp ukui-session-manager-2.0.2/ukui-session-manager-2.0.2~/ukui-session/modulemanager.cpp
--- ukui-session-manager-2.0.2/ukui-session-manager-2.0.2/ukui-session/modulemanager.cpp 2020-06-19 14:09:56.000000000 +0800
+++ ukui-session-manager-2.0.2/ukui-session-manager-2.0.2~/ukui-session/modulemanager.cpp 2020-07-01 09:42:48.000000000 +0800
@@ -195,7 +195,7 @@
qDebug() << "wait for ukui-settings-daemon start-up";
timer = new QTimer();
connect(timer,SIGNAL(timeout()),this,SLOT(timerUpdate()));
- timer->start(1000);
+ timer->start(6000);
}
void ModuleManager::timerUpdate(){

Binary file not shown.

Binary file not shown.

View File

@ -1,15 +1,17 @@
%define debug_package %{nil} %define debug_package %{nil}
Name: ukui-session-manager Name: ukui-session-manager
Version: 2.0.2 Version: 3.0.2
Release: 1 Release: 1
Summary: Session manager of the UKUI desktop environment Summary: Session manager of the UKUI desktop environment
License: LGPL-2.1+ GPL-3+ License: LGPL-2.1+ GPL-3+
URL: http://www.ukui.org URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
BuildRequires: cmake,libXtst-devel,libX11-devel,xdg-user-dirs,kf5-kidletime-devel,qt5-qtx11extras-devel,qt5-qtbase-devel,systemd-devel,qt5-qttools-devel,qt5-qtmultimedia-devel,gsettings-qt-devel, BuildRequires: cmake,libXtst-devel,libX11-devel,xdg-user-dirs,kf5-kidletime-devel,qt5-qtx11extras-devel,qt5-qtbase-devel,systemd-devel,qt5-qttools-devel,qt5-qtmultimedia-devel,gsettings-qt-devel,pkgconf
Requires: ukui-themes Requires: ukui-themes
Requires: glib2
Requires: qt5-qtmultimedia
Recommends: peony Recommends: peony
Recommends: ukwm Recommends: ukwm
@ -20,7 +22,7 @@ Recommends: ukui-settings-daemon
Provides: x-session-manager Provides: x-session-manager
patch0: delay-other-program.patch #patch0: delay-other-program.patch
%description %description
This package contains a session that can be started from a display This package contains a session that can be started from a display
manager such as lightdm. It will load all necessary applications for manager such as lightdm. It will load all necessary applications for
@ -30,7 +32,7 @@ patch0: delay-other-program.patch
%prep %prep
%setup -q %setup -q
%patch0 -p2 #%%patch0 -p2
%build %build
mkdir cmake-build mkdir cmake-build
@ -43,8 +45,10 @@ popd
pushd cmake-build pushd cmake-build
%make_install INSTALL_ROOT=%{buildroot} %make_install INSTALL_ROOT=%{buildroot}
popd popd
mkdir -p %{buildroot}/etc/X11/Xsession.d/ %{buildroot}/usr/share/man/man1/ #mkdir -p %{buildroot}/etc/X11/Xsession.d/ %{buildroot}/usr/share/man/man1/
install -m644 debian/99ukui-environment %{buildroot}/etc/X11/Xsession.d/99ukui-environment #install -m644 debian/99ukui-environment %{buildroot}/etc/X11/Xsession.d/99ukui-environment
install -d %{buildroot}/usr/share/man/man1/ %{buildroot}/etc/polkit-1/localauthority/50-local.d/
install -m644 data/com.ubuntu.enable-hibernate.pkla %{buildroot}/etc/polkit-1/localauthority/50-local.d/com.ubuntu.enable-hibernate.pkla
gzip -c man/ukui-session.1 > %{buildroot}/usr/share/man/man1/ukui-session.1.gz gzip -c man/ukui-session.1 > %{buildroot}/usr/share/man/man1/ukui-session.1.gz
gzip -c man/ukui-session-tools.1 > %{buildroot}/usr/share/man/man1/ukui-session-tools.1.gz gzip -c man/ukui-session-tools.1 > %{buildroot}/usr/share/man/man1/ukui-session-tools.1.gz
@ -53,7 +57,8 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%doc debian/changelog debian/copyright %doc debian/changelog debian/copyright
%{_sysconfdir}/X11/Xsession.d/99ukui-environment #%%{_sysconfdir}/X11/Xsession.d/99ukui-environment
%{_sysconfdir}/polkit-1/localauthority/50-local.d/com.ubuntu.enable-hibernate.pkla
%{_datadir}/* %{_datadir}/*
%{_prefix}/bin/ukui-session %{_prefix}/bin/ukui-session
%{_prefix}/bin/ukui-session-tools %{_prefix}/bin/ukui-session-tools
@ -61,5 +66,8 @@ rm -rf $RPM_BUILD_ROOT
#%%{_datadir}/man/man1/ukui-session-tools.1.gz #%%{_datadir}/man/man1/ukui-session-tools.1.gz
%changelog %changelog
* Mon Oct 26 2020 douyan <douyan@kylinos.cn> - 3.0.2-1
- update to upstream version 3.0.1
* Thu Jul 9 2020 douyan <douyan@kylinos.cn> - 2.0.2-1 * Thu Jul 9 2020 douyan <douyan@kylinos.cn> - 2.0.2-1
- Init package for openEuler - Init package for openEuler