!27 remove unnecessary file

From: @dou33 Reviewed-by: @peijiankang Signed-off-by: @peijiankang
remove unnecessary file
2022-06-08 09:52:43 +00:00 · 2022-06-08 14:55:20 +08:00 · 2020-12-09 09:03:36 +08:00 · 2020-12-08 18:01:36 +08:00 · 2020-12-08 17:51:15 +08:00 · 2020-12-08 16:27:28 +08:00
6 changed files with 131 additions and 53 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +0,0 @@
-
-.DS_Store
--- a/0001-fix-icon-misplaced.patch
+++ b/0001-fix-icon-misplaced.patch
@ -0,0 +1,73 @@
+From 79aedc7ca92b610a806c2a3cf4c29fb5396c360d Mon Sep 17 00:00:00 2001
+From: myshow <296570182@qq.com>
+Date: Tue, 8 Dec 2020 17:52:53 +0800
+Subject: [PATCH 1/2] fix-icon-misplaced
+
+---
+ ukui-greeter/greeter/greeterwindow.cpp | 11 +++++------
+ ukui-greeter/ukui-greeter.pro          |  2 +-
+ 2 files changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/ukui-greeter/greeter/greeterwindow.cpp b/ukui-greeter/greeter/greeterwindow.cpp
+index 76e6953..5722bed 100644
+--- a/ukui-greeter/greeter/greeterwindow.cpp
+++ b/ukui-greeter/greeter/greeterwindow.cpp
+@@ -153,8 +153,8 @@ void GreeterWindow::initUI()
+         m_sessionLB->setFixedSize(48, 48);
+         m_sessionLB->setCursor(Qt::PointingHandCursor);
+         m_sessionLB->installEventFilter(this);
+-	m_sessionLB->setToolTip(tr("Set the desktop environment for the selected user to log in. \
+-	If the user is logged in, it will take effect after logging in again"));
+        m_sessionLB->setToolTip(tr("Set the desktop environment for the selected user to log in. \
+                                    If the user is logged in, it will take effect after logging in again"));
+         m_sessionLB->setIcon(QIcon(IMAGE_DIR + QString("badges/unknown_badge.svg")));
+         onSessionChanged(m_greeter->defaultSessionHint());
+         connect(m_sessionLB, &QPushButton::clicked, this, &GreeterWindow::showSessionWnd);
+@@ -263,7 +263,7 @@ void GreeterWindow::resizeEvent(QResizeEvent *event)
+     QSize size = event->size();
+     //重新计算缩放比例
+     scale = QString::number(size.width() / 1920.0, 'f', 1).toFloat();
+-    
+
+     if(scale > 1)
+         scale = 1;
+     fontSize = scale > 0.5 ? 10 : 8;
+@@ -413,7 +413,7 @@ void GreeterWindow::setBackground(const QModelIndex &index)
+     QString backgroundPath;
+ 
+     bool useUserBackground = false;
+-	
+
+     //读取/var/lib/lightdm-date/用户名/ukui-greeter.conf,
+     //判断是否设置了该用户的登陆界面的背景图片.
+     QString userConfigurePath = m_greeter->getEnsureShareDir(index.data(QLightDM::UsersModel::NameRole).toString()) + "/ukui-greeter.conf";
+@@ -700,7 +700,7 @@ void GreeterWindow::showSessionWnd()
+     if(!m_sessionWnd){
+         m_sessionWnd = new SessionWindow(m_sessionsModel, this);
+ 
+-#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0))
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
+         m_sessionWnd->setStyleSheet("QMenu::item{padding: 2px 10px 2px 10px;}");
+ #else
+         m_sessionWnd->setStyleSheet("QMenu::item{padding: 2px 10px 2px 30px;}");
+@@ -786,4 +786,3 @@ bool GreeterWindow::sessionIsValid(const QString &session)
+     }
+     return false;
+ }
+-
+diff --git a/ukui-greeter/ukui-greeter.pro b/ukui-greeter/ukui-greeter.pro
+index a71b2d8..929ef7b 100644
+--- a/ukui-greeter/ukui-greeter.pro
+++ b/ukui-greeter/ukui-greeter.pro
+@@ -79,7 +79,7 @@ TRANSLATIONS += translations/zh_CN.ts \
+                 translations/tr.ts \
+                 translations/es.ts
+ 
+-system("lrelease translations/*.ts")
+system("lrelease-qt5 translations/*.ts")
+ 
+ qm_file.files = translations/*.qm
+ qm_file.path = $${PREFIX}/translations/
+-- 
+2.29.2.windows.2
+
--- a/0002-fix-ukui-greeter-desktop-option-issue.patch
+++ b/0002-fix-ukui-greeter-desktop-option-issue.patch
@ -0,0 +1,25 @@
+From 89d0bb88180c42c7ffd33fac9ff72260f930fcb0 Mon Sep 17 00:00:00 2001
+From: myshow <296570182@qq.com>
+Date: Tue, 8 Dec 2020 17:57:26 +0800
+Subject: [PATCH 2/2] fix-ukui-greeter-desktop-option-issue
+
+---
+ ukui-greeter/greeter/sessionwindow.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ukui-greeter/greeter/sessionwindow.cpp b/ukui-greeter/greeter/sessionwindow.cpp
+index 4940003..8f63355 100644
+--- a/ukui-greeter/greeter/sessionwindow.cpp
+++ b/ukui-greeter/greeter/sessionwindow.cpp
+@@ -69,6 +69,8 @@ void SessionWindow::addSessionLabels()
+     for(int i = 0; i < m_sessionsModel->rowCount(); i++) {
+         QString sessionName = m_sessionsModel->index(i, 0).data().toString();
+         QString sessionKey = m_sessionsModel->index(i, 0).data(Qt::UserRole).toString();
+        if(sessionKey == "xinit-compat")
+            continue;
+         QAction *action = new QAction(QIcon(getSessionIcon(sessionKey)), sessionName, this);
+         action->setData(sessionKey);
+         addAction(action);
+-- 
+2.29.2.windows.2
+
--- a/ukui-greeter-1.2.3.tar.gz
+++ b/ukui-greeter-1.2.3.tar.gz
--- a/ukui-greeter-3.0.1.tar.gz
+++ b/ukui-greeter-3.0.1.tar.gz
--- a/ukui-greeter.spec
+++ b/ukui-greeter.spec
@ -1,15 +1,14 @@
-%global debug_package %{nil}
-%global PREFIX /usr/share/ukui-greeter
+%define debug_package %{nil}
 Name:           ukui-greeter
-Version:        1.2.3
-Release:        1
+Version:        3.0.1
+Release:        3
 Summary:        Lightdm greeter for UKUI
 License:        GPL-2.0
 URL:            http://www.ukui.org
 Source0:        ukui-greeter-%{version}.tar.gz

-BuildRequires: pkgconf qt5-qtbase-devel qt5-qtx11extras-devel qt5-qtsvg-devel lightdm-qt5-devel libX11-devel libXtst-devel libXrandr-devel qt5-qttools-devel imlib2-devel
-Requires: pkgconf qt5-qtbase-devel qt5-qtx11extras-devel qt5-qtsvg-devel lightdm-qt5-devel libX11-devel libXtst-devel libXrandr-devel qt5-qttools-devel imlib2-devel
+BuildRequires: pkgconf qt5-qtbase-devel qt5-qtx11extras-devel qt5-qtsvg-devel lightdm-qt5-devel libX11-devel libXtst-devel libXrandr-devel qt5-qttools-devel imlib2-devel xorg-x11-drivers
+Requires: pkgconf qt5-qtbase-devel qt5-qtx11extras-devel qt5-qtsvg-devel lightdm-qt5-devel libX11-devel libXtst-devel libXrandr-devel qt5-qttools-devel imlib2-devel xorg-x11-drivers
 Requires: lightdm
 Requires: xorg-x11-server-utils
 Requires: xorg-x11-server
@ -21,69 +20,52 @@ Requires: xorg-x11-xkb-utils

 Provides: lightdm-greeter

+patch0:  0001-fix-icon-misplaced.patch
+patch1:  0002-fix-ukui-greeter-desktop-option-issue.patch
+
 %description
 A greeter for UKUI desktop environment written by Qt5.
 The greeter supports biometric authentication which is
 provided by biometric-authentication service.
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1

 %build
 qmake-qt5
 make

 %install
+make INSTALL_ROOT=%{buildroot} install

-cd ukui-greeter/
-
-mkdir -p $RPM_BUILD_ROOT%{PREFIX}/translations/ \
-         $RPM_BUILD_ROOT%{PREFIX}/images/	\
-         $RPM_BUILD_ROOT%{PREFIX}/images/badges/ \
-         $RPM_BUILD_ROOT%{_datadir}/lightdm/lightdm.conf.d/ \
-         $RPM_BUILD_ROOT%{_sysconfdir}/lightdm/	\
-         $RPM_BUILD_ROOT%{_datadir}/xgreeters/	\
-         $RPM_BUILD_ROOT%{_datadir}/man/man8/	\
-         $RPM_BUILD_ROOT%{_sbindir}/ \
-	 $RPM_BUILD_ROOT%{_libdir}/ukui-greeter
-
-chmod 755 ukui-greeter.desktop
-
-pwd 
-
-cp translations/*.qm            $RPM_BUILD_ROOT%{PREFIX}/translations/
-cp -r resource/*                $RPM_BUILD_ROOT%{PREFIX}/images/
-#cp resource/badges/*.png       %{PREFIX}/images/badges/
-cp 95-ukui-greeter.conf         $RPM_BUILD_ROOT%{_datadir}/lightdm/lightdm.conf.d/
-cp ukui-greeter.conf            $RPM_BUILD_ROOT%{_sysconfdir}/lightdm/
-cp ukui-greeter.desktop         $RPM_BUILD_ROOT%{_datadir}/xgreeters/
-cp man/ukui-greeter.8	        $RPM_BUILD_ROOT%{_datadir}/man/man8/
-cp ukui-greeter                 $RPM_BUILD_ROOT%{_sbindir}/
-#cp ../GetBackground/greeter-get-background   $RPM_BUILD_ROOT%{_libdir}/ukui-greeter/
-#cp ../GetDefaultDevice/greeter-get-device    $RPM_BUILD_ROOT%{_libdir}/ukui-greeter/
-
-mkdir -p %{buildroot}/usr/share/doc/ukui-greeter/   %{buildroot}/usr/share/man/man8/
-cp ../debian/copyright  %{buildroot}/usr/share/doc/ukui-greeter/
-gzip  ../debian/changelog > %{buildroot}/usr/share/doc/ukui-greeter/changelog.gz
-#gzip man/ukui-greeter.8 > %{buildroot}/usr/share/man/man8/ukui-greeter.8.gz
-
-%postun
-
-#chmod +s $RPM_BUILD_ROOT%{_libdir}/ukui-greeter/greeter-get-device
-#chmod +s $RPM_BUILD_ROOT%{_libdir}/ukui-greeter/greeter-get-background
+mkdir -p %{buildroot}/usr/share/man/man8/
+gzip  -c ukui-greeter/man/ukui-greeter.8 > %{buildroot}/usr/share/man/man8/ukui-greeter.8.gz

 %clean
 ##[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT

 %files
+%doc  debian/copyright debian/changelog
+%{_sysconfdir}/lightdm/ukui-greeter.conf
+%{_datadir}/man/man8/ukui-greeter.8.gz
+%{_sbindir}/ukui-greeter
+%{_datadir}/lightdm/lightdm.conf.d/95-ukui-greeter.conf
+%{_datadir}/ukui-greeter/
+%{_datadir}/xgreeters/ukui-greeter.desktop

-%{PREFIX}/translations/*
-%{PREFIX}/images/*
-%{_datadir}/lightdm/lightdm.conf.d/*
-%{_sysconfdir}/lightdm/*
-%{_datadir}/xgreeters/*
-%{_datadir}/man/man8/*
-%{_sbindir}/*
-%{_libdir}/ukui-greeter/
-%{_datadir}/doc/ukui-greeter/
 %changelog
+* Tue Dec 8 2020 lvhan <lvhan@kylinos.cn> - 3.0.1-3
+- 0001-fix-icon-misplaced.patch

+* Tue Dec 8 2020 douyan <douyan@kylinos.cn> - 3.0.1-2
+- 0002-fix-ukui-greeter-desktop-option-issue.patch
+
+* Mon Oct 26 2020 douyan <douyan@kylinos.cn> - 3.0.1-1
+- update 3.0.0-1+1026
+
+* Mon Jul 20 2020 douyan <douyan@kylinos.cn> - 1.2.5-1
+- update 1.2.5
+
+* Thu Jul 9 2020 douyan <douyan@kylinos.cn> - 1.2.3-1
+- Init package for openEuler
Author	SHA1	Message	Date
openeuler-ci-bot	cac1620d6c	!27 remove unnecessary file From: @dou33 Reviewed-by: @peijiankang Signed-off-by: @peijiankang	2022-06-08 09:52:43 +00:00
dou33	4c41543b73	remove unnecessary file	2022-06-08 14:55:20 +08:00
openeuler-ci-bot	3f346d04e0	!8 fix-icon-misplaced From: @myshow2258 Reviewed-by: @dou33 Signed-off-by: @dou33	2020-12-09 09:03:36 +08:00
myshow	7f2e384d00	fix-icon-misplaced	2020-12-08 18:01:36 +08:00
openeuler-ci-bot	dfc38e894a	!7 fix-ukui-greeter-desktop-option-issue From: @dou33 Reviewed-by: @handsome_feng Signed-off-by: @handsome_feng	2020-12-08 17:51:15 +08:00
dou33	686e8b0b0e	fix-ukui-greeter-desktop-option-issue	2020-12-08 16:27:28 +08:00
dou33	d8dd37a5d2	!5 update to version 3.0.1 Merge pull request !5 from dou33/master	2020-11-03 15:19:00 +08:00
dou33	1f1eac75a3	update to version 3.0.1	2020-11-03 14:11:11 +08:00
openeuler-ci-bot	691005835e	!2 update source Merge pull request !2 from yangzhao_kl/update_source	2020-07-24 17:35:46 +08:00
yangzhao_kl	5134619153	update_source	2020-07-24 15:07:20 +08:00