RPM: various update to build 14.0.7

16 files changed, 34 insertions, 21 deletions

diff --git a/redhat/applications/filelight/filelight.spec b/redhat/applications/filelight/filelight.spec
index 6c0e2c256..1d227689c 100644
--- a/redhat/applications/filelight/filelight.spec
+++ b/redhat/applications/filelight/filelight.spec
@@ -183,6 +183,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %lang(pt) %{tde_tdedocdir}/HTML/pt/filelight/
 %lang(ru) %{tde_tdedocdir}/HTML/ru/filelight/
 %lang(sv) %{tde_tdedocdir}/HTML/sv/filelight/
+%{tde_mandir}/man1/filelight.1*
 
 
 %changelog
diff --git a/redhat/applications/fusion-icon/fusion-icon.spec b/redhat/applications/fusion-icon/fusion-icon.spec
index a11b2249f..0bd7cedad 100644
--- a/redhat/applications/fusion-icon/fusion-icon.spec
+++ b/redhat/applications/fusion-icon/fusion-icon.spec
@@ -23,10 +23,10 @@
 %define _docdir %{tde_docdir}
 
 
-Name:		trinity-%{tde_pkg}
-Summary:	tray icon to launch and manage Compiz Fusion [Trinity]
-Version:	0.0.0+git20071028
-Release:	2%{?dist}
+Name:			trinity-%{tde_pkg}
+Summary:		tray icon to launch and manage Compiz Fusion [Trinity]
+Version:		0.0.0+git20071028
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 
 License:	GPLv2+
 Group:		Applications/Utilities
diff --git a/redhat/applications/kbookreader/kbookreader.spec b/redhat/applications/kbookreader/kbookreader.spec
index 7757e2023..913d92174 100644
--- a/redhat/applications/kbookreader/kbookreader.spec
+++ b/redhat/applications/kbookreader/kbookreader.spec
@@ -151,7 +151,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/bookreader.desktop" Office Viewer
 %endif
 
-%find_lang %{tde_pkg}
+%find_lang %{tde_pkg} || touch %{tde_pkg}.lang
 
 
 %clean
diff --git a/redhat/applications/kerry/kerry.spec b/redhat/applications/kerry/kerry.spec
index 76469a51a..65ef18872 100644
--- a/redhat/applications/kerry/kerry.spec
+++ b/redhat/applications/kerry/kerry.spec
@@ -16,12 +16,13 @@
 #
 
 # Default version for this component
-%define tde_pkg kerry
 %if "%{?tde_version}" == ""
 %define tde_version 14.0.7
 %endif
 
 # TDE specific building variables
+%define tde_pkg kerry
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -66,6 +67,11 @@ BuildRequires:	cmake >= 2.8
 BuildRequires:	gettext
 BuildRequires:	libbeagle-devel >= 0.3.0
 
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
 
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 BuildRequires:	docbook2x
@@ -151,7 +157,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_tdeappdir}/kcmbeagle.desktop
 %{tde_tdeappdir}/kerry.desktop
 %{tde_datadir}/applnk/.hidden/kcmkerry.desktop
-%{tde_datadir}/apps/kerry/search-running.mng
+%{tde_datadir}/apps/kerry/
 %{tde_datadir}/autostart/beagled.desktop
 %{tde_datadir}/autostart/kerry.autostart.desktop
 %{tde_datadir}/icons/hicolor/*/*/*
diff --git a/redhat/applications/klcddimmer/klcddimmer.spec b/redhat/applications/klcddimmer/klcddimmer.spec
index 27bd3cebf..5ae7ddc9b 100644
--- a/redhat/applications/klcddimmer/klcddimmer.spec
+++ b/redhat/applications/klcddimmer/klcddimmer.spec
@@ -138,7 +138,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
-%find_lang %{tde_pkg}
+%find_lang %{tde_pkg} || touch %{tde_pkg}.lang
 
 
 %clean
diff --git a/redhat/applications/koffice/koffice.spec b/redhat/applications/koffice/koffice.spec
index 411dd344e..6525e00cb 100644
--- a/redhat/applications/koffice/koffice.spec
+++ b/redhat/applications/koffice/koffice.spec
@@ -1066,7 +1066,11 @@ export kde_confdir="%{tde_confdir}"
 
 %if 0%{?suse_version} == 1220
 RD=$(ruby -r rbconfig -e 'printf("%s",Config::CONFIG["rubyhdrdir"])')
-export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux"
+CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux"
+%endif
+
+%if 0%{?suse_version} >= 1550
+CXXFLAGS="${CXXFLAGS} -std=c++11"
 %endif
 
 # FTBFS on RHEL 5
diff --git a/redhat/applications/ktechlab/ktechlab.spec b/redhat/applications/ktechlab/ktechlab.spec
index 6b28f1294..b3a9347c3 100644
--- a/redhat/applications/ktechlab/ktechlab.spec
+++ b/redhat/applications/ktechlab/ktechlab.spec
@@ -66,6 +66,10 @@ BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
 
+%if 0%{?fedora}
+#BuildRequires:	gpsim-devel
+%endif
+
 # SUSE desktop files utility
 %if 0%{?suse_version}
 BuildRequires:	update-desktop-files
