From df20fa92cb84771b6c0a3a0f3fa79af383f80d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Wed, 2 Aug 2017 17:19:39 +0200 Subject: RPM: update build scripts for PCLinuxOS 2017 --- redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2017 | 5 +++++ redhat/main/tdebase/pamd.kdm-trinity-np.pclos2017 | 7 +++++++ redhat/main/tdebase/pamd.kdm-trinity.pclos2017 | 8 ++++++++ redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2017 | 5 +++++ redhat/main/tdelibs/tdelibs-14.0.0.spec | 3 +++ redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec | 4 ---- redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec | 4 ---- 7 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2017 create mode 100644 redhat/main/tdebase/pamd.kdm-trinity-np.pclos2017 create mode 100644 redhat/main/tdebase/pamd.kdm-trinity.pclos2017 create mode 100644 redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2017 (limited to 'redhat/main') diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2017 b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2017 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2017 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2017 b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2017 new file mode 100644 index 000000000..690b4df08 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2017 @@ -0,0 +1,7 @@ +#%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +account include system-auth +password include system-auth +session include system-auth +session optional pam_console.so diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2017 b/redhat/main/tdebase/pamd.kdm-trinity.pclos2017 new file mode 100644 index 000000000..87d080f58 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.pclos2017 @@ -0,0 +1,8 @@ +#%PAM-1.0 +auth include system-auth +auth required pam_nologin.so +account include system-auth +password include system-auth +session include system-auth +session optional pam_console.so +session required pam_namespace.so diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2017 b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2017 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2017 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/main/tdelibs/tdelibs-14.0.0.spec b/redhat/main/tdelibs/tdelibs-14.0.0.spec index 28c17154e..1c7d5e619 100644 --- a/redhat/main/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/main/tdelibs/tdelibs-14.0.0.spec @@ -218,6 +218,9 @@ Requires: avahi %if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %define with_openexr 1 BuildRequires: OpenEXR-devel +%if 0%{?pclinuxos} +BuildRequires: libpthread-stubs +%endif %endif # LIBTOOL diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec index a6fc880f2..26743e5d8 100644 --- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec +++ b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec @@ -173,12 +173,8 @@ BuildRequires: libXxf86vm-devel %if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 %define with_xine 1 %if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -BuildRequires: %{_lib}xine-devel -%else BuildRequires: %{_lib}xine1.2-devel %endif -%endif %if 0%{?fedora} || 0%{?rhel} BuildRequires: xine-lib-devel %endif diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec index de36dda1e..604f73ef1 100644 --- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec +++ b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec @@ -173,12 +173,8 @@ BuildRequires: libXxf86vm-devel %if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 %define with_xine 1 %if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -BuildRequires: %{_lib}xine-devel -%else BuildRequires: %{_lib}xine1.2-devel %endif -%endif %if 0%{?fedora} || 0%{?rhel} BuildRequires: xine-lib-devel %endif -- cgit v1.2.1