Drop system-settings subpackage
It was copy/pasted from Simply Linux branding and it definetly doesn't make sense here. (cherry picked from commit 85fa2d5fe52cea61e6cf730b1eab027de339138f)
This commit is contained in:
@ -207,7 +207,3 @@ install: browser-qt ahttpd boot-images boot-splash @X86@ indexhtml hidden-menu-e
|
||||
cp menu/50-xfce-applications.menu $(sysconfdir)/xdg/menus/xfce-applications-merged/
|
||||
mkdir -p $(datadir)/desktop-directories
|
||||
cp menu/altlinux-wine.directory $(datadir)/desktop-directories/
|
||||
# system-settings
|
||||
mkdir -p $(sysconfdir)/polkit-1/rules.d/
|
||||
cp -a system-settings/polkit-rules/*.rules $(sysconfdir)/polkit-1/rules.d/
|
||||
#install -Dm644 system-settings/ldm_pam_environment $(localstatedir)/ldm/.pam_environment
|
||||
|
@ -242,18 +242,6 @@ Requires: altlinux-freedesktop-menu-common
|
||||
%description menu
|
||||
Menu for %distro_name
|
||||
|
||||
%package system-settings
|
||||
BuildArch: noarch
|
||||
Summary: Some system settings for Simply Linux
|
||||
License: GPLv2+
|
||||
Group: System/Base
|
||||
# Really we need lightdm only, but it can pull another greeter.
|
||||
Requires: lightdm-gtk-greeter
|
||||
%branding_add_conflicts %flavour system-settings
|
||||
|
||||
%description system-settings
|
||||
Some system settings for Simply Linux.
|
||||
|
||||
%prep
|
||||
%setup -n branding
|
||||
|
||||
@ -304,13 +292,6 @@ shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_HIGHLIGHT %grub_high
|
||||
%post indexhtml
|
||||
%_sbindir/indexhtml-update
|
||||
|
||||
%post system-settings
|
||||
#chown _ldm:_ldm %_localstatedir/ldm/.pam_environment
|
||||
sed -i '/pam_env\.so/ {
|
||||
/user_readenv/ b
|
||||
s/pam_env\.so/pam_env.so user_readenv=1/ }
|
||||
' %_sysconfdir/pam.d/lightdm-greeter
|
||||
|
||||
%files bootloader
|
||||
%ifarch %ix86 x86_64
|
||||
%_datadir/gfxboot/%theme
|
||||
@ -395,10 +376,6 @@ fi
|
||||
/etc/xdg/menus/xfce-applications-merged/50-xfce-applications.menu
|
||||
/usr/share/desktop-directories/altlinux-wine.directory
|
||||
|
||||
%files system-settings
|
||||
%config %_sysconfdir/polkit-1/rules.d/*.rules
|
||||
#config %_localstatedir/ldm/.pam_environment
|
||||
|
||||
%changelog
|
||||
* Wed May 29 2019 Alexey Shabalin <shaba@altlinux.org> 8.90-alt1
|
||||
- Alpha version of ALT Server 9.0 (based on Education by cas@).
|
||||
|
@ -1,4 +0,0 @@
|
||||
# Workaround for ALT bug #29167.
|
||||
# Based on suggestion by Daniel Gnoutcheff (gnoutchd)
|
||||
# https://bugs.launchpad.net/lightdm/+bug/1024482/comments/18.
|
||||
GDK_CORE_DEVICE_EVENTS=true
|
@ -1,6 +0,0 @@
|
||||
polkit.addRule(function(action, subject) {
|
||||
if (action.id == "org.freedesktop.NetworkManager.settings.modify.system" &&
|
||||
subject.isInGroup("wheel")) {
|
||||
return polkit.Result.YES;
|
||||
};
|
||||
});
|
Reference in New Issue
Block a user