diff --git a/9000-add-openeuler-pam-config.patch b/9000-add-openeuler-pam-config.patch new file mode 100644 index 0000000..729208f --- /dev/null +++ b/9000-add-openeuler-pam-config.patch @@ -0,0 +1,11 @@ +diff -ru gdm-3.30.1-origin/configure.ac gdm-3.30.1/configure.ac +--- gdm-3.30.1-origin/configure.ac 2019-12-17 15:33:13.656357443 +0800 ++++ gdm-3.30.1/configure.ac 2019-12-17 17:19:34.848463487 +0800 +@@ -200,6 +200,7 @@ + AS_HELP_STRING([--with-default-pam-config: One of redhat, openembedded, exherbo, lfs, arch, none @<:@default=auto@:>@])) + dnl If not given, try autodetecting from release files (see NetworkManager source) + if test x$with_default_pam_config = x; then ++ AC_CHECK_FILE(/etc/openEuler-release,with_default_pam_config="redhat") + AC_CHECK_FILE(/etc/redhat-release,with_default_pam_config="redhat") + AC_CHECK_FILE(/etc/fedora-release,with_default_pam_config="redhat") + AC_CHECK_FILE(/etc/exherbo-release,with_default_pam_config="exherbo") diff --git a/gdm.spec b/gdm.spec index 18e6029..422b4f4 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,7 +1,7 @@ Name: gdm Epoch: 1 Version: 3.30.1 -Release: 3 +Release: 4 Summary: A graphical display manager License: GPLv2+ URL: https://wiki.gnome.org/Projects/GDM @@ -13,6 +13,7 @@ Patch0002: 0001-manager-correct-display-confusion.patch Patch0003: 0001-local-display-factory-defer-initialization-for-CanGr.patch Patch0004: 0001-manager-do-initial-setup-post-work-in-manager-code.patch Patch0005: system-dconf.patch +Patch9000: 9000-add-openeuler-pam-config.patch BuildRequires: pam-devel >= 0:0.99.8.1-11 desktop-file-utils >= 0.2.90 BuildRequires: libtool automake autoconf libattr-devel gettext-devel libdmx-devel @@ -51,7 +52,7 @@ user-switching, so multiple users can be logged in at the same time. %package devel Summary: Development files for gdm -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} pam-devel Provides: gdm-pam-extensions-devel = %{epoch}:%{version}-%{release} Provides: gdm-pam-extensions-devel%{?_isa} = %{epoch}:%{version}-%{release} Obsoletes: gdm-pam-extensions-devel < 1:3.30.1-3 @@ -69,7 +70,7 @@ autoreconf -if %configure --with-pam-prefix=%{_sysconfdir} --with-run-dir=/run/gdm \ --with-default-path=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin \ --enable-split-authentication --enable-profiling --enable-console-helper \ - --with-selinux --with-default-pam-config=arch + --with-selinux sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool sed -i -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool @@ -172,5 +173,8 @@ fi %{_libdir}/pkgconfig/*.pc %changelog +* Tue Dec 17 2019 Jiangping Hu - 1:3.30.1-4 +- Add openEuler PAM config + * Wed Nov 23 2019 Jiangping Hu - 1:3.30.1-3 - Package init