diff options
Diffstat (limited to 'redhat/main/tdebase')
13 files changed, 2 insertions, 51 deletions
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2012 b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos index 0a37e6e13..0a37e6e13 100644 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2012 +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2014 b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2014 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2014 +++ /dev/null @@ -1,5 +0,0 @@ -#%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.pclos2012 b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos index 690b4df08..690b4df08 100644 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2012 +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2013 b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2013 deleted file mode 100644 index 690b4df08..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2013 +++ /dev/null @@ -1,7 +0,0 @@ -#%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-np.pclos2014 b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2014 deleted file mode 100644 index 690b4df08..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2014 +++ /dev/null @@ -1,7 +0,0 @@ -#%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.pclos2012 b/redhat/main/tdebase/pamd.kdm-trinity.pclos index 87d080f58..87d080f58 100644 --- a/redhat/main/tdebase/pamd.kdm-trinity.pclos2012 +++ b/redhat/main/tdebase/pamd.kdm-trinity.pclos diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2013 b/redhat/main/tdebase/pamd.kdm-trinity.pclos2013 deleted file mode 100644 index 87d080f58..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity.pclos2013 +++ /dev/null @@ -1,8 +0,0 @@ -#%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.kdm-trinity.pclos2014 b/redhat/main/tdebase/pamd.kdm-trinity.pclos2014 deleted file mode 100644 index 87d080f58..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity.pclos2014 +++ /dev/null @@ -1,8 +0,0 @@ -#%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.kcheckpass-trinity.pclos2013 b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos index 0a37e6e13..0a37e6e13 100644 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2013 +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2012 b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2012 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2012 +++ /dev/null @@ -1,5 +0,0 @@ -#%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.kscreensaver-trinity.pclos2013 b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2013 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2013 +++ /dev/null @@ -1,5 +0,0 @@ -#%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.kscreensaver-trinity.pclos2014 b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2014 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2014 +++ /dev/null @@ -1,5 +0,0 @@ -#%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/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec index a7a8b3579..94a8e9fd5 100644 --- a/redhat/main/tdebase/tdebase-14.0.0.spec +++ b/redhat/main/tdebase/tdebase-14.0.0.spec @@ -3644,10 +3644,11 @@ EOF %endif # Symlinks 'usb.ids' (Use system-provided version, not TDE provided version) +%if 0%{?suse_version} == 1230 || 0%{?suse_version} == 1310 || 0%{?suse_version} == 1320 || 0%{?mgaversion} >= 4 %__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids" -%if 0%{?suse_version} || 0%{?mgaversion} >= 4 %__ln_s -f "/usr/share/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids" %else +%__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids" %__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids" %endif |