diff --git a/redhat/applications/tderadio/tderadio.spec b/redhat/applications/tderadio/tderadio.spec
index 317d3a715..66668190a 100644
--- a/redhat/applications/tderadio/tderadio.spec
+++ b/redhat/applications/tderadio/tderadio.spec
@@ -222,6 +222,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/icons/hicolor/*/*/tderadio*.png
 %{tde_datadir}/icons/locolor/*/*/tderadio*.png
 %lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo
+%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo
 %lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo
 %{tde_tdedocdir}/HTML/en/tderadio/
 
diff --git a/redhat/applications/tdesvn/tdesvn.spec b/redhat/applications/tdesvn/tdesvn.spec
index 710da2f31..b6b907f18 100644
--- a/redhat/applications/tdesvn/tdesvn.spec
+++ b/redhat/applications/tdesvn/tdesvn.spec
@@ -248,7 +248,7 @@ fi
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 rm -f src/svnqt/CMakeLists.txt.orig
-rm -fr src/svnqt/cache/sqlite3/
+#rm -fr src/svnqt/cache/sqlite3/
 
 
 %build
diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec
index 31e3148da..04e66919c 100644
--- a/redhat/dependencies/tqt3/tqt3.spec
+++ b/redhat/dependencies/tqt3/tqt3.spec
@@ -1275,9 +1275,6 @@ echo "suse_version = %{?suse_version}"
 echo "sle_version = %{?sle_version}"
 %endif
 
-# Add missing sqlite3 header
-%__ln_s ../src/sql/drivers/sqlite3/qsql_sqlite3.h include/qsql_sqlite3.h
-
 # fix variables in 'qmake.conf'
 %__sed -i mkspecs/*/qmake.conf \
   -e "s|^QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT		= %{_includedir}/tqt3|" \
diff --git a/redhat/libraries/libksquirrel/libksquirrel.spec b/redhat/libraries/libksquirrel/libksquirrel.spec
index f2476bc2c..2d7ea1b17 100644
--- a/redhat/libraries/libksquirrel/libksquirrel.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel.spec
@@ -534,6 +534,10 @@ fi
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 
+%if 0%{?suse_version} >= 1550
+CXXFLAGS="${CXXFLAGS} -std=c++11"
+%endif
+
 %configure \
   --prefix=%{tde_prefix} \
   --exec-prefix=%{tde_prefix} \
diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec
index 675f530b7..7bf154950 100644
--- a/redhat/main/tdebase/tdebase.spec
+++ b/redhat/main/tdebase/tdebase.spec
@@ -3564,7 +3564,6 @@ fi
 # Fedora 18 / RHEL 7: no more SYSV init script, we have to use systemd to launch TDM.
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 %__install -D -m 644 "%{SOURCE7}" "%{?buildroot}/usr/lib/systemd/system/tdm.service"
-%__sed -i "s|kdm|tdm|g" "%{?buildroot}/usr/lib/systemd/system/tdm.service"
 %endif
 
 # SELINUX policy for RHEL / Fedora
diff --git a/redhat/main/tdebase/tdm.service.el7 b/redhat/main/tdebase/tdm.service.el7
index 4c6136d94..9ef7e07ff 100644
--- a/redhat/main/tdebase/tdm.service.el7
+++ b/redhat/main/tdebase/tdm.service.el7
@@ -4,7 +4,7 @@ Conflicts=getty@tty1.service
 After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
 
 [Service]
-ExecStart=/opt/trinity/bin/kdm
+ExecStart=/opt/trinity/bin/tdm
 Restart=always
 IgnoreSIGPIPE=no
 
diff --git a/redhat/main/tdebase/tdm.service.fc30 b/redhat/main/tdebase/tdm.service.fc30
index 4c6136d94..9ef7e07ff 100644
--- a/redhat/main/tdebase/tdm.service.fc30
+++ b/redhat/main/tdebase/tdm.service.fc30
@@ -4,7 +4,7 @@ Conflicts=getty@tty1.service
 After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
 
 [Service]
-ExecStart=/opt/trinity/bin/kdm
+ExecStart=/opt/trinity/bin/tdm
 Restart=always
 IgnoreSIGPIPE=no
 
diff --git a/redhat/main/tdebase/tdm.service.fc31 b/redhat/main/tdebase/tdm.service.fc31
index 4c6136d94..9ef7e07ff 100644
--- a/redhat/main/tdebase/tdm.service.fc31
+++ b/redhat/main/tdebase/tdm.service.fc31
@@ -4,7 +4,7 @@ Conflicts=getty@tty1.service
 After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
 
 [Service]
-ExecStart=/opt/trinity/bin/kdm
+ExecStart=/opt/trinity/bin/tdm
 Restart=always
 IgnoreSIGPIPE=no
 
diff --git a/redhat/main/tdelibs/tdelibs.spec b/redhat/main/tdelibs/tdelibs.spec
index 5d6073f76..c0b3e2f0a 100644
--- a/redhat/main/tdelibs/tdelibs.spec
+++ b/redhat/main/tdelibs/tdelibs.spec
@@ -358,7 +358,7 @@ BuildRequires:	libudev-devel
 %endif
 
 # UDISKS support
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} == 6
+%if 0%{?rhel} == 6
 %if 0%{?pclinuxos} == 0 && 0%{?suse_version} <= 1310
 %define with_udisks 1
 BuildRequires:	udisks-devel
@@ -366,9 +366,6 @@ Requires:		udisks
 %endif
 %endif
 
-# PMOUNT support
-#Requires:		pmount
-
 # UDISKS2 support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 7
 %define with_udisks2 1