RPM: merge redhat directory with master branch

2 files changed, 50 insertions, 16 deletions

diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
index 76871022c..a999adda0 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package trinity-filesystem (version R14.0.0)
+# spec file for package trinity-filesystem (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -12,13 +12,16 @@
 # 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
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
+%endif
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
 %define tde_datadir %{tde_prefix}/share
 %define _docdir %{tde_docdir}
 %define tde_docdir %{tde_datadir}/doc
@@ -30,7 +33,6 @@
 %define tde_tdelibdir %{tde_libdir}/trinity
 
 
-
 Name:		trinity-filesystem
 Version:	%{tde_version}
 Release:	1%{?dist}
@@ -63,14 +65,14 @@ This package installs the Trinity directory structure.
 %dir %{tde_bindir}
 
 %dir %{tde_datadir}
-%dir %{tde_datadir}/config
-%dir %{tde_datadir}/config/magic
+%dir %{tde_confdir}
+%dir %{tde_confdir}/magic
 
 %dir %{tde_docdir}
 %dir %{tde_tdedocdir}
 %dir %{tde_tdedocdir}/HTML
-%dir %{tde_tdedocdir}/HTML/en
-%dir %{tde_tdedocdir}/HTML/en/common
+%dir %{tde_tdedocdir}/HTML/*
+%dir %{tde_tdedocdir}/HTML/*/common
 
 %dir %{tde_includedir}
 %dir %{tde_tdeincludedir}
@@ -108,6 +110,8 @@ This package installs the Trinity directory structure.
 %dir %{tde_datadir}/locale/*/*
 %dir %{tde_datadir}/man
 %dir %{tde_datadir}/man/*
+%dir %{tde_datadir}/mime
+%dir %{tde_datadir}/mime/*
 %dir %{tde_datadir}/mimelnk
 %dir %{tde_datadir}/mimelnk/*
 %dir %{tde_datadir}/services
@@ -159,13 +163,14 @@ This package installs the Trinity directory structure.
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/plugin
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/profiles
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/remotes
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/remoteview
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/videothumbnail
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/zeroconf
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/autostart
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/cmake
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/config
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/config/magic
+%__install -d -m 755 %{?buildroot}%{tde_confdir}
+%__install -d -m 755 %{?buildroot}%{tde_confdir}/magic
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/config.kcfg
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/emoticons
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale
@@ -179,6 +184,8 @@ This package installs the Trinity directory structure.
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man7
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man8
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man9
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mime
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mime/packages
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/all
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/application
@@ -206,7 +213,7 @@ This package installs the Trinity directory structure.
 for t in crystalsvg hicolor locolor ; do
   %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}"
   %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/scalable"
-  for i in {16,22,32,48,64,128} ; do
+  for i in {16,22,32,48,64,128,256} ; do
     %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/${i}x${i}"
   done
   
@@ -221,9 +228,37 @@ done
 
 %__install -d -m 755 %{?buildroot}%{tde_docdir}
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}
+
+# HTML directories
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML
-%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/en
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/ca/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/cs/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/da/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/de/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/en/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/en_GB/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/es/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/et/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/fi/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/fr/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/he/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/hu/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/it/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/ja/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/nl/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/pl/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/pt_BR/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/pt/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/ro/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/ru/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/sk/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/sl/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/sr/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/sv/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/tr/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/uk/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/zh_CN/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/zh_TW/common
 
 %__install -d -m 755 %{?buildroot}%{tde_includedir}
 %__install -d -m 755 %{?buildroot}%{tde_tdeincludedir}
@@ -237,6 +272,7 @@ done
 %__install -d -m 755 %{?buildroot}%{_sysconfdir}/trinity
 %__install -d -m 755 %{?buildroot}%{_sysconfdir}/xdg/menus
 
+# Locales directories
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/en_US
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/C
@@ -513,6 +549,7 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/km/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/ko/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/ku/LC_MESSAGES/
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/lo/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/lt/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/mk/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/ms/LC_MESSAGES/
@@ -550,6 +587,7 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/uk/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/uk@cyrillic/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/uz/LC_MESSAGES/
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/uz@cyrillic/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/ven/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/vi/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/xh/LC_MESSAGES/
@@ -572,5 +610,3 @@ done
 
 
 %changelog
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial build for TDE R14
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem-3.5.13.2.spec b/redhat/extras/trinity-filesystem/trinity-filesystem-3.5.13.2.spec
index 4ded620a5..5a8e7f9b0 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem-3.5.13.2.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem-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
@@ -482,5 +482,3 @@ done
 
 
 %changelog
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial build for TDE R14