Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
branding-etersoft-ximper
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ximper Linux
branding-etersoft-ximper
Commits
10c016fd
Commit
10c016fd
authored
Oct 17, 2017
by
Mikhail Efremov
Committed by
Alexey Shabalin
Jun 13, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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)
parent
fc2baa1d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
37 deletions
+0
-37
Makefile.in
Makefile.in
+0
-4
branding.spec
branding.spec
+0
-23
ldm_pam_environment
system-settings/ldm_pam_environment
+0
-4
70-SL-NM-allow-modify-system.rules
...-settings/polkit-rules/70-SL-NM-allow-modify-system.rules
+0
-6
No files found.
Makefile.in
View file @
10c016fd
...
@@ -207,7 +207,3 @@ install: browser-qt ahttpd boot-images boot-splash @X86@ indexhtml hidden-menu-e
...
@@ -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/
cp
menu/50-xfce-applications.menu
$(sysconfdir)
/xdg/menus/xfce-applications-merged/
mkdir
-p
$(datadir)
/desktop-directories
mkdir
-p
$(datadir)
/desktop-directories
cp
menu/altlinux-wine.directory
$(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
branding.spec
View file @
10c016fd
...
@@ -242,18 +242,6 @@ Requires: altlinux-freedesktop-menu-common
...
@@ -242,18 +242,6 @@ Requires: altlinux-freedesktop-menu-common
%description menu
%description menu
Menu for %distro_name
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
%prep
%setup -n branding
%setup -n branding
...
@@ -304,13 +292,6 @@ shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_HIGHLIGHT %grub_high
...
@@ -304,13 +292,6 @@ shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_HIGHLIGHT %grub_high
%post indexhtml
%post indexhtml
%_sbindir/indexhtml-update
%_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
%files bootloader
%ifarch %ix86 x86_64
%ifarch %ix86 x86_64
%_datadir/gfxboot/%theme
%_datadir/gfxboot/%theme
...
@@ -395,10 +376,6 @@ fi
...
@@ -395,10 +376,6 @@ fi
/etc/xdg/menus/xfce-applications-merged/50-xfce-applications.menu
/etc/xdg/menus/xfce-applications-merged/50-xfce-applications.menu
/usr/share/desktop-directories/altlinux-wine.directory
/usr/share/desktop-directories/altlinux-wine.directory
%files system-settings
%config %_sysconfdir/polkit-1/rules.d/*.rules
#config %_localstatedir/ldm/.pam_environment
%changelog
%changelog
* Wed May 29 2019 Alexey Shabalin <shaba@altlinux.org> 8.90-alt1
* Wed May 29 2019 Alexey Shabalin <shaba@altlinux.org> 8.90-alt1
- Alpha version of ALT Server 9.0 (based on Education by cas@).
- Alpha version of ALT Server 9.0 (based on Education by cas@).
...
...
system-settings/ldm_pam_environment
deleted
100644 → 0
View file @
fc2baa1d
# 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
system-settings/polkit-rules/70-SL-NM-allow-modify-system.rules
deleted
100644 → 0
View file @
fc2baa1d
polkit.addRule(function(action, subject) {
if (action.id == "org.freedesktop.NetworkManager.settings.modify.system" &&
subject.isInGroup("wheel")) {
return polkit.Result.YES;
};
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment