diff --git a/kiran-cc-daemon.spec b/kiran-cc-daemon.spec index de5652d6c0f382e19baaf19751d295eee3c7ff00..227582f3ec50665918d187f63861985f94dbaf60 100644 --- a/kiran-cc-daemon.spec +++ b/kiran-cc-daemon.spec @@ -1,6 +1,6 @@ Name: kiran-cc-daemon Version: 2.6.1 -Release: 15%{?dist} +Release: 16%{?dist} Summary: DBus daemon for Kiran Desktop License: MulanPSL-2.0 @@ -69,7 +69,7 @@ DBus daemon for Kiran Desktop %package -n kiran-system-daemon Summary: System DBus daemon for Kiran Desktop -Requires: systemd +%{?systemd_requires} %if 0%{?rhel} > 7 || 0%{?openEuler} Requires: dbus-daemon @@ -134,10 +134,10 @@ Development files for communicating with control center daemon %cmake -make %{?_smp_mflags} +%cmake_build %install -%make_install +%cmake_install install -D -m 0644 %SOURCE1 %{buildroot}%{_datadir}/glib-2.0/schemas/99_unikylin-mate-SettingsDaemon-plugins.gschema.override install -D -m 0644 %SOURCE2 %{buildroot}%{_datadir}/glib-2.0/schemas/99_unikylin-mate-Marco-global-keybindings.gschema.override @@ -149,9 +149,6 @@ systemctl enable kiran-system-daemon.service %preun -n kiran-system-daemon %systemd_preun kiran-system-daemon.service -%post -n kiran-session-daemon -glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/nulls || : - %files -n kiran-system-daemon %{_sysconfdir}/dbus-1/system.d/*.conf %{_sysconfdir}/lightdm/kiran-greeter.conf @@ -211,6 +208,9 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/nulls || : %{_libdir}/pkgconfig/kiran-cc-daemon.pc %changelog +* Wed Nov 20 2024 Funda Wang - 2.6.1-16 +- adopt to new cmake macro + * Mon Apr 22 2024 meizhigang - 2.6.1-15 - KYOS-B: Fix poweroff action while button event duplicate once clicked (#28620)