RPM: Update for final R14.1.1.

Signed-off-by: François Andriot <albator78@libertysurf.fr>

5 files changed, 17 insertions, 7 deletions

diff --git a/redhat/applications/graphics/digikam/digikam.spec b/redhat/applications/graphics/digikam/digikam.spec
index 5c4815399..5eaa31c88 100644
--- a/redhat/applications/graphics/digikam/digikam.spec
+++ b/redhat/applications/graphics/digikam/digikam.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.1
 %endif
 %define tde_pkg digikam
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec b/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec
index e39d2a6da..bb824f3ea 100644
--- a/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec
+++ b/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.1
 %endif
 %define tde_pkg gwenview-i18n
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/graphics/gwenview/gwenview.spec b/redhat/applications/graphics/gwenview/gwenview.spec
index 723996a29..3ae976205 100644
--- a/redhat/applications/graphics/gwenview/gwenview.spec
+++ b/redhat/applications/graphics/gwenview/gwenview.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.1
 %endif
 %define tde_pkg gwenview
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/graphics/ksquirrel/ksquirrel.spec b/redhat/applications/graphics/ksquirrel/ksquirrel.spec
index fc17cceda..97c63fd33 100644
--- a/redhat/applications/graphics/ksquirrel/ksquirrel.spec
+++ b/redhat/applications/graphics/ksquirrel/ksquirrel.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.1
 %endif
 %define tde_pkg ksquirrel
 %define tde_prefix /opt/trinity
@@ -125,6 +125,7 @@ OpenGL and dynamic format support.
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 export kde_confdir="%{tde_confdir}"
 
 # Specific path for RHEL4
@@ -132,6 +133,14 @@ if [ -d /usr/X11R6 ]; then
   export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
+# FIXME: error during ./configure solved by CXXFLAGS below
+export CXXFLAGS="${CXXFLAGS} -I%{tde_tdeincludedir}"
+
+# FIXME: FTBFS during ./configure under rhel8/rhel9
+%if 0%{?rhel} >= 8
+export CXXFLAGS="${CXXFLAGS} -fPIC"
+%endif
+
 # Warning: --enable-final causes FTBFS
 %configure \
   --prefix=%{tde_prefix} \
@@ -160,13 +169,14 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %find_lang %{tde_pkg}
 
+
 %clean
 %__rm -rf %{buildroot}
 
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING LICENSE LICENSE.GFDL LICENSE.LGPL README TODO
+%doc AUTHORS ChangeLog COPYING LICENSE LICENSE.GFDL LICENSE.LGPL README
 %{tde_bindir}/ksquirrel
 %{tde_bindir}/ksquirrel-libs-configurator
 %{tde_bindir}/ksquirrel-libs-configurator-real
@@ -187,9 +197,9 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/mimelnk/image/*.desktop
 %{tde_datadir}/services/ksquirrelpart.desktop
 %{tde_mandir}/man1/ksquirrel.1
+%{tde_mandir}/man1/ksquirrel-libs-configurator.1*
 %config(noreplace) %{tde_confdir}/magic/x-ras.magic.mgc
 %config(noreplace) %{tde_confdir}/magic/x-sun.magic.mgc
 %config(noreplace) %{tde_confdir}/magic/x-utah.magic.mgc
 
-
 %changelog
diff --git a/redhat/applications/graphics/potracegui/potracegui.spec b/redhat/applications/graphics/potracegui/potracegui.spec
index 173c739c1..bf020e880 100644
--- a/redhat/applications/graphics/potracegui/potracegui.spec
+++ b/redhat/applications/graphics/potracegui/potracegui.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.1
 %endif
 %define tde_pkg potracegui
 %define tde_prefix /opt/trinity