RPM Packaging: update for pclinuxos2016

8 files changed, 29 insertions, 7 deletions

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.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.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.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/tdeedu/tdeedu-14.0.0.spec b/redhat/main/tdeedu/tdeedu-14.0.0.spec
index 8eacfe4f7..41785bb3e 100644
--- a/redhat/main/tdeedu/tdeedu-14.0.0.spec
+++ b/redhat/main/tdeedu/tdeedu-14.0.0.spec
@@ -585,6 +585,8 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/services/tdefile_kig.desktop
 %{tde_datadir}/services/kig_part.desktop
 %{tde_tdedocdir}/HTML/en/kig/
+%{tde_confdir}/magic/cabri.magic.mgc
+%{tde_confdir}/magic/drgeo.magic.mgc
 
 %post -n trinity-kig
 for i in crystalsvg hicolor ; do
@@ -1454,5 +1456,3 @@ export PATH="%{tde_bindir}:${PATH}"
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE R14.0.0
diff --git a/redhat/main/tdegames/tdegames-14.0.0.spec b/redhat/main/tdegames/tdegames-14.0.0.spec
index 9c52a7956..b8e352099 100644
--- a/redhat/main/tdegames/tdegames-14.0.0.spec
+++ b/redhat/main/tdegames/tdegames-14.0.0.spec
@@ -918,6 +918,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_libdir}/libkolf.so.1
 %{tde_libdir}/libkolf.so.1.2.0
 %{tde_tdedocdir}/HTML/en/kolf/
+%{tde_confdir}/magic/kolf.magic.mgc
 
 %post -n trinity-kolf
 /sbin/ldconfig || :
@@ -1651,5 +1652,3 @@ export PATH="%{tde_bindir}:${PATH}"
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE R14.0.0
diff --git a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
index ab72ef950..bcacfc188 100644
--- a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
+++ b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
@@ -867,6 +867,7 @@ track of the time spent online for you.
 %{tde_datadir}/apps/kppp/
 %{tde_datadir}/icons/hicolor/*/apps/kppp.png
 %{tde_tdedocdir}/HTML/en/kppp/
+%{_sysconfdir}/ppp/peers/kppp-options
 
 %if 0%{?with_consolehelper}
 %config(noreplace) /etc/security/console.apps/kppp3
@@ -1352,5 +1353,3 @@ done
 
 
 %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/tdevelop/tdevelop-14.0.0.spec b/redhat/main/tdevelop/tdevelop-14.0.0.spec
index b57cc824b..179050a47 100644
--- a/redhat/main/tdevelop/tdevelop-14.0.0.spec
+++ b/redhat/main/tdevelop/tdevelop-14.0.0.spec
@@ -458,7 +458,6 @@ individual needs.
 %{tde_datadir}/apps/kdevdebugger/
 %{tde_datadir}/apps/kdevdesigner/
 %{tde_datadir}/apps/kdevdesignerpart/
-%{tde_datadir}/apps/kdevdesignerpart/
 %{tde_datadir}/apps/kdevdiff/
 %{tde_datadir}/apps/kdevdistpart/
 %{tde_datadir}/apps/kdevdocumentation/