From 46108f0f80ddfb895c98503a92ffb9b0d2f1f9f9 Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Nov 11 2020 02:16:59 +0000 Subject: [packit] 5.3.0.18 upstream release Upstream tag: 5.3.0.18 Upstream commit: 7ad7aa72 Signed-off-by: Robin Lee --- diff --git a/.gitignore b/.gitignore index 4023993..05c3375 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /dde-session-ui-4.8.9.tar.gz /dde-session-ui-4.8.11.tar.gz /dde-session-ui-5.0.0.tar.gz +/dde-session-ui-5.3.0.18.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..56b075d --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,19 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +specfile_path: rpm/deepin-session-ui.spec + +# add or remove files that should be synced +synced_files: + - rpm/deepin-session-ui.spec + - .packit.yaml + +upstream_package_name: dde-session-ui +# downstream (Fedora) RPM package name +downstream_package_name: deepin-session-ui + +actions: + fix-spec-file: | + bash -c "sed -i -r \"s/Version:(\s*)\S*/Version:\1${PACKIT_PROJECT_VERSION}/\" rpm/deepin-session-ui.spec" + post-upstream-clone: | + cp rpm/dde-session-ui.spec rpm/deepin-session-ui.spec diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..0b7be24 --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.18.0. diff --git a/deepin-session-ui.spec b/deepin-session-ui.spec index 320c4b8..13636d8 100644 --- a/deepin-session-ui.spec +++ b/deepin-session-ui.spec @@ -1,41 +1,47 @@ %global repo dde-session-ui +%global __provides_exclude_from ^%{_libdir}/dde-dock/.*\\.so$ +%if 0%{?fedora} Name: deepin-session-ui -Version: 5.0.0 -Release: 3%{?dist} +%else +Name: %{repo} +%endif +Version: 5.3.0.18 +Release: 1%{?fedora:%dist} Summary: Deepin desktop-environment - Session UI module License: GPLv3 -URL: https://github.com/linuxdeepin/dde-session-ui +URL: https://github.com/linuxdeepin/%{repo} Source0: %{url}/archive/%{version}/%{repo}-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: deepin-gettext-tools -BuildRequires: pkgconfig(dtkwidget) >= 2.0.6 +BuildRequires: pkgconfig(dtkwidget) >= 5.1 BuildRequires: pkgconfig(dframeworkdbus) +BuildRequires: pkgconfig(dde-dock) BuildRequires: pkgconfig(gsettings-qt) BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(liblightdm-qt5-3) BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(xcb-ewmh) +BuildRequires: pkgconfig(xcursor) +BuildRequires: pkgconfig(xtst) +BuildRequires: pkgconfig(xext) +BuildRequires: golang-github-msteinert-pam-devel +BuildRequires: dtkcore-devel >= 5.1 BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(Qt5Multimedia) -BuildRequires: pkgconfig(xcb-ewmh) -BuildRequires: pkgconfig(xcursor) -BuildRequires: pkgconfig(xtst) -BuildRequires: pam-devel -BuildRequires: qt5-linguist -Requires: deepin-control-center +%if 0%{?fedora} Requires: deepin-daemon +%else +Requires: dde-daemon +%endif Requires: startdde -Requires: lightdm -Provides: lightdm-deepin-greeter%{?_isa} = %{version}-%{release} -Provides: lightdm-greeter = 1.2 + Provides: deepin-notifications = %{version}-%{release} -Provides: deepin-notifications%{?_isa} = %{version}-%{release} -Obsoletes: deepin-notification <= 3.3.4 +Obsoletes: deepin-notifications <= 3.3.4 %description This project include those sub-project: @@ -50,7 +56,7 @@ This project include those sub-project: - dde-hotzone: User interface of setting hot zone. %prep -%setup -q -n %{repo}-%{version} +%autosetup -p1 -n %{repo}-%{version} sed -i 's|lib|libexec|' \ misc/applications/deepin-toggle-desktop.desktop* \ dde-osd/dde-osd_autostart.desktop \ @@ -59,40 +65,40 @@ sed -i 's|lib|libexec|' \ dde-osd/dde-osd.pro \ dde-welcome/com.deepin.dde.welcome.service \ dde-welcome/dde-welcome.pro \ + dde-bluetooth-dialog/dde-bluetooth-dialog.pro \ + dde-touchscreen-dialog/dde-touchscreen-dialog.pro \ dde-warning-dialog/com.deepin.dde.WarningDialog.service \ dde-warning-dialog/dde-warning-dialog.pro \ dde-offline-upgrader/dde-offline-upgrader.pro \ dde-suspend-dialog/dde-suspend-dialog.pro \ dnetwork-secret-dialog/dnetwork-secret-dialog.pro \ dde-lowpower/dde-lowpower.pro +sed -i 's|/usr/lib/dde-dock|%{_libdir}/dde-dock|' dde-notification-plugin/notifications/notifications.pro %build export PATH=%{_qt5_bindir}:$PATH -%qmake_qt5 PREFIX=%{_prefix} +%qmake_qt5 PREFIX=%{_prefix} PKGTYPE=rpm %make_build %install %make_install INSTALL_ROOT=%{buildroot} -# lightdm.conf -#https://wiki.archlinux.org/index.php/Deepin_Desktop_Environment#Via_a_Display_Manager - %files %doc README.md %license LICENSE -%config(noreplace) %{_sysconfdir}/deepin/ %{_bindir}/dde-* %{_bindir}/dmemory-warning-dialog -%{_bindir}/deepin-greeter -%{_bindir}/lightdm-deepin-greeter %{_libexecdir}/deepin-daemon/* %{_datadir}/%{repo}/ -%{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/dbus-1/services/*.service -%{_datadir}/xgreeters/lightdm-deepin-greeter.desktop +%{_libdir}/dde-dock/plugins/libnotifications.so +%{_prefix}/share/glib-2.0/schemas/com.deepin.dde.dock.module.notifications.gschema.xml %changelog +* Wed Nov 11 2020 Robin Lee - 5.3.0.18-1 +- new upstream release: 5.3.0.18 + * Mon Jul 27 2020 Fedora Release Engineering - 5.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 3c68d8f..d6aa3e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dde-session-ui-5.0.0.tar.gz) = fb5b358517e5cfe133d26ee890f865ddefdf80c9db1ad061e62817de4ef34d84837dec6726451aaeeed50e2cdff59eb79725cec5dcadac4ed00dd2aaecf54ff8 +SHA512 (dde-session-ui-5.3.0.18.tar.gz) = 55f499ccfd2e741f3736766ef745c682b3f9b20472007f5cfef4b2e1dbb342573b4c0e599e57f67e13b918add5df620235d340d2b3ec0eeccb7460a57179029e