diff --git a/fix-default-wallpaper.patch b/fix-default-wallpaper.patch new file mode 100644 index 0000000..6b36f49 --- /dev/null +++ b/fix-default-wallpaper.patch @@ -0,0 +1,21 @@ +diff -ur ukui-greeter-master/ukui-greeter/common/configuration.cpp ukui-greeter~/ukui-greeter/common/configuration.cpp +--- ukui-greeter-master/ukui-greeter/common/configuration.cpp 2020-07-11 17:12:01.000000000 +0800 ++++ ukui-greeter~/ukui-greeter/common/configuration.cpp 2020-07-16 17:49:32.447647884 +0800 +@@ -81,8 +81,7 @@ + + + /** +- * 获取系统版本号 +- */ ++ * 获取系统版本? */ + QString getSystemVersion() + { + QSettings settings("/etc/lsb-release", QSettings::IniFormat); +@@ -164,6 +163,6 @@ + else if(getSystemVersion().contains("V10.1",Qt::CaseInsensitive)) + return "/usr/share/backgrounds/warty-final-ubuntukylin.jpg"; + else +- return "/usr/share/backgrounds/kylin/kylin-background.png"; ++ return "/usr/share/backgrounds/warty-final-ubuntukylin.jpg"; + + } diff --git a/ukui-greeter-1.2.3.tar.gz b/ukui-greeter-1.2.3.tar.gz deleted file mode 100644 index f07dbf3..0000000 Binary files a/ukui-greeter-1.2.3.tar.gz and /dev/null differ diff --git a/ukui-greeter-1.2.5.tar.gz b/ukui-greeter-1.2.5.tar.gz new file mode 100644 index 0000000..7cd7f05 Binary files /dev/null and b/ukui-greeter-1.2.5.tar.gz differ diff --git a/ukui-greeter.spec b/ukui-greeter.spec index b8cf697..3d3104c 100644 --- 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 +Version: 1.2.5 Release: 1 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,40 @@ Requires: xorg-x11-xkb-utils Provides: lightdm-greeter +patch0: fix-default-wallpaper.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 %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 - +* Mon Jul 20 2020 douyan - 1.2.5-1 +- update 1.2.5 +* Thu Jul 9 2020 douyan - 1.2.3-1 +- Init package for openEuler