diff options
Diffstat (limited to 'redhat/main/tdebase')
78 files changed, 1210 insertions, 633 deletions
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc21 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc21 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc21 @@ -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.kcheckpass-trinity.fc22 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc22 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc22 @@ -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.kcheckpass-trinity.fc23 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc23 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc23 @@ -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.kcheckpass-trinity.fc24 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc24 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc24 @@ -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.kcheckpass-trinity.fc25 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc25 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc25 @@ -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.kcheckpass-trinity.fc26 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc26 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc26 @@ -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.kcheckpass-trinity.fc27 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc27 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc27 @@ -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.kcheckpass-trinity.fc28 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc28 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc28 @@ -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.kcheckpass-trinity.mga5 b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga5 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga5 @@ -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.kcheckpass-trinity.mga6 b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga6 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga6 @@ -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.kcheckpass-trinity.pclos2015 b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2015 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2015 @@ -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.kcheckpass-trinity.pclos2016 b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2016 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2016 @@ -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.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.kcheckpass-trinity.pclos2018 b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2018 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2018 @@ -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.fc21 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc21 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc21 @@ -0,0 +1,16 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc22 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc22 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc22 @@ -0,0 +1,16 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc23 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc23 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc23 @@ -0,0 +1,16 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc24 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc24 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc24 @@ -0,0 +1,16 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc25 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc25 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc25 @@ -0,0 +1,16 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc26 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc26 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc26 @@ -0,0 +1,16 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc27 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc27 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc27 @@ -0,0 +1,16 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc28 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc28 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc28 @@ -0,0 +1,16 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.mga5 b/redhat/main/tdebase/pamd.kdm-trinity-np.mga5 new file mode 100644 index 000000000..f884c1de6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.mga5 @@ -0,0 +1,11 @@ +#%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_loginuid.so +session optional pam_console.so +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.mga6 b/redhat/main/tdebase/pamd.kdm-trinity-np.mga6 new file mode 100644 index 000000000..f884c1de6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.mga6 @@ -0,0 +1,11 @@ +#%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_loginuid.so +session optional pam_console.so +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2015 b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2015 new file mode 100644 index 000000000..690b4df08 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2015 @@ -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-np.pclos2016 b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2016 new file mode 100644 index 000000000..690b4df08 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2016 @@ -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-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-np.pclos2018 b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2018 new file mode 100644 index 000000000..690b4df08 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2018 @@ -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.fc21 b/redhat/main/tdebase/pamd.kdm-trinity.fc21 new file mode 100644 index 000000000..686433fce --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.fc21 @@ -0,0 +1,19 @@ +#%PAM-1.0 +auth [success=done ignore=ignore default=bad] pam_selinux_permit.so +auth required pam_env.so +auth substack system-auth +-auth optional pam_gnome_keyring.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +-session optional pam_gnome_keyring.so auto_start +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc22 b/redhat/main/tdebase/pamd.kdm-trinity.fc22 new file mode 100644 index 000000000..e72140962 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.fc22 @@ -0,0 +1,21 @@ +#%PAM-1.0 +auth [success=done ignore=ignore default=bad] pam_selinux_permit.so +auth required pam_env.so +auth substack system-auth +-auth optional pam_gnome_keyring.so +-auth optional pam_kwallet.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +-session optional pam_gnome_keyring.so auto_start +-session optional pam_kwallet.so +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc23 b/redhat/main/tdebase/pamd.kdm-trinity.fc23 new file mode 100644 index 000000000..e72140962 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.fc23 @@ -0,0 +1,21 @@ +#%PAM-1.0 +auth [success=done ignore=ignore default=bad] pam_selinux_permit.so +auth required pam_env.so +auth substack system-auth +-auth optional pam_gnome_keyring.so +-auth optional pam_kwallet.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +-session optional pam_gnome_keyring.so auto_start +-session optional pam_kwallet.so +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc24 b/redhat/main/tdebase/pamd.kdm-trinity.fc24 new file mode 100644 index 000000000..4e760760f --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.fc24 @@ -0,0 +1,23 @@ +#%PAM-1.0 +auth [success=done ignore=ignore default=bad] pam_selinux_permit.so +auth required pam_env.so +auth substack system-auth +-auth optional pam_gnome_keyring.so +-auth optional pam_kwallet.so +-auth optional pam_kwallet5.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +-session optional pam_gnome_keyring.so auto_start +-session optional pam_kwallet.so +-session optional pam_kwallet5.so +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc25 b/redhat/main/tdebase/pamd.kdm-trinity.fc25 new file mode 100644 index 000000000..4e760760f --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.fc25 @@ -0,0 +1,23 @@ +#%PAM-1.0 +auth [success=done ignore=ignore default=bad] pam_selinux_permit.so +auth required pam_env.so +auth substack system-auth +-auth optional pam_gnome_keyring.so +-auth optional pam_kwallet.so +-auth optional pam_kwallet5.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +-session optional pam_gnome_keyring.so auto_start +-session optional pam_kwallet.so +-session optional pam_kwallet5.so +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc26 b/redhat/main/tdebase/pamd.kdm-trinity.fc26 new file mode 100644 index 000000000..4e760760f --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.fc26 @@ -0,0 +1,23 @@ +#%PAM-1.0 +auth [success=done ignore=ignore default=bad] pam_selinux_permit.so +auth required pam_env.so +auth substack system-auth +-auth optional pam_gnome_keyring.so +-auth optional pam_kwallet.so +-auth optional pam_kwallet5.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +-session optional pam_gnome_keyring.so auto_start +-session optional pam_kwallet.so +-session optional pam_kwallet5.so +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc27 b/redhat/main/tdebase/pamd.kdm-trinity.fc27 new file mode 100644 index 000000000..4e760760f --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.fc27 @@ -0,0 +1,23 @@ +#%PAM-1.0 +auth [success=done ignore=ignore default=bad] pam_selinux_permit.so +auth required pam_env.so +auth substack system-auth +-auth optional pam_gnome_keyring.so +-auth optional pam_kwallet.so +-auth optional pam_kwallet5.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +-session optional pam_gnome_keyring.so auto_start +-session optional pam_kwallet.so +-session optional pam_kwallet5.so +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc28 b/redhat/main/tdebase/pamd.kdm-trinity.fc28 new file mode 100644 index 000000000..4e760760f --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.fc28 @@ -0,0 +1,23 @@ +#%PAM-1.0 +auth [success=done ignore=ignore default=bad] pam_selinux_permit.so +auth required pam_env.so +auth substack system-auth +-auth optional pam_gnome_keyring.so +-auth optional pam_kwallet.so +-auth optional pam_kwallet5.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +-session optional pam_gnome_keyring.so auto_start +-session optional pam_kwallet.so +-session optional pam_kwallet5.so +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity.mga5 b/redhat/main/tdebase/pamd.kdm-trinity.mga5 new file mode 100644 index 000000000..cb0982c9a --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.mga5 @@ -0,0 +1,15 @@ +#%PAM-1.0 +auth required pam_env.so +auth required pam_succeed_if.so +auth sufficient pam_succeed_if.so user ingroup nopasswdlogin +auth substack system-auth +-auth optional pam_kwallet.so +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_loginuid.so +session optional pam_console.so +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +-session optional pam_kwallet.so diff --git a/redhat/main/tdebase/pamd.kdm-trinity.mga6 b/redhat/main/tdebase/pamd.kdm-trinity.mga6 new file mode 100644 index 000000000..cb0982c9a --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.mga6 @@ -0,0 +1,15 @@ +#%PAM-1.0 +auth required pam_env.so +auth required pam_succeed_if.so +auth sufficient pam_succeed_if.so user ingroup nopasswdlogin +auth substack system-auth +-auth optional pam_kwallet.so +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_loginuid.so +session optional pam_console.so +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +-session optional pam_kwallet.so diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2015 b/redhat/main/tdebase/pamd.kdm-trinity.pclos2015 new file mode 100644 index 000000000..87d080f58 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.pclos2015 @@ -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.kdm-trinity.pclos2016 b/redhat/main/tdebase/pamd.kdm-trinity.pclos2016 new file mode 100644 index 000000000..87d080f58 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.pclos2016 @@ -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.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.kdm-trinity.pclos2018 b/redhat/main/tdebase/pamd.kdm-trinity.pclos2018 new file mode 100644 index 000000000..87d080f58 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.pclos2018 @@ -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.fc21 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc21 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc21 @@ -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.kscreensaver-trinity.fc22 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc22 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc22 @@ -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.kscreensaver-trinity.fc23 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc23 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc23 @@ -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.kscreensaver-trinity.fc24 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc24 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc24 @@ -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.kscreensaver-trinity.fc25 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc25 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc25 @@ -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.kscreensaver-trinity.fc26 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc26 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc26 @@ -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.kscreensaver-trinity.fc27 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc27 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc27 @@ -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.kscreensaver-trinity.fc28 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc28 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc28 @@ -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.kscreensaver-trinity.mga5 b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga5 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga5 @@ -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.kscreensaver-trinity.mga6 b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga6 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga6 @@ -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.kscreensaver-trinity.pclos2015 b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2015 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2015 @@ -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.kscreensaver-trinity.pclos2016 b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2016 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2016 @@ -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.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/tdebase/pamd.kscreensaver-trinity.pclos2018 b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2018 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2018 @@ -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/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec index 0844117f2..f87ab705a 100644 --- a/redhat/main/tdebase/tdebase-14.0.0.spec +++ b/redhat/main/tdebase/tdebase-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tdebase (version R14.0.0) +# spec file for package tdebase (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,15 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tdebase %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include @@ -34,15 +37,10 @@ %define tdm_datadir %{tde_datadir}/apps/%{tdm} %define starttde starttde -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Trinity Base Programs Group: System/GUI/Other URL: http://www.trinitydesktop.org/ @@ -60,7 +58,7 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz -Source1: trinity-tdebase-rpmlintrc +Source1: %{name}-rpmlintrc # Pam configuration files for RHEL / Fedora %if 0%{?suse_version} == 0 @@ -71,7 +69,9 @@ Source5: pamd.kscreensaver-trinity%{?dist} %endif # openSUSE: configuration file for TDM +%if 0%{?suse_version} >= 1210 Source6: suse-displaymanagers-tdm +%endif # Fedora 18: use SYSTEMD for TDM startup %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 @@ -80,7 +80,7 @@ Source7: tdm.service%{?dist} # openSUSE 11.4: overwrite distribution-provided '/etc/init.d/xdm' !!! %if 0%{?suse_version} == 1140 -Source7: xdm.oss114 +Source7: xdm%{?dist} %endif # Fedora >= 17: special selinux policy required for TDM @@ -170,6 +170,70 @@ Requires: fedora-logos %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png %endif +# Fedora 21 Theme +%if 0%{?fedora} == 21 +Requires: f21-backgrounds-base +%define tde_bg /usr/share/backgrounds/f21/default/standard/f21.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + +# Fedora 22 Theme +%if 0%{?fedora} == 22 +Requires: f22-backgrounds-base +%define tde_bg /usr/share/backgrounds/f22/default/standard/f22.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + +# Fedora 23 Theme +%if 0%{?fedora} == 23 +Requires: f23-backgrounds-base +%define tde_bg /usr/share/backgrounds/f23/default/standard/f23.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + +# Fedora 24 Theme +%if 0%{?fedora} == 24 +Requires: f24-backgrounds-base +%define tde_bg /usr/share/backgrounds/f24/default/standard/f24.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + +# Fedora 25 Theme +%if 0%{?fedora} == 25 +Requires: f25-backgrounds-base +%define tde_bg /usr/share/backgrounds/f25/default/standard/f25.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + +# Fedora 26 Theme +%if 0%{?fedora} == 26 +Requires: f26-backgrounds-base +%define tde_bg /usr/share/backgrounds/f26/default/standard/f26.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + +# Fedora 27 Theme +%if 0%{?fedora} == 27 +Requires: f27-backgrounds-base +%define tde_bg /usr/share/backgrounds/f27/default/standard/f27.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + +# Fedora 28 Theme +%if 0%{?fedora} == 28 +Requires: f28-backgrounds-base +%define tde_bg /usr/share/backgrounds/f27/default/standard/f28.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + # RHEL 4 Theme %if 0%{?rhel} == 4 Requires: desktop-backgrounds-basic @@ -220,6 +284,20 @@ Requires: mageia-theme-Default %define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg %endif +# Mageia 5 Theme +%if 0%{?mgaversion} == 5 +Requires: mageia-theme-Default +%define tde_bg /usr/share/mga/backgrounds/default.jpg +%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg +%endif + +# Mageia 6 Theme +%if 0%{?mgaversion} == 6 +Requires: mageia-theme-Default +%define tde_bg /usr/share/mga/backgrounds/default.jpg +%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg +%endif + # Mandriva 2011 Theme: "rosa" %if "%{distribution}" == "Mandriva Linux" && "%{?mdkversion}" == "201100" Requires: mandriva-theme @@ -235,7 +313,7 @@ Requires: desktop-common-data # OpenSuse 11.4 Theme %if "%{?suse_version}" == "1140" -Requires: hicolor-icon-theme-branding = 11.4 +Requires: hicolor-icon-theme-branding %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg %endif @@ -243,7 +321,7 @@ Requires: hicolor-icon-theme-branding = 11.4 %if "%{?suse_version}" == "1220" Requires: wallpaper-branding = 12.2 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -Requires: hicolor-icon-theme-branding = 12.2 +Requires: hicolor-icon-theme-branding %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg %endif @@ -251,7 +329,7 @@ Requires: hicolor-icon-theme-branding = 12.2 %if "%{?suse_version}" == "1230" Requires: wallpaper-branding = 12.3 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -Requires: hicolor-icon-theme-branding = 12.3 +Requires: hicolor-icon-theme-branding %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg %endif @@ -259,7 +337,7 @@ Requires: hicolor-icon-theme-branding = 12.3 %if "%{?suse_version}" == "1310" Requires: wallpaper-branding = 13.1 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -Requires: hicolor-icon-theme-branding = 13.1 +Requires: hicolor-icon-theme-branding %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg %endif @@ -267,7 +345,39 @@ Requires: hicolor-icon-theme-branding = 13.1 %if "%{?suse_version}" == "1320" Requires: wallpaper-branding = 13.2 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -Requires: hicolor-icon-theme-branding = 13.2 +Requires: hicolor-icon-theme-branding +%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg +%endif + +# OpenSuse 42.1 Theme +%if "%{?sle_version}" == "120100" +Requires: wallpaper-branding = 42.1 +%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg +Requires: hicolor-icon-theme-branding +%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg +%endif + +# OpenSuse 42.2 Theme +%if "%{?sle_version}" == "120200" +Requires: wallpaper-branding +%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg +Requires: hicolor-icon-theme-branding +%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg +%endif + +# OpenSuse 42.3 Theme +%if "%{?sle_version}" == "120300" +Requires: wallpaper-branding +%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg +Requires: hicolor-icon-theme-branding +%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg +%endif + +# OpenSuse 15.0 Theme +%if "%{?suse_version}" == "1500" +Requires: wallpaper-branding +%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg +Requires: hicolor-icon-theme-branding %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg %endif @@ -311,9 +421,11 @@ BuildRequires: %{_lib}sasl2-devel BuildRequires: cyrus-sasl-devel %endif -# LIBUSB support +# PAM support BuildRequires: pam-devel -%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos} + +# LIBUSB support +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: %{_lib}usb1.0-devel BuildRequires: %{_lib}usb-compat0.1-devel %else @@ -337,10 +449,14 @@ BuildRequires: gamin-devel %endif # OPENLDAP support +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: openldap-devel +%endif %if 0%{?suse_version} BuildRequires: openldap2-devel -%else -BuildRequires: openldap-devel +%endif +%if 0%{?rhel} == 5 +BuildRequires: openldap24-libs-devel %endif # SENSORS support @@ -354,11 +470,17 @@ BuildRequires: libsensors4-devel # TSAK support (requires libudev-devel) # On RHEL5, udev is built statically, so TSAK cannot build. %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} +%if 0%{?suse_version} >= 1310 +BuildRequires: udev +%endif BuildRequires: libudev-devel %define with_tsak 1 %define with_tdehwlib 1 %endif +# ACL support +BuildRequires: libacl-devel + # XRANDR support # On RHEL5, xrandr library is too old. %if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} @@ -386,17 +508,42 @@ BuildRequires: OpenEXR-devel %endif # XSCREENSAVER support -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?with_xscreensaver} +# RHEL 4: disabled +# RHEL 5: available in centos-extras +# RHEL 6: available in EPEL +# RHEL 7: available in NUX +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} %define with_xscreensaver 1 -%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} + +%if 0%{?fedora} || 0%{?rhel} >= 5 +BuildRequires: libXScrnSaver-devel +BuildRequires: xscreensaver +BuildRequires: xscreensaver-base +BuildRequires: xscreensaver-extras +%if 0%{?fedora} +BuildRequires: xscreensaver-extras-base +%endif +BuildRequires: xscreensaver-gl-base +BuildRequires: xscreensaver-gl-extras +%endif + +%if 0%{?suse_version} BuildRequires: libXScrnSaver-devel +BuildRequires: xscreensaver +BuildRequires: xscreensaver-data +BuildRequires: xscreensaver-data-extra %endif + %if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} >= 4 BuildRequires: %{_lib}xscrnsaver-devel %else BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel %endif +BuildRequires: xscreensaver +BuildRequires: xscreensaver-base +BuildRequires: xscreensaver-extrusion +BuildRequires: xscreensaver-gl %endif %endif @@ -533,7 +680,37 @@ BuildRequires: drakconf # LIBCONFIG support # Needed for "compton" stuff +%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} +%define with_libconfig 1 BuildRequires: libconfig-devel +%endif + +# KBDLEDSYNC support +%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} +%define with_kbdledsync 1 +%endif + +# TDERANDR support +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +%define with_tderandrtray 1 +%endif + +# ELFICON support +%if 0 +%define with_elficon 1 +BuildRequires: libr-devel >= 0.6.0 +%endif + +# RPC support +%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1550 +BuildRequires: libtirpc-devel +BuildRequires: rpcgen +%if 0%{?fedora} +BuildRequires: libnsl2-devel +%else +BuildRequires: libnsl-devel +%endif +%endif # tdebase is a metapackage that installs all sub-packages Requires: %{name}-runtime-data-common = %{version}-%{release} @@ -692,7 +869,6 @@ Such as the desktop right-click-"Create New" list %files runtime-data-common %defattr(-,root,root,-) -%{tde_datadir}/autostart/khotkeys.desktop %{tde_datadir}/desktop-directories/ %{tde_datadir}/icons/hicolor/*/apps/kxkb.png %{tde_datadir}/icons/hicolor/*/apps/knetattach.* @@ -706,18 +882,6 @@ Such as the desktop right-click-"Create New" list %{tde_datadir}/sounds/pop.wav %{tde_datadir}/templates/ -%post runtime-data-common -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - -%postun runtime-data-common -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - ########## %package -n trinity-kappfinder @@ -737,20 +901,6 @@ creates menu entries for them. %{tde_datadir}/apps/kappfinder %{tde_datadir}/icons/hicolor/*/apps/kappfinder.png -%post -n trinity-kappfinder -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database %{tde_appdir} 2> /dev/null || : - -%postun -n trinity-kappfinder -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database %{tde_appdir} 2> /dev/null || : - ########## %package -n trinity-libkateinterfaces @@ -758,18 +908,12 @@ Summary: Common libraries used by kwrite and kate Group: System/GUI/Other %description -n trinity-libkateinterfaces -%{summary}. +This package contains the kateinterface library. %files -n trinity-libkateinterfaces %defattr(-,root,root,-) %{tde_libdir}/libkateinterfaces.so.* -%post -n trinity-libkateinterfaces -/sbin/ldconfig || : - -%postun -n trinity-libkateinterfaces -/sbin/ldconfig || : - ########## %package -n trinity-kate @@ -815,22 +959,6 @@ Some random features: %{tde_datadir}/servicetypes/kateplugin.desktop %{tde_tdedocdir}/HTML/en/kate/ -%post -n trinity-kate -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database %{tde_appdir} 2> /dev/null || : -/sbin/ldconfig || : - -%postun -n trinity-kate -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database %{tde_appdir} 2> /dev/null || : -/sbin/ldconfig || : - ########## %package -n trinity-kate-devel @@ -849,12 +977,6 @@ This package contains the development files fare Kate. %{tde_libdir}/libkateinterfaces.so %{tde_libdir}/libkateinterfaces.la -%post -n trinity-kate-devel -/sbin/ldconfig || : - -%postun -n trinity-kate-devel -/sbin/ldconfig || : - ########## %package -n trinity-kwrite @@ -880,20 +1002,6 @@ Kwrite is an advanced text editor for TDE. %{tde_tdedocdir}/HTML/en/kwrite/ -%post -n trinity-kwrite -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database %{tde_appdir} 2> /dev/null || : - -%postun -n trinity-kwrite -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database %{tde_appdir} 2> /dev/null || : - ########## %package -n trinity-kcontrol @@ -902,9 +1010,11 @@ Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} # Requires 'usb.ids' -Requires: usbutils +Requires: usbutils +BuildRequires: usbutils %if 0%{?suse_version} == 0 -Requires: hwdata +BuildRequires: hwdata +Requires: hwdata %endif %description -n trinity-kcontrol @@ -961,8 +1071,10 @@ plugdev group. %{tde_tdelibdir}/kcm_fontinst.so %{tde_tdelibdir}/kcm_fonts.la %{tde_tdelibdir}/kcm_fonts.so +%if 0%{?with_tdehwlib} %{tde_tdelibdir}/kcm_hwmanager.la %{tde_tdelibdir}/kcm_hwmanager.so +%endif %{tde_tdelibdir}/kcm_icons.la %{tde_tdelibdir}/kcm_icons.so %{tde_tdelibdir}/kcm_info.la @@ -1062,7 +1174,9 @@ plugdev group. %{tde_tdeappdir}/filebrowser.desktop %{tde_tdeappdir}/filetypes.desktop %{tde_tdeappdir}/fonts.desktop +%if 0%{?with_tdehwlib} %{tde_tdeappdir}/hwmanager.desktop +%endif %{tde_tdeappdir}/icons.desktop %{tde_tdeappdir}/installktheme.desktop %{tde_tdeappdir}/interrupts.desktop @@ -1168,8 +1282,15 @@ plugdev group. %{tde_datadir}/icons/hicolor/*/apps/kcmspellchecking.png %{tde_tdedocdir}/HTML/en/tdefontview/ +# tdehwtray +%if "%{?tde_version}" == "14.1.0" +%{tde_bindir}/tdehwdevicetray +%{tde_tdeappdir}/tdehwdevicetray.desktop +%{tde_datadir}/autostart/tdehwdevicetray-autostart.desktop +%endif + # The following features are not compiled under RHEL 5 and older -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +%if 0%{?with_tderandrtray} %{tde_bindir}/tderandrtray %{tde_tdelibdir}/kcm_displayconfig.la %{tde_tdelibdir}/kcm_displayconfig.so @@ -1185,14 +1306,6 @@ plugdev group. %{tde_tdedocdir}/HTML/en/tderandrtray/ %endif -%post -n trinity-kcontrol -/sbin/ldconfig || : -update-desktop-database %{tde_appdir} 2> /dev/null || : - -%postun -n trinity-kcontrol -/sbin/ldconfig || : -update-desktop-database %{tde_appdir} 2> /dev/null || : - ########## %package -n trinity-kcontrol-devel @@ -1208,12 +1321,6 @@ Requires: trinity-kcontrol = %{version}-%{release} %{tde_libdir}/libtdefontinst.la %{tde_libdir}/libtdefontinst.so -%post -n trinity-kcontrol-devel -/sbin/ldconfig || : - -%postun -n trinity-kcontrol-devel -/sbin/ldconfig || : - ########## %package bin @@ -1221,6 +1328,11 @@ Summary: Core binaries for the TDE base module Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} Requires: pam +%if 0%{?rhel} >= 7 +Requires: xorg-x11-server-Xorg +Requires: xorg-x11-drv-evdev +Requires: dejavu-sans-fonts +%endif Provides: tdebase-bin = %{version}-%{release} Obsoletes: tdebase-bin < %{version}-%{release} @@ -1235,7 +1347,9 @@ TDE applications, particularly those in the TDE base module. %if 0%{?with_tsak} %{tde_bindir}/tsak %endif +%if 0%{?with_libconfig} %{tde_bindir}/compton-tde +%endif %{tde_bindir}/tdedebugdialog %{tde_bindir}/kreadconfig %{tde_bindir}/kwriteconfig @@ -1289,6 +1403,9 @@ TDE applications, particularly those in the TDE base module. %{tde_libdir}/libtdeinit_kxkb.la %{tde_libdir}/libtdeinit_kxkb.so %{tde_libdir}/libkhotkeys_shared.so.* +%if "%{?tde_version}" == "14.1.0" +%{tde_tdeappdir}/kdcop.desktop +%endif %{tde_tdeappdir}/keyboard.desktop %{tde_tdeappdir}/keyboard_layout.desktop %{tde_tdeappdir}/khotkeys.desktop @@ -1300,7 +1417,6 @@ TDE applications, particularly those in the TDE base module. %{tde_datadir}/apps/tdeconf_update/konqueror_gestures_trinity21_update.upd %{tde_datadir}/apps/kdcop/ %{tde_datadir}/apps/khotkeys/ -%{tde_datadir}/services/kded/khotkeys.desktop %{tde_datadir}/services/kxkb.desktop %if 0%{?suse_version} == 0 %config(noreplace) %{_sysconfdir}/pam.d/kcheckpass-trinity @@ -1315,21 +1431,17 @@ TDE applications, particularly those in the TDE base module. # SETUID binaries # Some setuid binaries need special care %if 0%{?suse_version} -%if 0%{?with_tsak} -%verify(not mode) %{tde_bindir}/%{tdm}tsak -%endif +%{?with_tsak:%verify(not mode) %{tde_bindir}/%{tdm}tsak} %verify(not mode) %{tde_bindir}/kcheckpass -%verify(not mode) %{tde_bindir}/tdekbdledsync +%{?with_kbdledsync:%verify(not mode) %{tde_bindir}/tdekbdledsync} %else -%if 0%{?with_tsak} -%attr(4511,root,root) %{tde_bindir}/%{tdm}tsak -%endif +%{?with_tsak:%attr(4511,root,root) %{tde_bindir}/%{tdm}tsak} %attr(4755,root,root) %{tde_bindir}/kcheckpass -%attr(4755,root,root) %{tde_bindir}/tdekbdledsync +%{?with_kbdledsync:%attr(4755,root,root) %{tde_bindir}/tdekbdledsync} %endif # SUSE's runupdater utility -%if 0%{?opensuse_bs} == 0 && 0%{?suse_version} +%if 0 %{tde_bindir}/runupdater %{tde_libdir}/libtdeinit_runupdater.la %{tde_libdir}/libtdeinit_runupdater.so @@ -1339,21 +1451,13 @@ TDE applications, particularly those in the TDE base module. %endif %post bin -/sbin/ldconfig || : -update-desktop-database %{tde_appdir} 2> /dev/null || : # Sets permissions on setuid files (openSUSE specific) %if 0%{?suse_version} -%if 0%{?with_tsak} -%set_permissions %{tde_bindir}/%{tdm}tsak -%endif +%{?with_tsak:%set_permissions %{tde_bindir}/%{tdm}tsak} %set_permissions %{tde_bindir}/kcheckpass -%set_permissions %{tde_bindir}/tdekbdledsync +%{?with_kbdledsync:%set_permissions %{tde_bindir}/tdekbdledsync} %endif -%postun bin -/sbin/ldconfig || : -update-desktop-database %{tde_appdir} 2> /dev/null || : - ########## %package bin-devel @@ -1366,19 +1470,14 @@ Obsoletes: tdebase-bin-devel < %{version}-%{release} Provides: tdebase-bin-devel = %{version}-%{release} %description bin-devel -%{summary}. +This package contains the development files for core binaries for +the TDE base module %files bin-devel %defattr(-,root,root,-) %{tde_libdir}/libkhotkeys_shared.la %{tde_libdir}/libkhotkeys_shared.so -%post bin-devel -/sbin/ldconfig || : - -%postun bin-devel -/sbin/ldconfig || : - ########## %package data @@ -1651,6 +1750,7 @@ needed for a basic TDE desktop installation. %{tde_datadir}/wallpapers/* # XDG directories information +%dir %{_sysconfdir}/xdg/menus/applications-merged %config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/tde-essential.menu %config(noreplace) %{_sysconfdir}/xdg/menus/tde-information.menu %config(noreplace) %{_sysconfdir}/xdg/menus/tde-screensavers.menu @@ -1660,11 +1760,6 @@ needed for a basic TDE desktop installation. %exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/ %post data -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - %if "%{distribution}" == "Mandriva Linux" # Mandriva-specific: we have to choose a background for current distribution variant (Free, One, Powerpack, ...) # First, we read the "product" key in /etc/product.id @@ -1681,12 +1776,6 @@ if [ ! -r "%{tde_bg}" ] && [ -r "%{_datadir}/mga/backgrounds/Mageia-Default-1920 fi %endif -%postun data -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - ########## %package tdeio-plugins @@ -1796,6 +1885,7 @@ group. %{tde_datadir}/apps/tdeio_info/ %{tde_datadir}/apps/tdeio_man/ %{tde_datadir}/apps/systemview/ +%{tde_datadir}/autostart/mediabackend.desktop %{tde_datadir}/config.kcfg/mediamanagersettings.kcfg %{tde_datadir}/mimelnk/application/x-smb-server.desktop %{tde_datadir}/mimelnk/inode/system_directory.desktop @@ -1844,21 +1934,23 @@ group. %{tde_datadir}/servicetypes/thumbcreator.desktop %{tde_datadir}/services/tdefile_trash.desktop %{tde_tdedocdir}/HTML/en/tdeioslave/ + %if 0%{?with_exr} %{tde_tdelibdir}/exrthumbnail.la %{tde_tdelibdir}/exrthumbnail.so %{tde_datadir}/services/exrthumbnail.desktop %endif + # HWManager %{tde_tdelibdir}/media_propsdlgplugin.la %{tde_tdelibdir}/media_propsdlgplugin.so %{tde_datadir}/services/media_propsdlgplugin.desktop -%post tdeio-plugins -update-desktop-database %{tde_appdir} 2> /dev/null || : - -%postun tdeio-plugins -update-desktop-database %{tde_appdir} 2> /dev/null || : +%if "%{tde_version}" == "14.1.0" +%{tde_tdelibdir}/ktrashpropsdlgplugin.la +%{tde_tdelibdir}/ktrashpropsdlgplugin.so +%{tde_datadir}/services/ktrashpropsdlgplugin.desktop +%endif ########## @@ -1912,12 +2004,6 @@ system passwords. %{_datadir}/faces/Teddybear.png %{_datadir}/faces/Turtle.png -%post -n trinity-tdepasswd -update-desktop-database %{tde_tdeappdir} 2> /dev/null || : - -%postun -n trinity-tdepasswd -update-desktop-database %{tde_tdeappdir} 2> /dev/null || : - ########## %package -n trinity-tdeprint @@ -1979,22 +2065,6 @@ Installation of smbclient will make you able to use smb shared printers. %{tde_tdedocdir}/HTML/en/tdeprintfax/ %{tde_tdedocdir}/HTML/en/kjobviewer/ -%post -n trinity-tdeprint -/sbin/ldconfig || : -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - -%postun -n trinity-tdeprint -/sbin/ldconfig || : -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - ########## %package -n trinity-kdesktop @@ -2034,20 +2104,6 @@ the TDE desktop. %{tde_datadir}/config.kcfg/kwebdesktop.kcfg %{tde_datadir}/icons/crystalsvg/*/apps/error.png -%post -n trinity-kdesktop -/sbin/ldconfig || : -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - -%postun -n trinity-kdesktop -/sbin/ldconfig || : -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - ########## %package -n trinity-kdesktop-devel @@ -2056,7 +2112,7 @@ Group: Development/Libraries/Other Requires: trinity-kdesktop = %{version}-%{release} %description -n trinity-kdesktop-devel -%{summary}. +This package contains the development files for kdesktop. %files -n trinity-kdesktop-devel %defattr(-,root,root,-) @@ -2132,18 +2188,17 @@ already. Most users won't need this. %dir %{tdm_datadir}/sessions %{tdm_datadir}/sessions/*.desktop %{tdm_datadir}/themes/ -%{tde_datadir}/config/%{tdm} -%dir %{_sysconfdir}/trinity/%{tdm} -%if 0%{?with_selinux_policy} -%exclude %{?_sysconfdir}/trinity/%{tdm}/tdm.pp -%endif -%config(noreplace) %{_sysconfdir}/trinity/%{tdm}/* +%{tde_confdir}/%{tdm} %{tde_tdedocdir}/HTML/en/%{tdm}/ %if 0%{?suse_version} == 0 %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity-np %endif +%if "%{?tde_version}" == "14.1.0" +%{tde_bindir}/tdecryptocardwatcher +%endif + # XDG user faces %dir %{_datadir}/faces %{_datadir}/faces/default1.png @@ -2162,7 +2217,7 @@ already. Most users won't need this. %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 /usr/lib/systemd/system/tdm.service %endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6 %{_datadir}/xsessions/tde.desktop %endif @@ -2208,10 +2263,19 @@ fi %if 0%{?mgaversion} || 0%{?mdkversion} %make_session %endif + +# SELINUX context for tdm %if 0%{?with_selinux_policy} /usr/sbin/semodule -i "%{?_sysconfdir}/trinity/%{tdm}/tdm.pp" %endif +%if 0%{?fedora} == 21 || 0%{?rhel} >= 7 +if ! grep -q "%{tde_bindir}/tdm" "/etc/selinux/targeted/contexts/files/file_contexts.local" ; then + echo "%{tde_bindir}/tdm -- system_u:object_r:xdm_exec_t" >>"/etc/selinux/targeted/contexts/files/file_contexts.local" + restorecon "%{tde_bindir}/tdm" +fi +%endif + # Sets default user icon in TDM if [ ! -r "%{tdm_datadir}/faces/.default.face.icon" ]; then [ -d "%{tdm_datadir}/faces" ] || mkdir -p "%{tdm_datadir}/faces" @@ -2230,6 +2294,10 @@ if [ -r "%{_sysconfdir}/init.d/xdm.tde" ]; then cat "%{_sysconfdir}/init.d/xdm.tde" >"%{_sysconfdir}/init.d/xdm" fi +# openSUSE 15.0 alternatives +%if 0%{?suse_version} >= 1500 +update-alternatives --install /usr/lib/X11/displaymanagers/default-displaymanager default-displaymanager /usr/lib/X11/displaymanagers/tdm 30 || : +%endif %posttrans -n trinity-tdm # Make sure that TDM configuration files are now under '/etc/trinity/tdm' @@ -2243,6 +2311,11 @@ fi %make_session %endif +# openSUSE 15.0 alternatives +%if 0%{?suse_version} >= 1500 +update-alternatives --remove default-displaymanager /usr/lib/X11/displaymanagers/tdm || : +%endif + ########## %package -n trinity-tdm-devel @@ -2252,7 +2325,7 @@ Requires: trinity-tdm = %{version}-%{release} %{?xtst_devel:Requires: %{xtst_devel}} %description -n trinity-tdm-devel -%{summary}. +This package contains the development files for TDM. %files -n trinity-tdm-devel %defattr(-,root,root,-) @@ -2281,20 +2354,6 @@ workstations. %{tde_datadir}/servicetypes/findpart.desktop %{tde_tdedocdir}/HTML/en/kfind/ -%post -n trinity-kfind -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - -%postun -n trinity-kfind -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - ########## %package -n trinity-khelpcenter @@ -2328,22 +2387,6 @@ documentation. %{tde_datadir}/services/khelpcenter.desktop %{tde_tdedocdir}/HTML/en/khelpcenter/ -%post -n trinity-khelpcenter -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - -%postun -n trinity-khelpcenter -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - ########## %package -n trinity-kicker @@ -2461,22 +2504,6 @@ functionality. %{tde_datadir}/oxygen/scalable/mgabutton.svg %endif -%post -n trinity-kicker -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - -%postun -n trinity-kicker -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - ########## %package -n trinity-kicker-devel @@ -2486,7 +2513,7 @@ Requires: trinity-kicker = %{version}-%{release} %{?xtst_devel:Requires: %{xtst_devel}} %description -n trinity-kicker-devel -%{summary}. +This package contains the development files for kicker. %files -n trinity-kicker-devel %defattr(-,root,root,-) @@ -2503,12 +2530,6 @@ Requires: trinity-kicker = %{version}-%{release} %{tde_libdir}/libtaskmanager.la %{tde_libdir}/libtaskmanager.so -%post -n trinity-kicker-devel -/sbin/ldconfig || : - -%postun -n trinity-kicker-devel -/sbin/ldconfig || : - ########## %package -n trinity-klipper @@ -2542,22 +2563,6 @@ web browser if the clipboard contains a URL. %{tde_datadir}/icons/hicolor/*/apps/klipper.* %{tde_tdedocdir}/HTML/en/klipper/ -%post -n trinity-klipper -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - -%postun -n trinity-klipper -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - ########## %package -n trinity-kmenuedit @@ -2587,14 +2592,6 @@ structure. %{tde_datadir}/apps/kmenuedit/ %{tde_tdedocdir}/HTML/en/kmenuedit/ -%post -n trinity-kmenuedit -update-desktop-database %{tde_appdir} 2> /dev/null || : -/sbin/ldconfig || : - -%postun -n trinity-kmenuedit -update-desktop-database %{tde_appdir} 2> /dev/null || : -/sbin/ldconfig || : - ########## %package -n trinity-konqueror @@ -2729,12 +2726,6 @@ ever launching another application. %{tde_tdedocdir}/HTML/en/keditbookmarks/ %post -n trinity-konqueror -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : if [ $1 -eq 1 ]; then update-alternatives --install \ %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop \ @@ -2743,14 +2734,6 @@ if [ $1 -eq 1 ]; then 10 || : fi -%postun -n trinity-konqueror -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - %preun -n trinity-konqueror if [ $1 -eq 0 ]; then update-alternatives --remove \ @@ -2766,7 +2749,7 @@ Group: Development/Libraries/Other Requires: trinity-konqueror = %{version}-%{release} %description -n trinity-konqueror-devel -%{summary}. +This package contains the development files for konqueror. %files -n trinity-konqueror-devel %defattr(-,root,root,-) @@ -2775,12 +2758,6 @@ Requires: trinity-konqueror = %{version}-%{release} %{tde_libdir}/libkonqsidebarplugin.la %{tde_libdir}/libkonqsidebarplugin.so -%post -n trinity-konqueror-devel -/sbin/ldconfig || : - -%postun -n trinity-konqueror-devel -/sbin/ldconfig || : - ########## %package -n trinity-konqueror-nsplugins @@ -2802,12 +2779,6 @@ This package includes support for Netscape plugins in Konqueror. %{tde_tdeappdir}/tdehtml_plugins.desktop %{tde_datadir}/apps/plugin/nspluginpart.rc -%post -n trinity-konqueror-nsplugins -update-desktop-database %{tde_appdir} 2> /dev/null || : - -%postun -n trinity-konqueror-nsplugins -update-desktop-database %{tde_appdir} 2> /dev/null || : - ########## %package -n trinity-konsole @@ -2861,22 +2832,6 @@ Using Konsole, a user can open: %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/ %config %{_sysconfdir}/fonts/conf.d/99-konsole.conf -%post -n trinity-konsole -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - -%postun -n trinity-konsole -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - ########## %package -n trinity-kpager @@ -2897,20 +2852,6 @@ applications. It is used to switch between applications or desktops. %{tde_datadir}/icons/hicolor/*/apps/kpager.png %{tde_tdedocdir}/HTML/en/kpager/ -%post -n trinity-kpager -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - -%postun -n trinity-kpager -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - ########## %package -n trinity-kpersonalizer @@ -2932,20 +2873,6 @@ automatically started. KPersonalizer can also be called later. %{tde_datadir}/apps/kpersonalizer/ %{tde_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png -%post -n trinity-kpersonalizer -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - -%postun -n trinity-kpersonalizer -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - ########## %package -n trinity-ksmserver @@ -2982,17 +2909,25 @@ TDE will start, but many good defaults will not be set. %{tde_datadir}/apps/ksmserver/ %post -n trinity-ksmserver -/sbin/ldconfig || : %if 0%{?mdkversion} || 0%{?mgaversion} fndSession %endif +# openSUSE 15.0 alternatives +%if 0%{?suse_version} >= 1500 +update-alternatives --install /usr/share/xsessions/default.desktop default-xsession.desktop /usr/share/xsessions/tde.desktop 30 || : +%endif + %postun -n trinity-ksmserver -/sbin/ldconfig || : %if 0%{?mdkversion} || 0%{?mgaversion} fndSession %endif +# openSUSE 15.0 alternatives +%if 0%{?suse_version} >= 1500 +update-alternatives --remove default-xsession.desktop /usr/share/xsessions/tde.desktop || : +%endif + ########## %package -n trinity-ksplash @@ -3029,14 +2964,6 @@ a TDE session is launched. %{tde_datadir}/servicetypes/ksplashplugins.desktop %{tde_tdedocdir}/HTML/en/ksplashml/ -%post -n trinity-ksplash -update-desktop-database %{tde_appdir} 2> /dev/null || : -/sbin/ldconfig || : - -%postun -n trinity-ksplash -update-desktop-database %{tde_appdir} 2> /dev/null || : -/sbin/ldconfig || : - ########## %package -n trinity-ksplash-devel @@ -3045,7 +2972,7 @@ Group: Development/Libraries/Other Requires: trinity-ksplash = %{version}-%{release} %description -n trinity-ksplash-devel -%{summary}. +This package contains the development files for ksplash. %files -n trinity-ksplash-devel %defattr(-,root,root,-) @@ -3053,12 +2980,6 @@ Requires: trinity-ksplash = %{version}-%{release} %{tde_libdir}/libksplashthemes.la %{tde_libdir}/libksplashthemes.so -%post -n trinity-ksplash-devel -/sbin/ldconfig || : - -%postun -n trinity-ksplash-devel -/sbin/ldconfig || : - ########## %package -n trinity-ksysguard @@ -3085,22 +3006,6 @@ computer. %{tde_datadir}/mimelnk/application/x-ksysguard.desktop %{tde_tdedocdir}/HTML/en/ksysguard/ -%post -n trinity-ksysguard -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - -%postun -n trinity-ksysguard -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - ########## %package -n trinity-ksysguard-devel @@ -3109,7 +3014,7 @@ Group: Development/Libraries/Other Requires: trinity-ksysguard = %{version}-%{release} %description -n trinity-ksysguard-devel -%{summary}. +This package contains the development files for ksysguard. %files -n trinity-ksysguard-devel %defattr(-,root,root,-) @@ -3117,12 +3022,6 @@ Requires: trinity-ksysguard = %{version}-%{release} %{tde_libdir}/libksgrd.la %{tde_libdir}/libksgrd.so -%post -n trinity-ksysguard-devel -/sbin/ldconfig || : - -%postun -n trinity-ksysguard-devel -/sbin/ldconfig || : - ########## %package -n trinity-ksysguardd @@ -3159,20 +3058,6 @@ ktip provides many useful tips on using TDE when you log in. %{tde_datadir}/autostart/ktip.desktop %{tde_datadir}/icons/hicolor/*/apps/ktip.* -%post -n trinity-ktip -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - -%postun -n trinity-ktip -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - ########## %package -n trinity-twin @@ -3185,7 +3070,6 @@ This package contains the default X window manager for TDE. %files -n trinity-twin %defattr(-,root,root,-) -%{tde_bindir}/kompmgr %{tde_bindir}/twin %{tde_bindir}/twin_killer_helper %{tde_bindir}/twin_resumer_helper @@ -3227,22 +3111,6 @@ This package contains the default X window manager for TDE. %{tde_datadir}/icons/crystalsvg/*/apps/twin.png %{tde_tdedocdir}/HTML/en/kompmgr/ -%post -n trinity-twin -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - -%postun -n trinity-twin -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - ########## %package -n trinity-twin-devel @@ -3251,7 +3119,7 @@ Group: Development/Libraries/Other Requires: trinity-twin = %{version}-%{release} %description -n trinity-twin-devel -%{summary}. +This package contains the development files for twin. %files -n trinity-twin-devel %defattr(-,root,root,-) @@ -3265,12 +3133,6 @@ Requires: trinity-twin = %{version}-%{release} %{tde_libdir}/libtdecorations.la %{tde_libdir}/libtdecorations.so -%post -n trinity-twin-devel -/sbin/ldconfig || : - -%postun -n trinity-twin-devel -/sbin/ldconfig || : - ########## %package -n trinity-libkonq @@ -3300,12 +3162,6 @@ Konqueror and the kdesktop package. %{tde_datadir}/services/kded/favicons.desktop %{tde_datadir}/servicetypes/konqpopupmenuplugin.desktop -%post -n trinity-libkonq -/sbin/ldconfig || : - -%postun -n trinity-libkonq -/sbin/ldconfig || : - ########## %package libtqt3-integration @@ -3352,12 +3208,6 @@ Konqueror libraries. %{tde_libdir}/libkonq.la %{tde_libdir}/libkonq.so -%post -n trinity-libkonq-devel -/sbin/ldconfig || : - -%postun -n trinity-libkonq-devel -/sbin/ldconfig || : - ########## %package tdeio-smb-plugin @@ -3401,8 +3251,8 @@ Windows and Samba shares. %__sed -i "kpersonalizer/keyecandypage.cpp" \ -e 's|#define DEFAULT_WALLPAPER "isadora.png"|#define DEFAULT_WALLPAPER "%{tde_bg}"|' %__sed -i "%{starttde}" \ - -e 's|/usr/share/wallpapers/isadora.png.desktop|%{tde_bg}|' \ - -e 's|Wallpaper=isadora.png|Wallpaper=%{tde_bg}|' + -e 's|$TDEDIR/share/wallpapers/Trinity-lineart.svg.desktop|%{tde_bg}|' \ + -e 's|Wallpaper=Trinity-lineart.svg|Wallpaper=%{tde_bg}|' %endif # TDE default directory and icon in startup script @@ -3460,6 +3310,11 @@ fi %__sed -i "tdeioslave/cgi/kcmcgi/kcmcgi.desktop" -e "s|^Icon=.*|Icon=kcmcgi|" %__sed -i "tdeioslave/media/tdecmodule/media.desktop" -e "s|^Icon=.*|Icon=kcmmedia|" +# RHEL 5 does not support 'compton' +%if 0%{?with_libconfig} == 0 +%__sed -i "twin/CMakeLists.txt" -e "/compton-tde/ s/^/#/" +%endif + %build unset QTDIR QTINC QTLIB @@ -3472,6 +3327,16 @@ if [ -d "/usr/include/samba-4.0" ]; then export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/include/samba-4.0" fi +# openldap 2.4 includes (CentOS 5) +if [ -d "/usr/include/openldap24" ]; then + RPM_OPT_FLAGS="-I%{_includedir}/openldap24 -L%{_libdir}/openldap24 ${RPM_OPT_FLAGS}" +fi + +# libtirpc (fedora) +if [ -d "/usr/include/tirpc" ]; then + RPM_OPT_FLAGS="$(pkg-config --cflags --libs libtirpc) ${RPM_OPT_FLAGS}" +fi + if ! rpm -E %%cmake|grep -q "cd build"; then %__mkdir_p build cd build @@ -3488,6 +3353,7 @@ fi -DWITH_GCC_VISIBILITY=ON \ \ -DBIN_INSTALL_DIR="%{tde_bindir}" \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \ -DLIB_INSTALL_DIR="%{tde_libdir}" \ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ @@ -3505,8 +3371,8 @@ fi -DWITH_XFIXES=ON \ %{?!with_xrandr:-DWITH_XRANDR=OFF} \ -DWITH_XRENDER=ON \ - -DWITH_XDAMAGE=ON \ - -DWITH_XEXT=ON \ + %{?!with_libconfig:-DWITH_LIBCONFIG=OFF} \ + -DWITH_PCRE=ON \ %{?!with_xtest:-DWITH_XTEST=OFF} \ -DWITH_OPENGL=ON \ %{?!with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \ @@ -3514,6 +3380,7 @@ fi -DWITH_LIBUSB=ON \ -DWITH_LIBRAW1394=ON \ -DWITH_SUDO_TDESU_BACKEND=OFF \ + -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND=OFF \ -DWITH_PAM=ON \ -DWITH_SHADOW=OFF \ -DWITH_XDMCP=ON \ @@ -3523,8 +3390,8 @@ fi -DWITH_SENSORS=ON \ %{?with_hal:-DWITH_HAL=ON} \ %{?!with_tdehwlib:-DWITH_TDEHWLIB=OFF} \ - -DWITH_ELFICON=OFF \ -DWITH_UPOWER=ON \ + %{?!with_elficon:-DWITH_ELFICON=OFF} \ \ -DBUILD_ALL=ON \ %if 0%{?suse_version} @@ -3536,7 +3403,11 @@ fi -DTDM_PAM_SERVICE="tdm-trinity" \ -DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" \ %endif + %{!?with_kbdledsync:-DBUILD_TDEKBDLEDSYNC=OFF} \ %{!?with_tsak:-DBUILD_TSAK=OFF} \ +%if 0%{?fedora} >= 22 || 0%{?suse_version} >= 1320 + -DHTDIG_SEARCH_BINARY="/usr/bin/htdig" \ +%endif .. %__make %{?_smp_mflags} || %__make @@ -3553,7 +3424,7 @@ fi # Adds a GDM/KDM/XDM session called 'TDE' # Under RHEL/Fedora/Suse, static 'xsessions' files go to '/usr/share/xsessions'. -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6 %__install -D -m 644 \ "%{?buildroot}%{tdm_datadir}/sessions/tde.desktop" \ "%{?buildroot}%{_datadir}/xsessions/tde.desktop" @@ -3581,8 +3452,12 @@ EXEC=%{tde_bindir}/%{tdm} %if 0%{?pclinuxos} FNDSESSION_EXEC="/usr/sbin/chksession -k" %else +%if 0%{?mgaversion} >= 6 +FNDSESSION_EXEC="/usr/sbin/chksession" +%else FNDSESSION_EXEC="/usr/sbin/chksession --generate=/usr/share/xsessions" %endif +%endif EOF %endif @@ -3596,19 +3471,20 @@ EOF # TDM configuration %__sed -i "%{?buildroot}%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" \ -%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 +%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4 -e "s/^#*MinShowUID=.*/MinShowUID=1000/" %else -e "s/^#*MinShowUID=.*/MinShowUID=500/" %endif # Symlinks 'usb.ids' (Use system-provided version, not TDE provided version) -%__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 -%__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids" -%endif +if [ -r "/usr/share/usb.ids" ]; then + %__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids" + %__ln_s -f "/usr/share/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids" +elif [ -r "/usr/share/hwdata/usb.ids" ]; then + %__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids" + %__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids" +fi # Makes 'media_safelyremove.desktop' an alternative. # This allows the use of 'tdeio-umountwrapper' package. @@ -3629,10 +3505,6 @@ EOF %__sed -i "s|kdm|tdm|g" "%{?buildroot}/usr/lib/systemd/system/tdm.service" %endif -# Symlink TDM configuration -%__mkdir_p "%{?buildroot}%{tde_datadir}/config" -%__ln_s "%{_sysconfdir}/trinity/%{tdm}" "%{?buildroot}%{tde_datadir}/config/%{tdm}" - # SELINUX policy for RHEL / Fedora %if 0%{?with_selinux_policy} %__install -D -m 644 "%{SOURCE8}" "%{?buildroot}%{?_sysconfdir}/trinity/%{tdm}/tdm.pp" @@ -3698,8 +3570,8 @@ for i in {16,22}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/network.png hicolor/"$i"x"$i"/apps/kcmnetpref.png ;done for i in {16,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/blockdevice.png hicolor/"$i"x"$i"/apps/kcmkdnssd.png ;done for i in {16,22,32,48,64}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/input-joystick.png hicolor/"$i"x"$i"/apps/kcmjoystick.png ;done -for i in {16,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/mouse.png hicolor/"$i"x"$i"/apps/kcmmouse.png ;done -for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/system.png hicolor/"$i"x"$i"/apps/kcmmedia.png ;done +for i in {16,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/input-mouse.png hicolor/"$i"x"$i"/apps/kcmmouse.png ;done +for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/computer.png hicolor/"$i"x"$i"/apps/kcmmedia.png ;done for i in {16,22,32}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/encrypted.png hicolor/"$i"x"$i"/apps/kcmcrypto.png ;done for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/trashcan_empty.png hicolor/"$i"x"$i"/apps/kcmprivacy.png ;done for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/network.png hicolor/"$i"x"$i"/apps/kcmnic.png ;done @@ -3727,9 +3599,12 @@ popd %suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kwrite.desktop TextEditor %suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/tdeprintfax.desktop PrintingUtility %suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tdefontview.desktop Graphics Viewer -%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tderandrtray.desktop Applet X-TDE-settings-desktop +%{?with_tderandrtray:%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tderandrtray.desktop Applet X-TDE-settings-desktop} %suse_update_desktop_file %{?buildroot}%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop System FileManager %endif +if [ -r %{?buildroot}%{tde_tdeappdir}/kdcop.desktop ]; then +%suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/kdcop.desktop System Utility +fi # Icons from TDE Control Center should only be displayed in TDE for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do @@ -3746,16 +3621,19 @@ for i in ksysguard tde-kcontrol tdefontview showdesktop; do done # Remove setuid bit on some binaries. -%if 0%{?with_tsak} -chmod 0511 "%{?buildroot}%{tde_bindir}/%{tdm}tsak" -%endif +%{?with_tsak:chmod 0511 "%{?buildroot}%{tde_bindir}/%{tdm}tsak"} chmod 0755 "%{?buildroot}%{tde_bindir}/kcheckpass" -chmod 0755 "%{?buildroot}%{tde_bindir}/tdekbdledsync" +%{?with_kbdledsync:chmod 0755 "%{?buildroot}%{tde_bindir}/tdekbdledsync"} # Fix permissions on shell scripts chmod 0755 "%{?buildroot}%{tde_datadir}/apps/tdeconf_update/move_session_config.sh" chmod 0755 "%{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter/glossary/checkxrefs" +# Removes tderandrtray documentation, if not built. +%if 0%{?with_tderandrtray} == 0 +%__rm -rf "%{?buildroot}%{tde_tdedocdir}/HTML/en/tderandrtray" +%endif + # Links duplicate files %fdupes "%{?buildroot}%{tde_datadir}" @@ -3767,14 +3645,10 @@ chmod 0755 "%{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter/glossary/checkxref %if 0%{?suse_version} # Check permissions on setuid files (openSUSE specific) %verifyscript -%if 0%{?with_tsak} -%verify_permissions -e %{tde_bindir}/%{tdm}tsak -%endif +%{?with_tsak:%verify_permissions -e %{tde_bindir}/%{tdm}tsak} %verify_permissions -e %{tde_bindir}/kcheckpass -%verify_permissions -e %{tde_bindir}/tdekbdledsync +%{?with_kbdledsync:%verify_permissions -e %{tde_bindir}/tdekbdledsync} %endif %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/main/tdebase/tdebase-3.5.13.2.spec b/redhat/main/tdebase/tdebase-3.5.13.2.spec index c349bc37e..6c4318f8d 100644 --- a/redhat/main/tdebase/tdebase-3.5.13.2.spec +++ b/redhat/main/tdebase/tdebase-3.5.13.2.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables @@ -34,17 +34,12 @@ %define tdm_datadir %{tde_datadir}/apps/%{tdm} %define starttde startkde -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Version: %{tde_version} -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist} Summary: Trinity Base Programs -Group: User Interface/Desktops +Group: System/GUI/Other URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} @@ -99,6 +94,8 @@ Source8: tdm%{?dist}.pp Source9: mgabutton.svg %endif +%{?tde_patch:Patch1: %{tde_pkg}-%{tde_version}.patch} + Obsoletes: trinity-kdebase < %{version}-%{release} Provides: trinity-kdebase = %{version}-%{release} Obsoletes: trinity-kdebase-libs < %{version}-%{release} @@ -108,9 +105,17 @@ Provides: trinity-kdebase-extras = %{version}-%{release} Obsoletes: tdebase < %{version}-%{release} Provides: tdebase = %{version}-%{release} -%if 0%{?suse_version} # for set_permissions macro +%if 0%{?suse_version} PreReq: permissions +%endif + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} # for xdg-menu script BuildRequires: brp-check-trinity %endif @@ -287,7 +292,7 @@ Requires: indexhtml # OpenSuse 11.4 Theme %if "%{?suse_version}" == "1140" -Requires: hicolor-icon-theme-branding +Requires: hicolor-icon-theme-branding = 11.4 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg Requires: opensuse-manuals_en @@ -297,9 +302,9 @@ Requires: opensuse-manuals_en # OpenSuse 12.2 Theme %if "%{?suse_version}" == "1220" -Requires: wallpaper-branding +Requires: wallpaper-branding = 12.2 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -Requires: hicolor-icon-theme-branding +Requires: hicolor-icon-theme-branding = 12.2 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg Requires: opensuse-manuals_en @@ -309,7 +314,7 @@ Requires: opensuse-manuals_en # OpenSuse 12.3 Theme %if "%{?suse_version}" == "1230" -Requires: wallpaper-branding +Requires: wallpaper-branding = 12.3 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg Requires: hicolor-icon-theme-branding %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg @@ -321,14 +326,26 @@ Requires: opensuse-manuals_en # OpenSuse 13.1 Theme %if "%{?suse_version}" == "1310" -Requires: wallpaper-branding +Requires: wallpaper-branding = 13.1 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -Requires: hicolor-icon-theme-branding +Requires: hicolor-icon-theme-branding = 13.1 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg Requires: opensuse-manuals_en %define tde_aboutlabel OpenSuse 13.1 -%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html +%define tde_aboutpage /usr/share/do%endif +%endif + +# OpenSuse 13.2 Theme +%if "%{?suse_version}" == "1320" +Requires: wallpaper-branding = 13.2 +%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg +Requires: hicolor-icon-theme-branding +%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg + +Requires: release-notes-openSUSE +%define tde_aboutlabel OpenSuse 13.2 +%define tde_aboutpage /usr/share/doc/release-notes/openSUSE/RELEASE-NOTES.en.html %endif BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 @@ -337,6 +354,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: make +BuildRequires: fdupes # HTDIG support BuildRequires: htdig @@ -444,13 +462,10 @@ BuildRequires: OpenEXR-devel %endif # XSCREENSAVER support -# Disabled on RHEL4, RHEL >= 7 -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 7 || 0%{?suse_version} || 0%{?with_xscreensaver} -%if 0%{?rhel} == 0 || 0%{?rhel} <= 6 +%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?with_xscreensaver} %define with_xscreensaver 1 -%if 0%{?rhel} == 5 -BuildRequires: xorg-x11-proto-devel -BuildRequires: gnome-screensaver +%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} +BuildRequires: libXScrnSaver-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} >= 4 @@ -459,17 +474,6 @@ BuildRequires: %{_lib}xscrnsaver-devel BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel %endif %endif -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220 -BuildRequires: xscreensaver -BuildRequires: libXScrnSaver-devel -%if 0%{?suse_version} -BuildRequires: xscreensaver-data-extra -%endif -%endif -%if 0%{?suse_version} == 1140 -BuildRequires: xscreensaver -%endif -%endif %endif # AVAHI support @@ -560,14 +564,15 @@ BuildRequires: libXdmcp-devel # XTST support %if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} >= 4 -BuildRequires: %{_lib}xtst-devel +%define xtst_devel %{_lib}xtst-devel %else -BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel +%define xtst_devel %{_lib}xtst%{?mgaversion:6}-devel %endif %endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libXtst-devel +%define xtst_devel libXtst-devel %endif +%{?xtst_devel:BuildRequires: %{xtst_devel}} # XDAMAGE support %if 0%{?mgaversion} || 0%{?mdkversion} @@ -682,7 +687,7 @@ web browser, X terminal emulator, and many other programs and components. %package devel Summary: %{summary} - Development files -Group: Development/Libraries +Group: Development/Libraries/Other Requires: %{name} = %{version}-%{release} Requires: trinity-arts-devel >= %{tde_epoch}:1.5.10 Requires: trinity-tdelibs-devel >= %{tde_version} @@ -722,7 +727,7 @@ Kate plugins or TWin styles. %package tdeio-pim-plugins Summary: PIM TDEIOslaves from %{name} -Group: Environment/Libraries +Group: System/GUI/Other Provides: trinity-kdebase-pim-ioslaves = %{version}-%{release} Obsoletes: trinity-kdebase-pim-ioslaves < %{version}-%{release} @@ -761,7 +766,7 @@ Protocol handlers (TDEIOslaves) for personal information management, including: %package runtime-data-common Summary: Shared common files for Trinity and KDE4 -Group: Environment/Libraries +Group: System/GUI/Other Provides: tdebase-runtime-data-common = %{version}-%{release} Obsoletes: tdebase-runtime-data-common < %{version}-%{release} @@ -802,7 +807,7 @@ done %package -n trinity-kappfinder Summary: Non-TDE application finder for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} %description -n trinity-kappfinder @@ -835,10 +840,10 @@ update-desktop-database %{tde_appdir} 2> /dev/null || : %package -n trinity-libkateinterfaces Summary: Common libraries used by kwrite and kate -Group: Environment/Libraries +Group: System/GUI/Other %description -n trinity-libkateinterfaces -%{summary} +This package contains the kateinterface library. %files -n trinity-libkateinterfaces %defattr(-,root,root,-) @@ -854,7 +859,7 @@ Group: Environment/Libraries %package -n trinity-kate Summary: Advanced text editor for TDE -Group: Applications/Text +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} Requires: trinity-kwrite = %{version}-%{release} Requires: trinity-libkateinterfaces = %{version}-%{release} @@ -915,11 +920,11 @@ update-desktop-database %{tde_appdir} 2> /dev/null || : %package -n trinity-kate-devel Summary: Development files for kate -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-kate = %{version}-%{release} %description -n trinity-kate-devel -%{summary} +This package contains the development files fare Kate. %files -n trinity-kate-devel %defattr(-,root,root,-) @@ -939,12 +944,12 @@ Requires: trinity-kate = %{version}-%{release} %package -n trinity-kwrite Summary: Advanced text editor for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} Requires: trinity-libkateinterfaces = %{version}-%{release} %description -n trinity-kwrite -Kwrite is a text editor for TDE. +Kwrite is an advanced text editor for TDE. %files -n trinity-kwrite %defattr(-,root,root,-) @@ -978,7 +983,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || : %package -n trinity-kcontrol Summary: Control center for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} # Requires 'usb.ids' @@ -1191,7 +1196,6 @@ plugdev group. %{tde_tdeappdir}/sound.desktop %{tde_tdeappdir}/spellchecking.desktop %{tde_tdeappdir}/style.desktop -%{tde_tdeappdir}/tde-kcontrol.desktop %{tde_tdeappdir}/useragent.desktop %{tde_tdeappdir}/xserver.desktop %{tde_datadir}/applnk/.hidden/energy.desktop @@ -1278,11 +1282,11 @@ update-desktop-database %{tde_appdir} 2> /dev/null || : %package -n trinity-kcontrol-devel Summary: Development files for kcontrol -Group: Development/Libraries +Group: Development/Languages/Other Requires: trinity-kcontrol = %{version}-%{release} %description -n trinity-kcontrol-devel -%{summary} +This package contains the development files for Kcontrol. %files -n trinity-kcontrol-devel %defattr(-,root,root,-) @@ -1299,9 +1303,14 @@ Requires: trinity-kcontrol = %{version}-%{release} %package bin Summary: Core binaries for the TDE base module -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} Requires: pam +%if 0%{?rhel} >= 7 +Requires: xorg-x11-server-Xorg +Requires: xorg-x11-drv-evdev +Requires: dejavu-sans-fonts +%endif Provides: tdebase-bin = %{version}-%{release} Obsoletes: tdebase-bin < %{version}-%{release} @@ -1409,6 +1418,13 @@ TDE applications, particularly those in the TDE base module. %post bin /sbin/ldconfig || : update-desktop-database %{tde_appdir} 2> /dev/null || : +# Sets permissions on setuid files (openSUSE specific) +%if 0%{?suse_version} +%if 0%{?with_tsak} +%set_permissions %{tde_bindir}/%{tdm}tsak +%endif +%set_permissions %{tde_bindir}/kcheckpass +%endif %postun bin /sbin/ldconfig || : @@ -1418,14 +1434,16 @@ update-desktop-database %{tde_appdir} 2> /dev/null || : %package bin-devel Summary: Development files for core binaries for the TDE base module -Group: Development/Libraries +Group: Development/Libraries/Other Requires: %{name}-bin = %{version}-%{release} +%{?xtst_devel:Requires: %{xtst_devel}} Obsoletes: tdebase-bin-devel < %{version}-%{release} Provides: tdebase-bin-devel = %{version}-%{release} %description bin-devel -%{summary} +This package contains the development files for core binaries for +the TDE base module %files bin-devel %defattr(-,root,root,-) @@ -1442,7 +1460,7 @@ Provides: tdebase-bin-devel = %{version}-%{release} %package data Summary: Shared data files for the TDE base module -Group: Environment/Libraries +Group: System/GUI/Other Requires: %{name}-runtime-data-common = %{version}-%{release} Obsoletes: tdebase-data < %{version}-%{release} @@ -1711,6 +1729,7 @@ needed for a basic TDE desktop installation. %{tde_datadir}/wallpapers/* # XDG directories information +%dir %{_sysconfdir}/xdg/menus/applications-merged %config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/tde-essential.menu %config(noreplace) %{_sysconfdir}/xdg/menus/tde-information.menu %config(noreplace) %{_sysconfdir}/xdg/menus/tde-screensavers.menu @@ -1752,7 +1771,7 @@ done %package tdeio-plugins Summary: Core I/O slaves for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: trinity-kdesktop = %{version}-%{release} Requires: cyrus-sasl Requires: psmisc @@ -1926,7 +1945,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || : %package -n trinity-tdepasswd Summary: Password changer for TDE -Group: Applications/Utilities +Group: System/GUI/Other Obsoletes: trinity-kdepasswd < %{version}-%{release} Provides: trinity-kdepasswd = %{version}-%{release} @@ -1983,7 +2002,7 @@ update-desktop-database %{tde_tdeappdir} 2> /dev/null || : %package -n trinity-tdeprint Summary: Print system for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} Requires: psutils @@ -2058,7 +2077,7 @@ done %package -n trinity-kdesktop Summary: Miscellaneous binaries and files for the TDE desktop -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-bin = %{version}-%{release} Requires: %{name}-data = %{version}-%{release} Requires: trinity-libkonq = %{version}-%{release} @@ -2111,11 +2130,11 @@ done %package -n trinity-kdesktop-devel Summary: Development files for kdesktop -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-kdesktop = %{version}-%{release} %description -n trinity-kdesktop-devel -%{summary} +This package contains the development files for kdesktop. %files -n trinity-kdesktop-devel %defattr(-,root,root,-) @@ -2127,7 +2146,7 @@ Requires: trinity-kdesktop = %{version}-%{release} %package -n trinity-tdm Summary: X Display manager for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-bin = %{version}-%{release} Requires: %{name}-data = %{version}-%{release} Requires: pam @@ -2237,13 +2256,13 @@ already. Most users won't need this. %endif # Logrotate configuration -%config %{_sysconfdir}/logrotate.d/tdm +%config %{_sysconfdir}/logrotate.d/trinity-tdm %pre -n trinity-tdm # Make sure that TDM configuration files are now under '/etc/trinity/tdm' if [ -d "%{tde_datadir}/config/%{tdm}" ] && [ ! -L "%{tde_datadir}/config/%{tdm}" ]; then if [ -d "%{_sysconfdir}/trinity/%{tdm}" ]; then - # If there is already something under '/etc/trinity/%{tdm}', simply delete old configuration + # If there is already something under '/etc/trinity/tdm', simply delete old configuration echo "Deleting TDM configuration under '%{tde_datadir}/config/%{tdm}'" rm -rf "%{tde_datadir}/config/%{tdm}" else @@ -2306,11 +2325,12 @@ fi %package -n trinity-tdm-devel Summary: Development files for tdm -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-tdm = %{version}-%{release} +%{?xtst_devel:Requires: %{xtst_devel}} %description -n trinity-tdm-devel -%{summary} +This package contains the development files for TDM. %files -n trinity-tdm-devel %defattr(-,root,root,-) @@ -2320,7 +2340,7 @@ Requires: trinity-tdm = %{version}-%{release} %package -n trinity-kfind Summary: File-find utility for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} %description -n trinity-kfind @@ -2357,7 +2377,7 @@ done %package -n trinity-khelpcenter Summary: Help center for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} Requires: htdig @@ -2406,7 +2426,7 @@ done %package -n trinity-kicker Summary: Desktop panel for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} %description -n trinity-kicker @@ -2540,11 +2560,12 @@ done %package -n trinity-kicker-devel Summary: Development files for kicker -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-kicker = %{version}-%{release} +%{?xtst_devel:Requires: %{xtst_devel}} %description -n trinity-kicker-devel -%{summary} +This package contains the development files for kicker. %files -n trinity-kicker-devel %defattr(-,root,root,-) @@ -2571,7 +2592,7 @@ Requires: trinity-kicker = %{version}-%{release} %package -n trinity-klipper Summary: Clipboard utility for Trinity -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} %description -n trinity-klipper @@ -2620,7 +2641,7 @@ done %package -n trinity-kmenuedit Summary: Menu editor for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} %description -n trinity-kmenuedit @@ -2657,7 +2678,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || : %package -n trinity-konqueror Summary: TDE's advanced file manager, web browser and document viewer -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} Requires: trinity-kcontrol = %{version}-%{release} Requires: %{name}-tdeio-plugins = %{version}-%{release} @@ -2769,6 +2790,7 @@ ever launching another application. %exclude %{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop %exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop %{tde_datadir}/apps/konqueror/servicemenus/*.desktop +%ghost %{_sysconfdir}/alternatives/media_safelyremove.desktop %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase %{tde_datadir}/apps/konqueror/tiles/ %{tde_datadir}/autostart/konqy_preload.desktop @@ -2818,11 +2840,11 @@ fi %package -n trinity-konqueror-devel Summary: Development files for konqueror -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-konqueror = %{version}-%{release} %description -n trinity-konqueror-devel -%{summary} +This package contains the development files for konqueror. %files -n trinity-konqueror-devel %defattr(-,root,root,-) @@ -2841,7 +2863,7 @@ Requires: trinity-konqueror = %{version}-%{release} %package -n trinity-konqueror-nsplugins Summary: Netscape plugin support for Konqueror -Group: Applications/Utilities +Group: System/GUI/Other Requires: trinity-konqueror = %{version}-%{release} %description -n trinity-konqueror-nsplugins @@ -2868,7 +2890,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || : %package -n trinity-konsole Summary: X terminal emulator for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} %description -n trinity-konsole @@ -2937,7 +2959,7 @@ done %package -n trinity-kpager Summary: Desktop pager for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} %description -n trinity-kpager @@ -2971,7 +2993,7 @@ done %package -n trinity-kpersonalizer Summary: Installation personalizer for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} %description -n trinity-kpersonalizer @@ -3006,7 +3028,7 @@ done %package -n trinity-ksmserver Summary: Session manager for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} Requires: trinity-twin = %{version}-%{release} @@ -3032,7 +3054,7 @@ TDE will start, but many good defaults will not be set. %{tde_libdir}/libkdeinit_ksmserver.so %{tde_datadir}/apps/kconf_update/ksmserver.upd %{tde_datadir}/apps/kconf_update/move_session_config.sh -%{tde_datadir}/apps/ksmserver/pics/shutdownkonq.png +%{tde_datadir}/apps/ksmserver/ # Workaround conflict with KDE4 %if "%{?tde_prefix}" != "/usr" @@ -3055,7 +3077,7 @@ fndSession %package -n trinity-ksplash Summary: The TDE splash screen -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} %description -n trinity-ksplash @@ -3099,11 +3121,11 @@ update-desktop-database %{tde_appdir} 2> /dev/null || : %package -n trinity-ksplash-devel Summary: Development files for ksplash -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-ksplash = %{version}-%{release} %description -n trinity-ksplash-devel -%{summary} +This package contains the development files for ksplash. %files -n trinity-ksplash-devel %defattr(-,root,root,-) @@ -3121,7 +3143,7 @@ Requires: trinity-ksplash = %{version}-%{release} %package -n trinity-ksysguard Summary: System guard for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} Requires: trinity-ksysguardd = %{version}-%{release} @@ -3163,11 +3185,11 @@ done %package -n trinity-ksysguard-devel Summary: Development files for ksysguard -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-ksysguard = %{version}-%{release} %description -n trinity-ksysguard-devel -%{summary} +This package contains the development files for ksysguard. %files -n trinity-ksysguard-devel %defattr(-,root,root,-) @@ -3185,7 +3207,7 @@ Requires: trinity-ksysguard = %{version}-%{release} %package -n trinity-ksysguardd Summary: System guard daemon for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} %description -n trinity-ksysguardd @@ -3201,8 +3223,8 @@ to monitor it through the daemon running there. ########## %package -n trinity-ktip -Summary: useful tips for TDE -Group: Applications/Utilities +Summary: Useful tips for TDE +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} %description -n trinity-ktip @@ -3235,7 +3257,7 @@ done %package -n trinity-twin Summary: The TDE window manager -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} %description -n trinity-twin @@ -3304,11 +3326,11 @@ done %package -n trinity-twin-devel Summary: Development files for twin -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-twin = %{version}-%{release} %description -n trinity-twin-devel -%{summary} +This package contains the development files for twin. %files -n trinity-twin-devel %defattr(-,root,root,-) @@ -3332,7 +3354,7 @@ Requires: trinity-twin = %{version}-%{release} %package -n trinity-libkonq Summary: Core libraries for Konqueror -Group: Environment/Libraries +Group: System/GUI/Other %description -n trinity-libkonq These libraries are used by several TDE applications, most notably @@ -3367,7 +3389,7 @@ Konqueror and the kdesktop package. %package libtqt3-integration Summary: Integration library between TQt3 and TDE -Group: Environment/Libraries +Group: System/GUI/Other Obsoletes: tdebase-libtqt3-integration < %{version}-%{release} Provides: tdebase-libtqt3-integration = %{version}-%{release} @@ -3389,8 +3411,9 @@ These libraries allow you to use TDE dialogs in native TQt3 applications. %package -n trinity-libkonq-devel Summary: Development files for Konqueror's core libraries -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-libkonq = %{version}-%{release} +%{?xtst_devel:Requires: %{xtst_devel}} %description -n trinity-libkonq-devel This package contains headers and other development files for the core @@ -3416,8 +3439,8 @@ Konqueror libraries. ########## %package tdeio-smb-plugin -Summary: Windows Connection Module for TDE -Group: Environment/Libraries +Summary: Windows Connection Module for TDE +Group: System/GUI/Other %description tdeio-smb-plugin This package provides the "smb://" protocol, to connect to and from @@ -3437,7 +3460,7 @@ Windows and Samba shares. ########## -%if 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -3445,6 +3468,7 @@ Windows and Samba shares. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%{?tde_patch:%patch1 -p1} # Applies an optional distro-specific graphical theme %if "%{?tde_bg}" != "" @@ -3474,8 +3498,13 @@ Windows and Samba shares. # TDE default directory and icon in startup script %__sed -i "%{starttde}" \ - -e "s|/opt/trinity|%{tde_prefix}|g" \ - -e "s|%%{tde_starticon}|%{tde_starticon}|g" + -e "s|/opt/trinity|%{tde_prefix}|g" + +# Sets default TDE menu icon +%if "%{tde_starticon}" != "" +%__sed -i "kicker/libkicker/kickerSettings.kcfg" \ + -e "s|QString(\"kmenu\")|QString(\"%{tde_starticon}\")|" +%endif # Xsession script location may vary on some distro %if 0%{?rhel} || 0%{?fedora} @@ -3695,6 +3724,8 @@ chmod 755 "%{?buildroot}%{tde_bindir}/plasma-desktop" # Makes 'media_safelyremove.desktop' an alternative. # This allows the use of 'tdeio-umountwrapper' package. %__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase" +%__mkdir_p "%{buildroot}%{_sysconfdir}/alternatives" +%__ln_s "media_safelyremove.desktop_tdebase" "%{buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop" # SUSE >= 12 : creates DM config file, used by '/etc/init.d/xdm' # You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager' @@ -3740,7 +3771,7 @@ EOF # logrotate configuration mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d -cat << EOF > "%{buildroot}%{_sysconfdir}/logrotate.d/tdm" +cat << EOF > "%{buildroot}%{_sysconfdir}/logrotate.d/trinity-tdm" /var/log/tdm.log { weekly notifempty @@ -3759,56 +3790,55 @@ fi # Adds missing icons in 'hicolor' theme # These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'. -mkdir -p "%{?buildroot}%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/" +%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64,128x128}"/apps/" pushd "%{?buildroot}%{tde_datadir}/icons" -for i in {16,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/mimetypes/misc.png hicolor/"$i"x"$i"/apps/kcmcomponentchooser.png ;done -for i in {16,22,32,48,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/launch.png hicolor/"$i"x"$i"/apps/kcmperformance.png ;done -for i in 16; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/services.png hicolor/"$i"x"$i"/apps/kcmkded.png ;done -for i in {16,22,32,48}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/exit.png hicolor/"$i"x"$i"/apps/kcmsmserver.png ;done -for i in {16,22,32}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/spellcheck.png hicolor/"$i"x"$i"/apps/kcmspellchecking.png ;done -for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/desktop.png hicolor/"$i"x"$i"/apps/kcmdesktopbehavior.png ;done -for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/desktop.png hicolor/"$i"x"$i"/apps/kcmdesktop.png ;done -for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kmenu.png hicolor/"$i"x"$i"/apps/kcmtaskbar.png ;done -for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/mimetypes/colorscm.png hicolor/"$i"x"$i"/apps/kcmcolors.png ;done -for i in {16,22,32,48,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/launch.png hicolor/"$i"x"$i"/apps/kcmlaunch.png ;done -for i in {16,22,32}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/filter.png hicolor/"$i"x"$i"/apps/kcmkhtml_filter.png ;done -for i in {16,22,32}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/run.png hicolor/"$i"x"$i"/apps/kcmcgi.png ;done -for i in {16,22}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/history.png hicolor/"$i"x"$i"/apps/kcmhistory.png ;done -for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/network.png hicolor/"$i"x"$i"/apps/kcmnetpref.png ;done -for i in {16,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/blockdevice.png hicolor/"$i"x"$i"/apps/kcmkdnssd.png ;done -for i in {16,22,32,48,64}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/joystick.png hicolor/"$i"x"$i"/apps/kcmjoystick.png ;done -for i in {16,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/mouse.png hicolor/"$i"x"$i"/apps/kcmmouse.png ;done -for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/system.png hicolor/"$i"x"$i"/apps/kcmmedia.png ;done -for i in {16,22,32}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/encrypted.png hicolor/"$i"x"$i"/apps/kcmcrypto.png ;done -for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/trashcan_empty.png hicolor/"$i"x"$i"/apps/kcmprivacy.png ;done -for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/network.png hicolor/"$i"x"$i"/apps/kcmnic.png ;done +for i in {16,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/mimetypes/misc.png hicolor/"$i"x"$i"/apps/kcmcomponentchooser.png ;done +for i in {16,22,32,48,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/launch.png hicolor/"$i"x"$i"/apps/kcmperformance.png ;done +for i in 16; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/services.png hicolor/"$i"x"$i"/apps/kcmkded.png ;done +for i in {16,22,32,48}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/exit.png hicolor/"$i"x"$i"/apps/kcmsmserver.png ;done +for i in {16,22,32}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/spellcheck.png hicolor/"$i"x"$i"/apps/kcmspellchecking.png ;done +for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/desktop.png hicolor/"$i"x"$i"/apps/kcmdesktopbehavior.png ;done +for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/desktop.png hicolor/"$i"x"$i"/apps/kcmdesktop.png ;done +for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kmenu.png hicolor/"$i"x"$i"/apps/kcmtaskbar.png ;done +for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/mimetypes/colorscm.png hicolor/"$i"x"$i"/apps/kcmcolors.png ;done +for i in {16,22,32,48,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/launch.png hicolor/"$i"x"$i"/apps/kcmlaunch.png ;done +for i in {16,22,32}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/filter.png hicolor/"$i"x"$i"/apps/kcmkhtml_filter.png ;done +for i in {16,22,32}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/run.png hicolor/"$i"x"$i"/apps/kcmcgi.png ;done +for i in {16,22}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/history.png hicolor/"$i"x"$i"/apps/kcmhistory.png ;done +for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/network.png hicolor/"$i"x"$i"/apps/kcmnetpref.png ;done +for i in {16,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/blockdevice.png hicolor/"$i"x"$i"/apps/kcmkdnssd.png ;done +for i in {16,22,32,48,64}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/joystick.png hicolor/"$i"x"$i"/apps/kcmjoystick.png ;done +for i in {16,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/mouse.png hicolor/"$i"x"$i"/apps/kcmmouse.png ;done +for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/system.png hicolor/"$i"x"$i"/apps/kcmmedia.png ;done +for i in {16,22,32}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/encrypted.png hicolor/"$i"x"$i"/apps/kcmcrypto.png ;done +for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/trashcan_empty.png hicolor/"$i"x"$i"/apps/kcmprivacy.png ;done +for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/network.png hicolor/"$i"x"$i"/apps/kcmnic.png ;done popd # Updates applications categories for openSUSE %if 0%{?suse_version} -# Other applications -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/Help.desktop Documentation Viewer -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/Home.desktop System FileManager core -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kate.desktop TextEditor -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/KControl.desktop X-SuSE-core -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/Kfind.desktop System Filesystem core -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kjobviewer.desktop PrintingUtility -%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/klipper.desktop System TrayIcon -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kmenuedit.desktop Core-Configuration -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/knetattach.desktop System Network -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/konqbrowser.desktop WebBrowser -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/konquerorsu.desktop System FileManager -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/konsole.desktop TerminalEmulator -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/konsolesu.desktop TerminalEmulator -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kpager.desktop Utility DesktopUtility -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kpersonalizer.desktop DesktopUtility -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/ksysguard.desktop System Monitor -%suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/ktip.desktop System Utility -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kwrite.desktop TextEditor -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kprintfax.desktop PrintingUtility -%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/kfontview.desktop Graphics Viewer -%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/krandrtray.desktop Applet X-KDE-settings-desktop -%suse_update_desktop_file %{?buildroot}%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop System FileManager +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/Help.desktop Documentation Viewer +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/Home.desktop System FileManager core +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kate.desktop TextEditor +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/KControl.desktop X-SuSE-core +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/Kfind.desktop System Filesystem core +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kjobviewer.desktop PrintingUtility +%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/klipper.desktop System TrayIcon +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kmenuedit.desktop Core-Configuration +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/knetattach.desktop System Network +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/konqbrowser.desktop WebBrowser +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/konquerorsu.desktop System FileManager +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/konsole.desktop TerminalEmulator +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/konsolesu.desktop TerminalEmulator +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kpager.desktop Utility DesktopUtility +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kpersonalizer.desktop DesktopUtility +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/ksysguard.desktop System Monitor +%suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/ktip.desktop System Utility +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kwrite.desktop TextEditor +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kdeprintfax.desktop PrintingUtility +%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/kfontview.desktop Graphics Viewer +%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/krandrtray.desktop Applet X-KDE-settings-desktop +%suse_update_desktop_file %{?buildroot}%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop System FileManager %endif # Icons from TDE Control Center should only be displayed in TDE @@ -3821,7 +3851,7 @@ for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do done # Other apps that should stay in TDE -for i in ksysguard tde-kcontrol kfontview showdesktop; do +for i in ksysguard kfontview showdesktop; do echo "OnlyShowIn=KDE;" >>"%{?buildroot}%{tde_tdeappdir}/${i}.desktop" done @@ -3831,6 +3861,12 @@ chmod 0511 "%{?buildroot}%{tde_bindir}/%{tdm}tsak" %endif chmod 0755 "%{?buildroot}%{tde_bindir}/kcheckpass" +# Fix permissions on shell scripts +chmod 0755 "%{?buildroot}%{tde_datadir}/apps/kconf_update/move_session_config.sh" +chmod 0755 "%{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter/glossary/checkxrefs" + +# Links duplicate files +%fdupes "%{?buildroot}%{tde_datadir}" %clean @@ -3848,23 +3884,3 @@ chmod 0755 "%{?buildroot}%{tde_bindir}/kcheckpass" %changelog -* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-5 -- Add logrotate configuration file. -- Add font configuration file. -- Install missing icons. - -* Sun May 18 2014 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-4 -- Fix Fedora 20 theme -- Fix some Mageia 4 path problems -- Forward port KDE SVN r803253 to fix potential security hole [Commit #c383da9d] - -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Rebuild with NDEBUG option -- Fix XDG menu -- Fix Mageia/Mandriva specific icons - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/main/tdebase/tdm.fc19.te b/redhat/main/tdebase/tdm.fc19.te new file mode 100644 index 000000000..b42592f11 --- /dev/null +++ b/redhat/main/tdebase/tdm.fc19.te @@ -0,0 +1,11 @@ + +module tdm.fc18 1.0; + +require { + type fprintd_t; + type initrc_t; + class dbus send_msg; +} + +#============= fprintd_t ============== +allow fprintd_t initrc_t:dbus send_msg; diff --git a/redhat/main/tdebase/tdm.fc21.pp b/redhat/main/tdebase/tdm.fc21.pp Binary files differnew file mode 100644 index 000000000..d0c0d4be8 --- /dev/null +++ b/redhat/main/tdebase/tdm.fc21.pp diff --git a/redhat/main/tdebase/tdm.fc21.te b/redhat/main/tdebase/tdm.fc21.te new file mode 100644 index 000000000..45d8a9a2c --- /dev/null +++ b/redhat/main/tdebase/tdm.fc21.te @@ -0,0 +1,11 @@ + +module tdm.fc20 1.0; + +require { + type fprintd_t; + type init_t; + class dbus send_msg; +} + +#============= fprintd_t ============== +allow fprintd_t init_t:dbus send_msg; diff --git a/redhat/main/tdebase/tdm.fc22.pp b/redhat/main/tdebase/tdm.fc22.pp Binary files differnew file mode 100644 index 000000000..d0c0d4be8 --- /dev/null +++ b/redhat/main/tdebase/tdm.fc22.pp diff --git a/redhat/main/tdebase/tdm.fc22.te b/redhat/main/tdebase/tdm.fc22.te new file mode 100644 index 000000000..45d8a9a2c --- /dev/null +++ b/redhat/main/tdebase/tdm.fc22.te @@ -0,0 +1,11 @@ + +module tdm.fc20 1.0; + +require { + type fprintd_t; + type init_t; + class dbus send_msg; +} + +#============= fprintd_t ============== +allow fprintd_t init_t:dbus send_msg; diff --git a/redhat/main/tdebase/tdm.fc23.pp b/redhat/main/tdebase/tdm.fc23.pp Binary files differnew file mode 100644 index 000000000..d0c0d4be8 --- /dev/null +++ b/redhat/main/tdebase/tdm.fc23.pp diff --git a/redhat/main/tdebase/tdm.fc24.pp b/redhat/main/tdebase/tdm.fc24.pp Binary files differnew file mode 100644 index 000000000..d0c0d4be8 --- /dev/null +++ b/redhat/main/tdebase/tdm.fc24.pp diff --git a/redhat/main/tdebase/tdm.fc25.pp b/redhat/main/tdebase/tdm.fc25.pp Binary files differnew file mode 100644 index 000000000..d0c0d4be8 --- /dev/null +++ b/redhat/main/tdebase/tdm.fc25.pp diff --git a/redhat/main/tdebase/tdm.fc26.pp b/redhat/main/tdebase/tdm.fc26.pp Binary files differnew file mode 100644 index 000000000..d0c0d4be8 --- /dev/null +++ b/redhat/main/tdebase/tdm.fc26.pp diff --git a/redhat/main/tdebase/tdm.fc27.pp b/redhat/main/tdebase/tdm.fc27.pp Binary files differnew file mode 100644 index 000000000..d0c0d4be8 --- /dev/null +++ b/redhat/main/tdebase/tdm.fc27.pp diff --git a/redhat/main/tdebase/tdm.fc28.pp b/redhat/main/tdebase/tdm.fc28.pp Binary files differnew file mode 100644 index 000000000..d0c0d4be8 --- /dev/null +++ b/redhat/main/tdebase/tdm.fc28.pp diff --git a/redhat/main/tdebase/tdm.service.fc21 b/redhat/main/tdebase/tdm.service.fc21 new file mode 100644 index 000000000..4c6136d94 --- /dev/null +++ b/redhat/main/tdebase/tdm.service.fc21 @@ -0,0 +1,12 @@ +[Unit] +Description=The Trinity login manager +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service + +[Service] +ExecStart=/opt/trinity/bin/kdm +Restart=always +IgnoreSIGPIPE=no + +[Install] +Alias=display-manager.service diff --git a/redhat/main/tdebase/tdm.service.fc22 b/redhat/main/tdebase/tdm.service.fc22 new file mode 100644 index 000000000..4c6136d94 --- /dev/null +++ b/redhat/main/tdebase/tdm.service.fc22 @@ -0,0 +1,12 @@ +[Unit] +Description=The Trinity login manager +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service + +[Service] +ExecStart=/opt/trinity/bin/kdm +Restart=always +IgnoreSIGPIPE=no + +[Install] +Alias=display-manager.service diff --git a/redhat/main/tdebase/tdm.service.fc23 b/redhat/main/tdebase/tdm.service.fc23 new file mode 100644 index 000000000..4c6136d94 --- /dev/null +++ b/redhat/main/tdebase/tdm.service.fc23 @@ -0,0 +1,12 @@ +[Unit] +Description=The Trinity login manager +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service + +[Service] +ExecStart=/opt/trinity/bin/kdm +Restart=always +IgnoreSIGPIPE=no + +[Install] +Alias=display-manager.service diff --git a/redhat/main/tdebase/tdm.service.fc24 b/redhat/main/tdebase/tdm.service.fc24 new file mode 100644 index 000000000..4c6136d94 --- /dev/null +++ b/redhat/main/tdebase/tdm.service.fc24 @@ -0,0 +1,12 @@ +[Unit] +Description=The Trinity login manager +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service + +[Service] +ExecStart=/opt/trinity/bin/kdm +Restart=always +IgnoreSIGPIPE=no + +[Install] +Alias=display-manager.service diff --git a/redhat/main/tdebase/tdm.service.fc25 b/redhat/main/tdebase/tdm.service.fc25 new file mode 100644 index 000000000..4c6136d94 --- /dev/null +++ b/redhat/main/tdebase/tdm.service.fc25 @@ -0,0 +1,12 @@ +[Unit] +Description=The Trinity login manager +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service + +[Service] +ExecStart=/opt/trinity/bin/kdm +Restart=always +IgnoreSIGPIPE=no + +[Install] +Alias=display-manager.service diff --git a/redhat/main/tdebase/tdm.service.fc26 b/redhat/main/tdebase/tdm.service.fc26 new file mode 100644 index 000000000..4c6136d94 --- /dev/null +++ b/redhat/main/tdebase/tdm.service.fc26 @@ -0,0 +1,12 @@ +[Unit] +Description=The Trinity login manager +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service + +[Service] +ExecStart=/opt/trinity/bin/kdm +Restart=always +IgnoreSIGPIPE=no + +[Install] +Alias=display-manager.service diff --git a/redhat/main/tdebase/tdm.service.fc27 b/redhat/main/tdebase/tdm.service.fc27 new file mode 100644 index 000000000..4c6136d94 --- /dev/null +++ b/redhat/main/tdebase/tdm.service.fc27 @@ -0,0 +1,12 @@ +[Unit] +Description=The Trinity login manager +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service + +[Service] +ExecStart=/opt/trinity/bin/kdm +Restart=always +IgnoreSIGPIPE=no + +[Install] +Alias=display-manager.service diff --git a/redhat/main/tdebase/tdm.service.fc28 b/redhat/main/tdebase/tdm.service.fc28 new file mode 100644 index 000000000..4c6136d94 --- /dev/null +++ b/redhat/main/tdebase/tdm.service.fc28 @@ -0,0 +1,12 @@ +[Unit] +Description=The Trinity login manager +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service + +[Service] +ExecStart=/opt/trinity/bin/kdm +Restart=always +IgnoreSIGPIPE=no + +[Install] +Alias=display-manager.service diff --git a/redhat/main/tdebase/trinity-tdebase-rpmlintrc b/redhat/main/tdebase/trinity-tdebase-rpmlintrc index ad8188f40..8d22f2fc6 100644 --- a/redhat/main/tdebase/trinity-tdebase-rpmlintrc +++ b/redhat/main/tdebase/trinity-tdebase-rpmlintrc @@ -1 +1,3 @@ setBadness('permissions-file-setuid-bit', 0) +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) |