From e5d6a91c3cc180789ecbab0c01da0eecabb88f72 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: May 31 2021 16:46:40 +0000 Subject: Fix meson option --- diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec index a25d1e3..733a6ec 100644 --- a/cinnamon-settings-daemon.spec +++ b/cinnamon-settings-daemon.spec @@ -27,7 +27,6 @@ BuildRequires: pkgconfig(polkit-agent-1) BuildRequires: pkgconfig(libxklavier) BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(gudev-1.0) -BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(colord) >= 0.1.12 BuildRequires: pkgconfig(lcms2) >= 2.2 BuildRequires: pkgconfig(libsystemd) @@ -65,7 +64,7 @@ developing applications that use %{name}. %meson \ -Ddocs=true \ -Ddeprecated_warnings=false \ - -Denable_smartcard=disabled + -Duse_smartcard=disabled %meson_build @@ -74,18 +73,18 @@ developing applications that use %{name}. %meson_install desktop-file-install --delete-original \ - --dir %buildroot%{_sysconfdir}/xdg/autostart/ \ - %buildroot%{_sysconfdir}/xdg/autostart/* + --dir %{buildroot}%{_sysconfdir}/xdg/autostart/ \ + %{buildroot}%{_sysconfdir}/xdg/autostart/* desktop-file-install --delete-original \ - --dir %buildroot%{_datadir}/applications/ \ - %buildroot%{_datadir}/applications/csd-automount.desktop + --dir %{buildroot}%{_datadir}/applications/ \ + %{buildroot}%{_datadir}/applications/csd-automount.desktop # Fix non-executable script -chmod a+x %buildroot%{_datadir}/cinnamon-settings-daemon-3.0/input-device-example.sh +chmod a+x %{buildroot}%{_datadir}/cinnamon-settings-daemon-3.0/input-device-example.sh # Delete csd symlinks -rm -rf %buildroot%{_libdir}/cinnamon-settings-daemon/ +rm -rf %{buildroot}%{_libdir}/cinnamon-settings-daemon/ %files