| 379418a0 | 2017-04-30 05:09:12 | François Andriot |
RPM packaging: fix tdelibs dependencies on Mageia 6 |
||
|
M redhat/main/tdelibs/tdelibs-14.0.0.spec |
||
diff --git a/redhat/main/tdelibs/tdelibs-14.0.0.spec b/redhat/main/tdelibs/tdelibs-14.0.0.spec
index 93b4112..28c1715 100644
--- a/redhat/main/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/main/tdelibs/tdelibs-14.0.0.spec
@@ -84,7 +84,10 @@
Requires: trinity-arts >= %{tde_epoch}:1.5.10
Requires: trinity-filesystem >= %{tde_version}
+%if 0%{?mgaversion} >= 6
+%else
Requires: fileshareset >= 2.0
+%endif
BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
|
||
| 618dc68f | 2017-04-30 05:17:53 | François Andriot |
RPM packaging: fix tdebase build on Mageia 6 |
||
|
A redhat/main/tdebase/pamd.kcheckpass-trinity.mga6 A redhat/main/tdebase/pamd.kdm-trinity-np.mga6 A redhat/main/tdebase/pamd.kdm-trinity.mga6 A redhat/main/tdebase/pamd.kscreensaver-trinity.mga6 |
||
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga6 b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga6 new file mode 100644 index 0000000..0a37e6e --- /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.kdm-trinity-np.mga6 b/redhat/main/tdebase/pamd.kdm-trinity-np.mga6 new file mode 100644 index 0000000..f884c1d --- /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.mga6 b/redhat/main/tdebase/pamd.kdm-trinity.mga6 new file mode 100644 index 0000000..cb0982c --- /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.kscreensaver-trinity.mga6 b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga6 new file mode 100644 index 0000000..0a37e6e --- /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 |
||
| 5f7453e6 | 2017-04-30 05:18:21 | François Andriot |
RPM packaging: fix tdemultimedia dependencies on Mageia 6 |
||
|
M redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec |
||
diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec
index 6832547..3a3a51d 100644
--- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec
+++ b/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec
@@ -194,9 +194,13 @@
%if 0%{?pclinuxos}
BuildRequires: liblame-devel
%else
+%if 0%{?mgaversion} >= 6
+BuildRequires: %{_lib}mp3lame-devel
+%else
BuildRequires: %{_lib}lame-devel
%endif
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: libmp3lame-devel
|
||