summaryrefslogtreecommitdiffstats
path: root/redhat/applications
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/applications')
-rw-r--r--redhat/applications/development/kdbg/kdbg.spec4
-rw-r--r--redhat/applications/development/kdiff3/kdiff3.spec12
-rw-r--r--redhat/applications/development/kpicosim/kpicosim.spec12
-rw-r--r--redhat/applications/development/kscope/kscope.spec4
-rw-r--r--redhat/applications/development/ktechlab/ktechlab.spec4
-rw-r--r--redhat/applications/development/kxmleditor/kxmleditor.spec21
-rw-r--r--redhat/applications/development/piklab/piklab.spec6
-rw-r--r--redhat/applications/development/tdesvn/tdesvn.spec20
-rw-r--r--redhat/applications/games/knights/knights.spec12
-rw-r--r--redhat/applications/games/tdepacman/tdepacman.spec4
-rw-r--r--redhat/applications/graphics/digikam/digikam.spec14
-rw-r--r--redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec4
-rw-r--r--redhat/applications/graphics/gwenview/gwenview.spec58
-rw-r--r--redhat/applications/graphics/ksquirrel/ksquirrel.spec22
-rw-r--r--redhat/applications/graphics/potracegui/potracegui.spec12
-rw-r--r--redhat/applications/internet/kasablanca/kasablanca.spec12
-rw-r--r--redhat/applications/internet/kbiff/kbiff.spec12
-rw-r--r--redhat/applications/internet/kftpgrabber/kftpgrabber.spec8
-rw-r--r--redhat/applications/internet/knmap/knmap.spec12
-rw-r--r--redhat/applications/internet/konversation/konversation.spec17
-rw-r--r--redhat/applications/internet/kopete-otr/kopete-otr.spec9
-rw-r--r--redhat/applications/internet/kshowmail/kshowmail.spec12
-rw-r--r--redhat/applications/internet/kstreamripper/kstreamripper.spec4
-rw-r--r--redhat/applications/internet/ktorrent/ktorrent.spec4
-rw-r--r--redhat/applications/internet/kvirc/kvirc.spec14
-rw-r--r--redhat/applications/internet/kvpnc/kvpnc.spec22
-rw-r--r--redhat/applications/internet/smb4k/smb4k.spec63
-rw-r--r--redhat/applications/internet/tork/tork.spec12
-rw-r--r--redhat/applications/misc/bibletime/bibletime.spec4
-rw-r--r--redhat/applications/misc/fusion-icon/fusion-icon.spec2
-rw-r--r--redhat/applications/misc/kcmldap/kcmldap.spec21
-rw-r--r--redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec23
-rw-r--r--redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec20
-rw-r--r--redhat/applications/misc/kerberostray/kerberostray.spec20
-rw-r--r--redhat/applications/misc/krecipes/krecipes.spec12
-rw-r--r--redhat/applications/multimedia/amarok/amarok.spec62
-rw-r--r--redhat/applications/multimedia/codeine/codeine.spec8
-rw-r--r--redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec4
-rw-r--r--redhat/applications/multimedia/k3b/k3b.spec66
-rw-r--r--redhat/applications/multimedia/k9copy/k9copy.spec59
-rw-r--r--redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec14
-rw-r--r--redhat/applications/multimedia/kaffeine/kaffeine.spec24
-rw-r--r--redhat/applications/multimedia/kmplayer/kmplayer.spec34
-rw-r--r--redhat/applications/multimedia/kplayer/kplayer.spec12
-rw-r--r--redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec9
-rw-r--r--redhat/applications/multimedia/rosegarden/rosegarden.spec39
-rw-r--r--redhat/applications/multimedia/soundkonverter/soundkonverter.spec10
-rw-r--r--redhat/applications/multimedia/tderadio/tderadio.spec15
-rw-r--r--redhat/applications/office/basket/basket.spec4
-rw-r--r--redhat/applications/office/kbibtex/kbibtex.spec18
-rw-r--r--redhat/applications/office/kbookreader/kbookreader.spec12
-rw-r--r--redhat/applications/office/keximdb/keximdb.spec12
-rw-r--r--redhat/applications/office/kile/kile.spec4
-rw-r--r--redhat/applications/office/kmymoney/kmymoney.spec10
-rw-r--r--redhat/applications/office/knowit/knowit.spec12
-rw-r--r--redhat/applications/office/koffice-i18n/koffice-i18n.spec5
-rw-r--r--redhat/applications/office/koffice/koffice.spec102
-rw-r--r--redhat/applications/office/kpilot/kpilot.spec19
-rw-r--r--redhat/applications/office/tellico/tellico.spec32
-rw-r--r--redhat/applications/settings/kima/kima.spec12
-rw-r--r--redhat/applications/settings/kiosktool/kiosktool.spec12
-rw-r--r--redhat/applications/settings/kkbswitch/kkbswitch.spec16
-rw-r--r--redhat/applications/settings/klcddimmer/klcddimmer.spec8
-rw-r--r--redhat/applications/settings/kmyfirewall/kmyfirewall.spec5
-rw-r--r--redhat/applications/settings/tde-guidance/tde-guidance.spec326
-rw-r--r--redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec4
-rw-r--r--redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec26
-rw-r--r--redhat/applications/settings/tdesudo/tdesudo.spec12
-rw-r--r--redhat/applications/settings/wlassistant/wlassistant.spec8
-rw-r--r--redhat/applications/system/dolphin/dolphin.spec12
-rw-r--r--redhat/applications/system/katapult/katapult.spec12
-rw-r--r--redhat/applications/system/kbfx/kbfx.spec13
-rw-r--r--redhat/applications/system/kcmautostart/kcmautostart.spec12
-rw-r--r--redhat/applications/system/kdbusnotification/kdbusnotification.spec16
-rw-r--r--redhat/applications/system/klamav/klamav.spec17
-rw-r--r--redhat/applications/system/knemo/knemo.spec30
-rw-r--r--redhat/applications/system/knetload/knetload.spec12
-rw-r--r--redhat/applications/system/knetstats/knetstats.spec12
-rw-r--r--redhat/applications/system/kooldock/kooldock.spec12
-rw-r--r--redhat/applications/system/krusader/krusader.spec5
-rw-r--r--redhat/applications/system/kshutdown/kshutdown.spec12
-rw-r--r--redhat/applications/system/ksystemlog/ksystemlog.spec4
-rw-r--r--redhat/applications/system/kvkbd/kvkbd.spec12
-rw-r--r--redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec4
-rw-r--r--redhat/applications/system/smartcardauth/smartcardauth.spec4
-rw-r--r--redhat/applications/system/tastymenu/tastymenu.spec12
-rw-r--r--redhat/applications/system/tdebluez/tdebluez.spec8
-rw-r--r--redhat/applications/system/tdedocker/tdedocker.spec19
-rw-r--r--redhat/applications/system/tdepowersave/tdepowersave.spec16
-rw-r--r--redhat/applications/system/tdesshaskpass/tdesshaskpass.spec16
-rw-r--r--redhat/applications/system/yakuake/yakuake.spec12
-rw-r--r--redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec12
-rw-r--r--redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec8
-rw-r--r--redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec12
-rw-r--r--redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec8
-rw-r--r--redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec12
-rw-r--r--redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec12
-rw-r--r--redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec12
-rw-r--r--redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec8
-rw-r--r--redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec48
-rw-r--r--redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec16
-rw-r--r--redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec10
-rw-r--r--redhat/applications/themes/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec2
-rw-r--r--redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec12
-rw-r--r--redhat/applications/themes/tde-style-domino/tde-style-domino.spec14
-rw-r--r--redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec16
-rw-r--r--redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec8
-rw-r--r--redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec149
-rw-r--r--redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec12
-rw-r--r--redhat/applications/themes/tdmtheme/tdmtheme.spec12
-rw-r--r--redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec4
-rw-r--r--redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec4
-rw-r--r--redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec158
-rw-r--r--redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec6
-rw-r--r--redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec4
-rw-r--r--redhat/applications/utilities/abakus/abakus.spec12
-rw-r--r--redhat/applications/utilities/filelight/filelight.spec19
-rw-r--r--redhat/applications/utilities/kbarcode/kbarcode.spec12
-rw-r--r--redhat/applications/utilities/kchmviewer/kchmviewer.spec12
-rw-r--r--redhat/applications/utilities/kcpuload/kcpuload.spec8
-rw-r--r--redhat/applications/utilities/kdirstat/kdirstat.spec12
-rw-r--r--redhat/applications/utilities/keep/keep.spec12
-rw-r--r--redhat/applications/utilities/knutclient/knutclient.spec15
-rw-r--r--redhat/applications/utilities/kommando/kommando.spec162
-rw-r--r--redhat/applications/utilities/kompose/kompose.spec4
-rw-r--r--redhat/applications/utilities/krename/krename.spec12
-rw-r--r--redhat/applications/utilities/ksensors/ksensors.spec8
-rw-r--r--redhat/applications/utilities/mathemagics/mathemagics.spec4
-rw-r--r--redhat/applications/utilities/qalculate-tde/qalculate-tde.spec8
129 files changed, 1999 insertions, 659 deletions
diff --git a/redhat/applications/development/kdbg/kdbg.spec b/redhat/applications/development/kdbg/kdbg.spec
index 593ff73da..0a0040b0d 100644
--- a/redhat/applications/development/kdbg/kdbg.spec
+++ b/redhat/applications/development/kdbg/kdbg.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.2
%endif
%define tde_pkg kdbg
%define tde_prefix /opt/trinity
@@ -120,7 +120,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/development/kdiff3/kdiff3.spec b/redhat/applications/development/kdiff3/kdiff3.spec
index 085e83b9f..bd55c3ed1 100644
--- a/redhat/applications/development/kdiff3/kdiff3.spec
+++ b/redhat/applications/development/kdiff3/kdiff3.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.2
%endif
%define tde_pkg kdiff3
%define tde_prefix /opt/trinity
@@ -71,13 +71,21 @@ BuildRequires: update-desktop-files
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -106,7 +114,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/development/kpicosim/kpicosim.spec b/redhat/applications/development/kpicosim/kpicosim.spec
index bd6a45ea8..a1a5cf4d6 100644
--- a/redhat/applications/development/kpicosim/kpicosim.spec
+++ b/redhat/applications/development/kpicosim/kpicosim.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.2
%endif
%define tde_pkg kpicosim
%define tde_prefix /opt/trinity
@@ -70,10 +70,18 @@ BuildRequires: fdupes
BuildRequires: libidn-devel
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -110,7 +118,7 @@ simulator and export functions to VHDL, HEX and MEM files.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/development/kscope/kscope.spec b/redhat/applications/development/kscope/kscope.spec
index 36bade6eb..464bc87a9 100644
--- a/redhat/applications/development/kscope/kscope.spec
+++ b/redhat/applications/development/kscope/kscope.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.2
%endif
%define tde_pkg kscope
%define tde_prefix /opt/trinity
@@ -129,7 +129,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/development/ktechlab/ktechlab.spec b/redhat/applications/development/ktechlab/ktechlab.spec
index 84364ac92..b29b35c3c 100644
--- a/redhat/applications/development/ktechlab/ktechlab.spec
+++ b/redhat/applications/development/ktechlab/ktechlab.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.2
%endif
%define tde_pkg ktechlab
%define tde_prefix /opt/trinity
@@ -106,7 +106,7 @@ Homepage: http://ktechlab.org/
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/development/kxmleditor/kxmleditor.spec b/redhat/applications/development/kxmleditor/kxmleditor.spec
index e380101ae..02f005d10 100644
--- a/redhat/applications/development/kxmleditor/kxmleditor.spec
+++ b/redhat/applications/development/kxmleditor/kxmleditor.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.2
%endif
%define tde_pkg kxmleditor
%define tde_prefix /opt/trinity
@@ -87,6 +87,21 @@ contents.
##########
+%package devel
+Group: Applications/Multimedia
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Summary: XML Editor for TDE (development files)
+
+%description devel
+Development files for KXMLEditor.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libkxmleditorpart.la
+%{tde_libdir}/libkxmleditorpart.so
+
+##########
+
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
@@ -98,7 +113,7 @@ contents.
%build
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -143,8 +158,6 @@ export PATH="%{tde_bindir}:${PATH}"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%{tde_bindir}/kxmleditor
-%{tde_libdir}/libkxmleditorpart.la
-%{tde_libdir}/libkxmleditorpart.so
%{tde_libdir}/libkxmleditorpart.so.1
%{tde_libdir}/libkxmleditorpart.so.1.0.0
%{tde_tdeappdir}/kxmleditor.desktop
diff --git a/redhat/applications/development/piklab/piklab.spec b/redhat/applications/development/piklab/piklab.spec
index ddc1c3123..6c354769d 100644
--- a/redhat/applications/development/piklab/piklab.spec
+++ b/redhat/applications/development/piklab/piklab.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.2
%endif
%define tde_pkg piklab
%define tde_prefix /opt/trinity
@@ -80,7 +80,7 @@ BuildRequires: brp-check-trinity
BuildRequires: readline-devel
# LIBUSB support
-%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?mdkver} || 0%{?pclinuxos}
BuildRequires: %{_lib}usb1.0-devel
BuildRequires: %{_lib}usb-compat0.1-devel
%else
@@ -116,7 +116,7 @@ are supported. A command-line programmer and debugger are also available.
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
diff --git a/redhat/applications/development/tdesvn/tdesvn.spec b/redhat/applications/development/tdesvn/tdesvn.spec
index 98047b557..f77bbd3b5 100644
--- a/redhat/applications/development/tdesvn/tdesvn.spec
+++ b/redhat/applications/development/tdesvn/tdesvn.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.2
%endif
%define tde_pkg tdesvn
%define tde_prefix /opt/trinity
@@ -79,12 +79,20 @@ BuildRequires: brp-check-trinity
# SVN support
BuildRequires: subversion-devel
-# SQLITE support
-BuildRequires: sqlite-devel
+# SQLITE3 support
+%if 0%{?mgaversion}
+BuildRequires: sqlite3-devel
+%else
+BuildRequires: sqlite-devel
+%endif
BuildRequires: libtqt3-mt-sqlite3
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
@@ -97,7 +105,11 @@ BuildRequires: gamin-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -257,7 +269,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/games/knights/knights.spec b/redhat/applications/games/knights/knights.spec
index 027d087be..5962f316b 100644
--- a/redhat/applications/games/knights/knights.spec
+++ b/redhat/applications/games/knights/knights.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.2
%endif
%define tde_pkg knights
%define tde_prefix /opt/trinity
@@ -67,13 +67,21 @@ BuildRequires: pkgconfig
BuildRequires: libtool
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -121,7 +129,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/games/tdepacman/tdepacman.spec b/redhat/applications/games/tdepacman/tdepacman.spec
index 348b72e65..3c4989111 100644
--- a/redhat/applications/games/tdepacman/tdepacman.spec
+++ b/redhat/applications/games/tdepacman/tdepacman.spec
@@ -18,7 +18,7 @@
# Default version for this component
%define tde_pkg tdepacman
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
# TDE specific building variables
@@ -93,7 +93,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/graphics/digikam/digikam.spec b/redhat/applications/graphics/digikam/digikam.spec
index 5c4815399..16753d951 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.2
%endif
%define tde_pkg digikam
%define tde_prefix /opt/trinity
@@ -70,7 +70,13 @@ BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
+# TIFF support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}tiff-devel
+%else
BuildRequires: libtiff-devel
+%endif
+
BuildRequires: gettext
# SUSE desktop files utility
@@ -92,7 +98,11 @@ BuildRequires: lcms-devel
# GPHOTO2 support
%if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gphoto-devel
+%else
BuildRequires: gphoto2-devel
+%endif
%else
BuildRequires: libgphoto2-devel
%endif
@@ -324,7 +334,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
diff --git a/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec b/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec
index e39d2a6da..f4c3d5a2e 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.2
%endif
%define tde_pkg gwenview-i18n
%define tde_prefix /opt/trinity
@@ -112,7 +112,7 @@ KIPI image framework.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/graphics/gwenview/gwenview.spec b/redhat/applications/graphics/gwenview/gwenview.spec
index 723996a29..77b1fc987 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.2
%endif
%define tde_pkg gwenview
%define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -118,40 +118,46 @@ KIPI image framework.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --docdir=%{tde_tdedocdir} \
- --includedir=%{tde_tdeincludedir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+ %__mkdir_p build
+ cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ \
+ -DWITH_ALL_OPTIONS=ON \
+ -DBUILD_ALL=ON \
+ ..
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
# Removes useless files (-devel ?)
%__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so
@@ -207,8 +213,10 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/icons/hicolor/scalable/apps/gvdirpart.svg
%{tde_datadir}/icons/hicolor/scalable/apps/gwenview.svgz
%{tde_datadir}/man/man1/gwenview.1*
+%{tde_datadir}/pixmaps/gwenview.xpm
%{tde_datadir}/services/gvdirpart.desktop
%{tde_datadir}/services/gvimagepart.desktop
%lang(en) %{tde_tdedocdir}/HTML/en/gwenview/
+
%changelog
diff --git a/redhat/applications/graphics/ksquirrel/ksquirrel.spec b/redhat/applications/graphics/ksquirrel/ksquirrel.spec
index fc17cceda..670670175 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.2
%endif
%define tde_pkg ksquirrel
%define tde_prefix /opt/trinity
@@ -85,8 +85,12 @@ BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}glu-devel
+%else
BuildRequires: mesaglu-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
@@ -118,13 +122,14 @@ OpenGL and dynamic format support.
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%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 +137,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 +173,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 +201,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..db50315dc 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.2
%endif
%define tde_pkg potracegui
%define tde_prefix /opt/trinity
@@ -66,13 +66,21 @@ BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -110,7 +118,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/internet/kasablanca/kasablanca.spec b/redhat/applications/internet/kasablanca/kasablanca.spec
index 06004d5f4..7d956ef72 100644
--- a/redhat/applications/internet/kasablanca/kasablanca.spec
+++ b/redhat/applications/internet/kasablanca/kasablanca.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.2
%endif
%define tde_pkg kasablanca
%define tde_prefix /opt/trinity
@@ -78,13 +78,21 @@ BuildRequires: brp-check-trinity
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# UTEMPTER support
%if 0%{?suse_version}
@@ -129,7 +137,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/internet/kbiff/kbiff.spec b/redhat/applications/internet/kbiff/kbiff.spec
index b7dcdd2ba..719fe4931 100644
--- a/redhat/applications/internet/kbiff/kbiff.spec
+++ b/redhat/applications/internet/kbiff/kbiff.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.2
%endif
%define tde_pkg kbiff
%define tde_prefix /opt/trinity
@@ -69,13 +69,21 @@ BuildRequires: gcc-c++
BuildRequires: pkgconfig
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -112,7 +120,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/internet/kftpgrabber/kftpgrabber.spec b/redhat/applications/internet/kftpgrabber/kftpgrabber.spec
index 6dd764389..3c6ef1d42 100644
--- a/redhat/applications/internet/kftpgrabber/kftpgrabber.spec
+++ b/redhat/applications/internet/kftpgrabber/kftpgrabber.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.2
%endif
%define tde_pkg kftpgrabber
%define tde_prefix /opt/trinity
@@ -76,7 +76,11 @@ BuildRequires: brp-check-trinity
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -129,7 +133,7 @@ Requires: %{name} = %{version}-%{release}
unset QTDIR QTINC QTDIR
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/internet/knmap/knmap.spec b/redhat/applications/internet/knmap/knmap.spec
index 6317ab30d..14ade96fd 100644
--- a/redhat/applications/internet/knmap/knmap.spec
+++ b/redhat/applications/internet/knmap/knmap.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.2
%endif
%define tde_pkg knmap
%define tde_prefix /opt/trinity
@@ -68,13 +68,21 @@ BuildRequires: pkgconfig
BuildRequires: libtool
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -123,7 +131,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/internet/konversation/konversation.spec b/redhat/applications/internet/konversation/konversation.spec
index f368e749f..69f7bc141 100644
--- a/redhat/applications/internet/konversation/konversation.spec
+++ b/redhat/applications/internet/konversation/konversation.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.2
%endif
%define tde_pkg konversation
%define tde_prefix /opt/trinity
@@ -66,13 +66,21 @@ BuildRequires: gcc-c++
BuildRequires: pkgconfig
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# PYTHON support
%global python python3
@@ -93,7 +101,12 @@ BuildRequires: brp-check-trinity
%endif
# XSLT support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xslt-devel
+%else
BuildRequires: libxslt-devel
+%endif
+
%if 0%{?suse_version}
BuildRequires: docbook-xsl-stylesheets
%else
@@ -199,7 +212,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/internet/kopete-otr/kopete-otr.spec b/redhat/applications/internet/kopete-otr/kopete-otr.spec
index df690fe31..1bc95975d 100644
--- a/redhat/applications/internet/kopete-otr/kopete-otr.spec
+++ b/redhat/applications/internet/kopete-otr/kopete-otr.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.2
%endif
%define tde_pkg kopete-otr
%define tde_prefix /opt/trinity
@@ -83,8 +83,11 @@ BuildRequires: brp-check-trinity
%endif
# OTR support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}otr-devel
+%else
BuildRequires: libotr-devel
-
+%endif
%description
This plugin enables Off-The-Record encryption for the TDE instant
@@ -110,7 +113,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/internet/kshowmail/kshowmail.spec b/redhat/applications/internet/kshowmail/kshowmail.spec
index 286488b60..e1c7d3e1a 100644
--- a/redhat/applications/internet/kshowmail/kshowmail.spec
+++ b/redhat/applications/internet/kshowmail/kshowmail.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.2
%endif
%define tde_pkg kshowmail
%define tde_prefix /opt/trinity
@@ -77,13 +77,21 @@ BuildRequires: brp-check-trinity
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -108,7 +116,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/internet/kstreamripper/kstreamripper.spec b/redhat/applications/internet/kstreamripper/kstreamripper.spec
index 3360fc21f..fa2fbcb33 100644
--- a/redhat/applications/internet/kstreamripper/kstreamripper.spec
+++ b/redhat/applications/internet/kstreamripper/kstreamripper.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.2
%endif
%define tde_pkg kstreamripper
%define tde_prefix /opt/trinity
@@ -103,7 +103,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/internet/ktorrent/ktorrent.spec b/redhat/applications/internet/ktorrent/ktorrent.spec
index 4cb54d155..d67deae4f 100644
--- a/redhat/applications/internet/ktorrent/ktorrent.spec
+++ b/redhat/applications/internet/ktorrent/ktorrent.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.2
%endif
%define tde_pkg ktorrent
%define tde_prefix /opt/trinity
@@ -123,7 +123,7 @@ enabling background downloading.
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
diff --git a/redhat/applications/internet/kvirc/kvirc.spec b/redhat/applications/internet/kvirc/kvirc.spec
index da3af96ad..a4b2b7fcc 100644
--- a/redhat/applications/internet/kvirc/kvirc.spec
+++ b/redhat/applications/internet/kvirc/kvirc.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kvirc
%define tde_prefix /opt/trinity
@@ -143,7 +143,7 @@ with the K Desktop Environment version 3.
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
./autogen.sh
@@ -172,10 +172,10 @@ export PATH="%{tde_bindir}:${PATH}"
--with-kde-services-dir=%{tde_datadir}/services \
--with-kde-library-dir=%{tde_libdir} \
--with-kde-include-dir=%{tde_tdeincludedir} \
- --with-qt-name=tqt \
- --with-qt-library-dir=%{_libdir} \
- --with-qt-include-dir=%{_includedir}/tqt3 \
- --with-qt-moc=%{_bindir}/tmoc
+ --with-tqt-name=tqt \
+ --with-tqt-library-dir=%{_libdir} \
+ --with-tqt-include-dir=%{_includedir}/tqt3 \
+ --with-tqt-moc=%{_bindir}/tmoc
# Symbolic links must exist prior to parallel building
%__make symlinks -C src/kvilib/build
@@ -227,6 +227,8 @@ export PATH="%{tde_bindir}:${PATH}"
%exclude %{tde_libdir}/kvirc/*/modules/*.so
%{tde_libdir}/kvirc/
%{tde_tdeappdir}/kvirc.desktop
+%{tde_datadir}/apps/tdeconf_update/kvirc_soundsystem.upd
+%{tde_datadir}/apps/tdeconf_update/kvirc_soundsystem_upd.sh
%{tde_datadir}/icons/hicolor/*/*/*.png
%{tde_datadir}/icons/hicolor/*/*/*.svgz
%{tde_datadir}/icons/hicolor/*/*/*.xpm
diff --git a/redhat/applications/internet/kvpnc/kvpnc.spec b/redhat/applications/internet/kvpnc/kvpnc.spec
index 2a9d9ca92..9983af3e4 100644
--- a/redhat/applications/internet/kvpnc/kvpnc.spec
+++ b/redhat/applications/internet/kvpnc/kvpnc.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.2
%endif
%define tde_pkg kvpnc
%define tde_prefix /opt/trinity
@@ -67,13 +67,28 @@ BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
+
+# GCRYPT support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gcrypt-devel >= 1.2.0
+%else
+BuildRequires: libgcrypt-devel >= 1.2.0
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -85,9 +100,6 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity
%endif
-BuildRequires: libgcrypt-devel >= 1.2.0
-
-
%description
KVpnc is a TDE frontend for various vpn clients.
@@ -116,7 +128,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/internet/smb4k/smb4k.spec b/redhat/applications/internet/smb4k/smb4k.spec
index 8d1ee44d5..73799b17c 100644
--- a/redhat/applications/internet/smb4k/smb4k.spec
+++ b/redhat/applications/internet/smb4k/smb4k.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.2
%endif
%define tde_pkg smb4k
%define tde_prefix /opt/trinity
@@ -58,11 +58,13 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake
BuildRequires: gcc-c++
+BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -143,41 +145,44 @@ Requires: %{name} = %{version}-%{release}
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
%build
unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- --includedir=%{tde_tdeincludedir} \
- --program-prefix="" \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+ %__mkdir_p build
+ cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-final \
- --enable-new-ldflags \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON" \
+ ..
-# SMP safe !
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__rm -fr $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
%find_lang %{tde_pkg}
diff --git a/redhat/applications/internet/tork/tork.spec b/redhat/applications/internet/tork/tork.spec
index 66d721f6b..97c96d3a4 100644
--- a/redhat/applications/internet/tork/tork.spec
+++ b/redhat/applications/internet/tork/tork.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.2
%endif
%define tde_pkg tork
%define tde_prefix /opt/trinity
@@ -80,12 +80,18 @@ BuildRequires: brp-check-trinity
BuildRequires: torsocks
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# GEOIP
%if 0%{?suse_version}
%if 0%{?suse_version} < 1550
BuildRequires: libGeoIP-devel
+%else
+%define with_embedded_geoip 1
%endif
%else
BuildRequires: geoip-devel
@@ -114,7 +120,7 @@ on the Tor network.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -135,6 +141,8 @@ fi
\
-DBUILD_ALL=ON \
-DWITH_ALL_OPTIONS=ON \
+ -DWITH_EMBEDDED_GEOIP=%{?with_embedded_geoip:ON}%{?!with_embedded_geoip:OFF} \
+ -DWITH_GNUTLS=ON \
\
..
diff --git a/redhat/applications/misc/bibletime/bibletime.spec b/redhat/applications/misc/bibletime/bibletime.spec
index ad1fe5dcb..edb5ff5c9 100644
--- a/redhat/applications/misc/bibletime/bibletime.spec
+++ b/redhat/applications/misc/bibletime/bibletime.spec
@@ -23,7 +23,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg bibletime
%define tde_prefix /opt/trinity
@@ -120,7 +120,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/misc/fusion-icon/fusion-icon.spec b/redhat/applications/misc/fusion-icon/fusion-icon.spec
index e3f8bf5cb..986dec31c 100644
--- a/redhat/applications/misc/fusion-icon/fusion-icon.spec
+++ b/redhat/applications/misc/fusion-icon/fusion-icon.spec
@@ -1,6 +1,6 @@
# Default version for this component
%define tde_pkg fusion-icon
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%if "%{?python2_sitelib}" == ""
%define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
diff --git a/redhat/applications/misc/kcmldap/kcmldap.spec b/redhat/applications/misc/kcmldap/kcmldap.spec
index 68af31207..b44904f44 100644
--- a/redhat/applications/misc/kcmldap/kcmldap.spec
+++ b/redhat/applications/misc/kcmldap/kcmldap.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.2
%endif
%define tde_pkg kcmldap
%define tde_prefix /opt/trinity
@@ -72,13 +72,21 @@ BuildRequires: gcc-c++
BuildRequires: pkgconfig
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -92,8 +100,12 @@ BuildRequires: brp-check-trinity
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires: lib64ldap-devel
+%else
BuildRequires: openldap-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: openldap2-devel
%endif
@@ -115,8 +127,12 @@ BuildRequires: libheimdal-devel
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%define with_tdehwlib 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}udev-devel
+%else
BuildRequires: libudev-devel
%endif
+%endif
# LIBCOM_ERR support
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
@@ -152,6 +168,7 @@ This is a TDE control center module to manage TDE connections to Kerberos realms
%dir %{tde_datadir}/pixmaps
%{tde_datadir}/pixmaps/kcmldapbonding_step1.png
%{tde_datadir}/pixmaps/kcmldapbonding_step3.png
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kcmldap.mo
##########
@@ -186,7 +203,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec
index c99c0b685..cacb6565a 100644
--- a/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec
+++ b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.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.2
%endif
%define tde_pkg kcmldapcontroller
%define tde_prefix /opt/trinity
@@ -79,8 +79,12 @@ BuildRequires: brp-check-trinity
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires: lib64ldap-devel
+%else
BuildRequires: openldap-devel
%endif
+%endif
%if 0%{?mgaversion} >= 6
BuildRequires: openldap-servers-devel
%endif
@@ -105,8 +109,12 @@ BuildRequires: libheimdal-devel
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%define with_tdehwlib 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}udev-devel
+%else
BuildRequires: libudev-devel
%endif
+%endif
# LIBCOM_ERR support
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
@@ -117,13 +125,21 @@ BuildRequires: %{_lib}ext2fs-devel
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
Requires: trinity-kcontrol-ldap-controller = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -146,7 +162,7 @@ This is a TDE control center module to manage users, groups, and machines in Ker
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{tde_bindir}/primaryrccertupdater
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?rhel} >= 7
+%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} || 0%{?rhel} >= 7
%{tde_libdir}/slapi-acl-manager.la
%{tde_libdir}/slapi-acl-manager.so
%endif
@@ -157,6 +173,7 @@ This is a TDE control center module to manage users, groups, and machines in Ker
%dir %{tde_datadir}/pixmaps
%{tde_datadir}/pixmaps/kcmldapcontroller_step1.png
%{tde_datadir}/pixmaps/kcmldapcontroller_step4.png
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kcmldapcontroller.mo
##########
@@ -180,7 +197,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec
index bbe317e3d..06875f9c1 100644
--- a/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec
+++ b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.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.2
%endif
%define tde_pkg kcmldapmanager
%define tde_prefix /opt/trinity
@@ -79,8 +79,12 @@ BuildRequires: brp-check-trinity
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires: lib64ldap-devel
+%else
BuildRequires: openldap-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: openldap2-devel
%endif
@@ -102,8 +106,12 @@ BuildRequires: libheimdal-devel
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%define with_tdehwlib 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}udev-devel
+%else
BuildRequires: libudev-devel
%endif
+%endif
# LIBCOM_ERR support
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
@@ -114,13 +122,21 @@ BuildRequires: %{_lib}ext2fs-devel
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
Requires: trinity-kcontrol-ldap-manager = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -164,7 +180,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/misc/kerberostray/kerberostray.spec b/redhat/applications/misc/kerberostray/kerberostray.spec
index 38e159c48..10ea73152 100644
--- a/redhat/applications/misc/kerberostray/kerberostray.spec
+++ b/redhat/applications/misc/kerberostray/kerberostray.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.2
%endif
%define tde_pkg kerberostray
%define tde_prefix /opt/trinity
@@ -79,8 +79,12 @@ BuildRequires: brp-check-trinity
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires: lib64ldap-devel
+%else
BuildRequires: openldap-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: openldap2-devel
%endif
@@ -102,8 +106,12 @@ BuildRequires: libheimdal-devel
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%define with_tdehwlib 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}udev-devel
+%else
BuildRequires: libudev-devel
%endif
+%endif
# LIBCOM_ERR support
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
@@ -114,13 +122,21 @@ BuildRequires: %{_lib}ext2fs-devel
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -143,7 +159,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/misc/krecipes/krecipes.spec b/redhat/applications/misc/krecipes/krecipes.spec
index e2f5fa46d..d457bfd82 100644
--- a/redhat/applications/misc/krecipes/krecipes.spec
+++ b/redhat/applications/misc/krecipes/krecipes.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.2
%endif
%define tde_pkg krecipes
%define tde_prefix /opt/trinity
@@ -86,8 +86,12 @@ BuildRequires: postgresql-server-devel
BuildRequires: postgresql-devel
%endif
-# SQLITE support
-BuildRequires: sqlite-devel
+# SQLITE3 support
+%if 0%{?mgaversion}
+BuildRequires: sqlite3-devel
+%else
+BuildRequires: sqlite-devel
+%endif
%description
@@ -109,7 +113,7 @@ databases.
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
diff --git a/redhat/applications/multimedia/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec
index d0aa408ce..2f5b51151 100644
--- a/redhat/applications/multimedia/amarok/amarok.spec
+++ b/redhat/applications/multimedia/amarok/amarok.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.2
%endif
%define tde_pkg amarok
%define tde_prefix /opt/trinity
@@ -72,7 +72,11 @@ BuildRequires: pkgconfig
BuildRequires: gettext
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -84,11 +88,15 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity
%endif
-# ALSA support
-BuildRequires: alsa-lib-devel
+# ALSA supportl
+%if 0%{?mdkver}
+BuildRequires: %{_lib}asound-devel
+%else
+BuildRequires: alsa-lib-devel
+%endif
# ESOUND support
-BuildRequires: esound-devel
+#BuildRequires: esound-devel
# PCRE support
BuildRequires: pcre-devel
@@ -106,9 +114,21 @@ BuildRequires: libusb-compat-0.1-devel
BuildRequires: libusb-devel
%endif
BuildRequires: mysql-devel
-BuildRequires: SDL-devel
BuildRequires: taglib-devel
-BuildRequires: sqlite-devel
+
+# SDL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}SDL-devel
+%else
+BuildRequires: SDL-devel
+%endif
+
+# SQLITE3 support
+%if 0%{?mgaversion}
+BuildRequires: sqlite3-devel
+%else
+BuildRequires: sqlite-devel
+%endif
# POSTGRESQL support
BuildRequires: postgresql
@@ -153,13 +173,13 @@ BuildRequires: trinity-dbus-tqt-devel >= 1:0.63
%if 0%{?pclinuxos} == 0
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_ifp 1
-BuildRequires: libifp-devel
+BuildRequires: %{_lib}ifp-devel
%endif
%endif
# KARMA support
%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos} == 0
+%if 0%{?pclinuxos} == 0 && 0%{?mdkver} < 24090000
%define with_karma 1
BuildRequires: libkarma-devel
BuildRequires: karma-sharp
@@ -175,29 +195,45 @@ BuildRequires: libgpod-devel >= 0.4.2
# MTP players
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
%define with_mtp 1
+%if 0%{?mdkver}
+BuildRequires: %{_lib}mtp-devel
+%else
BuildRequires: libmtp-devel
%endif
+%endif
# Creative Nomad Jukebox
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
%define with_njb 1
-BuildRequires: libnjb-devel
+%if 0%{?mdkver}
+BuildRequires: %{_lib}njb-devel
+%else
+BuildRequires: libmtp-devel
+%endif
%endif
# VISUAL support
%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
%define with_libvisual 1
+%if 0%{?mdkver}
+BuildRequires: %{_lib}visual-devel
+%else
BuildRequires: libvisual-devel
%endif
+%endif
# MUSICBRAINZ support
%if 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version}
%if 0%{?fedora} >= 24
BuildRequires: libmusicbrainz5-devel
%else
+%if 0%{?mgaversion} >= 9
+BuildRequires: %{_lib}musicbrainz5-devel
+%else
BuildRequires: libmusicbrainz-devel
%endif
%endif
+%endif
# TUNEPIMP support
%if 0%{?pclinuxos}
@@ -232,8 +268,12 @@ BuildRequires: xine-lib-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
%define with_xine 1
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xine-devel
+%else
BuildRequires: %{_lib}xine1.2-devel
%endif
+%endif
%if 0%{?sle_version} && 0%{?sle_version} <= 150000
%define with_xine 1
BuildRequires: libxine-devel
@@ -252,9 +292,11 @@ BuildRequires: trinity-akode-devel
# MP4V2 support
%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?mdkver} < 24090000
%define with_mp4v2 1
BuildRequires: libmp4v2-devel
%endif
+%endif
# ruby
BuildRequires: ruby
@@ -471,7 +513,7 @@ if [ -d /usr/X11R6 ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/multimedia/codeine/codeine.spec b/redhat/applications/multimedia/codeine/codeine.spec
index 60a487700..8dad74e8c 100644
--- a/redhat/applications/multimedia/codeine/codeine.spec
+++ b/redhat/applications/multimedia/codeine/codeine.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.2
%endif
%define tde_pkg codeine
%define tde_prefix /opt/trinity
@@ -81,8 +81,12 @@ BuildRequires: brp-check-trinity
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
%define with_xine 1
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xine-devel
+%else
BuildRequires: %{_lib}xine1.2-devel
%endif
+%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: xine-lib-devel
%endif
@@ -114,7 +118,7 @@ Features:
%build
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec b/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec
index e995c3215..ba760d943 100644
--- a/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec
+++ b/redhat/applications/multimedia/k3b-i18n/k3b-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.2
%endif
%define tde_pkg k3b-i18n
%define tde_prefix /opt/trinity
@@ -351,7 +351,7 @@ This package contains the Ukrainian translations for K3B.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/multimedia/k3b/k3b.spec b/redhat/applications/multimedia/k3b/k3b.spec
index ed7d62590..ddbdf76df 100644
--- a/redhat/applications/multimedia/k3b/k3b.spec
+++ b/redhat/applications/multimedia/k3b/k3b.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.2
%endif
%define tde_pkg k3b
%define tde_prefix /opt/trinity
@@ -77,14 +77,26 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity
%endif
-BuildRequires: alsa-lib-devel
+# ALSA supportl
+%if 0%{?mdkver}
+BuildRequires: %{_lib}asound-devel
+%else
+BuildRequires: alsa-lib-devel
+%endif
+
BuildRequires: audiofile-devel
BuildRequires: gettext
-BuildRequires: libmpcdec-devel
-BuildRequires: libvorbis-devel
BuildRequires: taglib-devel
BuildRequires: zlib-devel
+# VORBIS support
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libvorbis_devel %{_lib}vorbis-devel
+%else
+%define libvorbis_devel libvorbis-devel
+%endif
+BuildRequires: %{libvorbis_devel}
+
# IDN support
BuildRequires: libidn-devel
@@ -96,13 +108,26 @@ BuildRequires: gamin-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# ATTR support
-BuildRequires: libattr-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libattr_devel %{_lib}attr-devel
+%else
+%define libattr_devel libattr-devel
+%endif
+BuildRequires: %{libattr_devel}
Requires(post): coreutils
Requires(postun): coreutils
@@ -126,8 +151,12 @@ Requires: cdrdao
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}udev-devel
+%else
BuildRequires: libudev-devel
%endif
+%endif
# HAL support
%if 0%{?rhel} == 5
@@ -149,13 +178,21 @@ Requires: trinity-dbus-tqt >= 1:0.63
# SNDFILE support
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4
%define with_sndfile 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}sndfile-devel
+%else
BuildRequires: libsndfile-devel
%endif
+%endif
# SAMPLERATE support
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4
%define with_samplerate 1
-BuildRequires: libsamplerate-devel
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}samplerate-devel
+%else
+BuildRequires: libsamplerate-devel
+%endif
%endif
# DVDREAD support
@@ -227,6 +264,17 @@ BuildRequires: ffmpeg-devel
%endif
%endif
+# MUSEPACK
+%if 0%{?fedora} == 0 || 0%{?fedora} <= 37
+# Looking for mpc_decoder_setup in mpcdec - not found
+%define with_musepack 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}mpcdec-devel
+%else
+BuildRequires: libmpcdec-devel
+%endif
+%endif
+
%description
K3b provides a comfortable user interface to perform most CD/DVD
@@ -260,8 +308,10 @@ start.
%{tde_tdelibdir}/libk3blibsndfiledecoder.la
%{tde_tdelibdir}/libk3blibsndfiledecoder.so
%endif
+%if 0%{?with_musepack}
%{tde_tdelibdir}/libk3bmpcdecoder.la
%{tde_tdelibdir}/libk3bmpcdecoder.so
+%endif
%{tde_tdelibdir}/libk3boggvorbisdecoder.la
%{tde_tdelibdir}/libk3boggvorbisdecoder.so
%{tde_tdelibdir}/libk3boggvorbisencoder.la
@@ -426,7 +476,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -std=c++11"
%endif
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -453,7 +503,7 @@ fi
-DWITH_ALL_OPTIONS="ON" \
-DWITH_MUSICBRAINZ="OFF" \
-DWITH_FFMPEG_ALL_CODECS="ON" \
- -DWITH_MUSEPACK="ON" \
+ -DWITH_MUSEPACK="%{!?with_musepack:OFF}%{?with_musepack:ON}" \
-DWITH_LAME="%{!?with_lame:OFF}%{?with_lame:ON}" \
-DWITH_MAD="%{!?with_libmad:OFF}%{?with_libmad:ON}" \
%if 0%{?rhel} == 5
diff --git a/redhat/applications/multimedia/k9copy/k9copy.spec b/redhat/applications/multimedia/k9copy/k9copy.spec
index 0a9801a8d..69ac53556 100644
--- a/redhat/applications/multimedia/k9copy/k9copy.spec
+++ b/redhat/applications/multimedia/k9copy/k9copy.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.2
%endif
%define tde_pkg k9copy
%define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: trinity-k3b-devel
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -94,8 +94,12 @@ BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}glu-devel
+%else
BuildRequires: mesaglu-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
@@ -129,38 +133,43 @@ This is the Trinity version.
# Fix permissions on doc files
chmod -x AUTHORS COPYING
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
# FFMPEG ...
if [ -d /usr/include/ffmpeg ]; then
- export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg"
+ RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg"
fi
-
-# NOTICE: --enable-final causes FTBFS !
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- --mandir=%{tde_mandir} \
+
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+ %__mkdir_p build
+ cd build
+fi
+
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+ -DINCLUDE_INSTALL_DIR="%{tde_includedir}" \
+ -DLIB_INSTALL_DIR="%{tde_libdir}" \
\
- --disable-dependency-tracking \
- --disable-debug \
- --disable-final \
- --enable-new-ldflags \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_GCC_VISIBILITY=ON \
\
- --enable-k3bdevices
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON \
+ ..
%__make %{?_smp_mflags} || %__make
@@ -168,7 +177,7 @@ fi
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make -C build install DESTDIR=%{buildroot}
%find_lang %{tde_pkg}
diff --git a/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec
index c37dad135..12eca9676 100644
--- a/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec
+++ b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec
@@ -19,7 +19,7 @@
%define tde_pkg kaffeine-mozilla
%define tde_prefix /opt/trinity
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
# TDE specific building variables
@@ -73,8 +73,12 @@ BuildRequires: desktop-file-utils
%if 0%{?suse_version}
BuildRequires: mozilla-nspr-devel
%else
+%if 0%{?mdkver}
+BuildRequires: %{_lib}nspr-devel
+%else
BuildRequires: nspr-devel
%endif
+%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}xaw-devel
@@ -107,7 +111,7 @@ if [ -d "%{_includedir}/nspr4" ]; then
RPM_OPT_FLAGS="-I%{_includedir}/nspr4 ${RPM_OPT_FLAGS}"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -124,11 +128,7 @@ fi
-DCMAKE_PROGRAM_PATH="%{tde_bindir}" \
-DWITH_GCC_VISIBILITY=ON \
\
- -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
- -DBIN_INSTALL_DIR=%{tde_bindir} \
- -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
- -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
- -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
\
..
diff --git a/redhat/applications/multimedia/kaffeine/kaffeine.spec b/redhat/applications/multimedia/kaffeine/kaffeine.spec
index da41a4682..e445da856 100644
--- a/redhat/applications/multimedia/kaffeine/kaffeine.spec
+++ b/redhat/applications/multimedia/kaffeine/kaffeine.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.2
%endif
%define tde_pkg kaffeine
%define tde_prefix /opt/trinity
@@ -79,13 +79,22 @@ BuildRequires: brp-check-trinity
%endif
# VORBIS support
-BuildRequires: libvorbis-devel
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libvorbis_devel %{_lib}vorbis-devel
+%else
+%define libvorbis_devel libvorbis-devel
+%endif
+BuildRequires: %{libvorbis_devel}
# CDDA support
BuildRequires: libcdio-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}cdda-devel
+%else
BuildRequires: libcdda-devel
%endif
+%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
BuildRequires: cdparanoia
BuildRequires: cdparanoia-devel
@@ -134,9 +143,14 @@ BuildRequires: %{_lib}xcb-devel
%if 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gstreamer 1
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gstreamer-devel
+BuildRequires: %{_lib}gst-plugins-base1.0-devel
+%else
BuildRequires: %{_lib}gstreamer1.0-devel
BuildRequires: %{_lib}gstreamer-plugins-base1.0-devel
%endif
+%endif
%if 0%{?rhel} == 4
BuildRequires: gstreamer-devel
BuildRequires: gstreamer-plugins-devel
@@ -155,8 +169,12 @@ BuildRequires: gstreamer1-plugins-base-devel >= 1.0
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
%define with_xine 1
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xine-devel
+%else
BuildRequires: %{_lib}xine1.2-devel
%endif
+%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: xine-lib-devel
%endif
@@ -283,7 +301,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/multimedia/kmplayer/kmplayer.spec b/redhat/applications/multimedia/kmplayer/kmplayer.spec
index 74db046b5..09a2fd48b 100644
--- a/redhat/applications/multimedia/kmplayer/kmplayer.spec
+++ b/redhat/applications/multimedia/kmplayer/kmplayer.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.2
%endif
%define tde_pkg kmplayer
%define tde_prefix /opt/trinity
@@ -84,9 +84,14 @@ BuildRequires: trinity-dbus-tqt-devel >= %{tde_version}
# GSTREAMER support
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gstreamer-devel
+BuildRequires: %{_lib}gst-plugins-base1.0-devel
+%else
BuildRequires: %{_lib}gstreamer1.0-devel
BuildRequires: %{_lib}gstreamer-plugins-base1.0-devel
%endif
+%endif
%if 0%{?rhel} == 4
BuildRequires: gstreamer-devel
BuildRequires: gstreamer-plugins-devel
@@ -104,8 +109,12 @@ BuildRequires: gstreamer1-plugins-base-devel >= 1.0
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
%define with_xine 1
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xine-devel
+%else
BuildRequires: %{_lib}xine1.2-devel
%endif
+%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: xine-lib-devel
%endif
@@ -130,7 +139,11 @@ BuildRequires: xorg-x11-libXv-devel
%endif
# GTK2 stuff
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gtk+2.0-devel
+%else
BuildRequires: gtk2-devel
+%endif
# DBUS stuff
%if 0%{?suse_version}
@@ -202,8 +215,6 @@ Core files needed for KMPlayer.
%files base
%defattr(-,root,root,-)
-%{tde_libdir}/libkmplayercommon.la
-%{tde_libdir}/libkmplayercommon.so
%{tde_bindir}/kgstplayer
%{tde_bindir}/kxineplayer
%dir %{tde_datadir}/config
@@ -254,6 +265,21 @@ Documention for KMPlayer, a basic audio/video viewer application for TDE.
##########
+%package devel
+Group: Applications/Multimedia
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Summary: Media player for Trinity (devlopment files)
+
+%description devel
+Development files for KMPlayer, a basic audio/video viewer application for TDE.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libkmplayercommon.la
+%{tde_libdir}/libkmplayercommon.so
+
+##########
+
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
@@ -269,7 +295,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/multimedia/kplayer/kplayer.spec b/redhat/applications/multimedia/kplayer/kplayer.spec
index bb86e0371..c63c48e0d 100644
--- a/redhat/applications/multimedia/kplayer/kplayer.spec
+++ b/redhat/applications/multimedia/kplayer/kplayer.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.2
%endif
%define tde_pkg kplayer
%define tde_prefix /opt/trinity
@@ -70,10 +70,18 @@ BuildRequires: libtool
BuildRequires: libidn-devel
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -121,7 +129,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec
index 14d1f1fb0..e1830719f 100644
--- a/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec
+++ b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.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.2
%endif
%define tde_pkg mplayerthumbs
%define tde_prefix /opt/trinity
@@ -69,7 +69,11 @@ BuildRequires: fdupes
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -114,7 +118,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -165,6 +169,7 @@ fi
%{tde_datadir}/services/mplayer-thumbnailer.desktop
%{tde_tdedocdir}/HTML/en/mplayer-thumbnailer/
%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/mplayer-thumbnailer.mo
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/mplayer-thumbnailer.mo
%changelog
diff --git a/redhat/applications/multimedia/rosegarden/rosegarden.spec b/redhat/applications/multimedia/rosegarden/rosegarden.spec
index 3e6834a7f..99fb2abbb 100644
--- a/redhat/applications/multimedia/rosegarden/rosegarden.spec
+++ b/redhat/applications/multimedia/rosegarden/rosegarden.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.2
%endif
%define tde_pkg rosegarden
%define tde_prefix /opt/trinity
@@ -81,28 +81,51 @@ BuildRequires: brp-check-trinity
%endif
BuildRequires: fftw-devel
-BuildRequires: liblo-devel
BuildRequires: fontconfig-devel
+# LO support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}lo-devel
+%else
+BuildRequires: liblo-devel
+%endif
+
# DSSI support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
BuildRequires: dssi-devel
%endif
# LRDF support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}lrdf-devel
+%endif
+%if 0%{?fedora} || 0%{?suse_version}
BuildRequires: liblrdf-devel
%endif
+# LADSPA support
+%if 0%{?mdkver}
+BuildRequires: ladspa-devel
+%endif
+
+# RAPTOR support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}raptor-devel
+%endif
+
# JACK support
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: %{_lib}jack-devel
%else
BuildRequires: jack-audio-connection-kit-devel
%endif
# ACL support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# LIRC support
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6
@@ -134,7 +157,11 @@ Requires: libsndfile-utils
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -177,7 +204,7 @@ This package provides the data files necessary for running Rosegarden
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/multimedia/soundkonverter/soundkonverter.spec b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec
index 6c3ffae19..6b713c452 100644
--- a/redhat/applications/multimedia/soundkonverter/soundkonverter.spec
+++ b/redhat/applications/multimedia/soundkonverter/soundkonverter.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.2
%endif
%define tde_pkg soundkonverter
%define tde_prefix /opt/trinity
@@ -80,8 +80,12 @@ BuildRequires: taglib-devel
# CDDA support
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}cdda-devel
+%else
BuildRequires: libcdda-devel
%endif
+%endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: cdparanoia-devel
%endif
@@ -130,7 +134,7 @@ See the 'trinity-soundkonverter' package for more information.
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -178,7 +182,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING NEWS README
%{tde_bindir}/soundkonverter
%{tde_bindir}/userscript.sh
%{tde_tdeappdir}/soundkonverter.desktop
diff --git a/redhat/applications/multimedia/tderadio/tderadio.spec b/redhat/applications/multimedia/tderadio/tderadio.spec
index 4070f8b6b..8032ed76f 100644
--- a/redhat/applications/multimedia/tderadio/tderadio.spec
+++ b/redhat/applications/multimedia/tderadio/tderadio.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tderadio
%define tde_prefix /opt/trinity
@@ -80,7 +80,12 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity
%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}sndfile-devel
+%else
BuildRequires: libsndfile-devel
+%endif
+
%{?with_lirc:BuildRequires: lirc-devel}
# LAME support
@@ -154,7 +159,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -187,8 +192,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
-%find_lang %{tde_pkg}
-
# Updates applications categories for openSUSE
%if 0%{?suse_version}
%suse_update_desktop_file -G "Radio Tuner" %{tde_pkg} AudioVideo Tuner
@@ -206,7 +209,7 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%files -f %{tde_pkg}.lang
+%files
%defattr(-,root,root,-)
%{tde_bindir}/convert-presets
%{tde_bindir}/tderadio
@@ -223,7 +226,9 @@ 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(es) %{tde_datadir}/locale/es/LC_MESSAGES/*.mo
%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo
+%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/*.mo
%lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo
%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo
%{tde_tdedocdir}/HTML/en/tderadio/
diff --git a/redhat/applications/office/basket/basket.spec b/redhat/applications/office/basket/basket.spec
index 35916dcb1..fa032db4d 100644
--- a/redhat/applications/office/basket/basket.spec
+++ b/redhat/applications/office/basket/basket.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.2
%endif
%define tde_pkg basket
%define tde_prefix /opt/trinity
@@ -107,7 +107,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/office/kbibtex/kbibtex.spec b/redhat/applications/office/kbibtex/kbibtex.spec
index bef708968..f16cae934 100644
--- a/redhat/applications/office/kbibtex/kbibtex.spec
+++ b/redhat/applications/office/kbibtex/kbibtex.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.2
%endif
%define tde_pkg kbibtex
%define tde_prefix /opt/trinity
@@ -68,19 +68,31 @@ BuildRequires: gcc-c++
BuildRequires: pkgconfig
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# XSLT support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xslt-devel
+%else
BuildRequires: libxslt-devel
+%endif
# YAZ support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version}
BuildRequires: libyaz-devel
%endif
@@ -115,7 +127,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/office/kbookreader/kbookreader.spec b/redhat/applications/office/kbookreader/kbookreader.spec
index 22ba62914..7add6600f 100644
--- a/redhat/applications/office/kbookreader/kbookreader.spec
+++ b/redhat/applications/office/kbookreader/kbookreader.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.2
%endif
%define tde_pkg kbookreader
%define tde_prefix /opt/trinity
@@ -67,13 +67,21 @@ BuildRequires: gcc-c++
BuildRequires: pkgconfig
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -109,7 +117,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/office/keximdb/keximdb.spec b/redhat/applications/office/keximdb/keximdb.spec
index 967b8a3c6..f1d311cd3 100644
--- a/redhat/applications/office/keximdb/keximdb.spec
+++ b/redhat/applications/office/keximdb/keximdb.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.2
%endif
%define tde_pkg keximdb
%define tde_prefix /opt/trinity
@@ -73,10 +73,18 @@ BuildRequires: libtool
BuildRequires: libidn-devel
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -115,7 +123,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/office/kile/kile.spec b/redhat/applications/office/kile/kile.spec
index d7d26d1e1..e9e333318 100644
--- a/redhat/applications/office/kile/kile.spec
+++ b/redhat/applications/office/kile/kile.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.2
%endif
%define tde_pkg kile
%define tde_prefix /opt/trinity
@@ -155,7 +155,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/office/kmymoney/kmymoney.spec b/redhat/applications/office/kmymoney/kmymoney.spec
index fa7afc315..2be7ff5c0 100644
--- a/redhat/applications/office/kmymoney/kmymoney.spec
+++ b/redhat/applications/office/kmymoney/kmymoney.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kmymoney
%define tde_prefix /opt/trinity
@@ -86,7 +86,13 @@ BuildRequires: brp-check-trinity
BuildRequires: html2ps
BuildRequires: recode
+
+# OFX support
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+BuildRequires: %{_lib}ofx-devel
+%else
BuildRequires: libofx-devel
+%endif
# OPENSP support
%if 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?mdkversion}
@@ -204,7 +210,7 @@ This package contains development files needed for KMyMoney plugins.
unset QTDIR QTLIB QTINC
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/office/knowit/knowit.spec b/redhat/applications/office/knowit/knowit.spec
index 4f1c28370..38e1219ca 100644
--- a/redhat/applications/office/knowit/knowit.spec
+++ b/redhat/applications/office/knowit/knowit.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.2
%endif
%define tde_pkg knowit
%define tde_prefix /opt/trinity
@@ -70,10 +70,18 @@ BuildRequires: libtool
BuildRequires: libidn-devel
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -109,7 +117,7 @@ but TDE-based, and requires Trinity.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/office/koffice-i18n/koffice-i18n.spec b/redhat/applications/office/koffice-i18n/koffice-i18n.spec
index 077854145..c21d72bf7 100644
--- a/redhat/applications/office/koffice-i18n/koffice-i18n.spec
+++ b/redhat/applications/office/koffice-i18n/koffice-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.2
%endif
%define tde_pkg koffice-i18n
%define tde_prefix /opt/trinity
@@ -587,7 +587,7 @@ for l in . %{TDE_LANGS}; do
pushd ${l}
fi
- if ! rpm -E %%cmake|grep -q "cd build"; then
+ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -910,7 +910,6 @@ done
%if "%( grep -w lv <<< '%{TDE_LANGS}' )" != ""
%files Latvian
%defattr(-,root,root,-)
-%{tde_datadir}/locale/lv
%{tde_datadir}/locale/lv/*
%endif
diff --git a/redhat/applications/office/koffice/koffice.spec b/redhat/applications/office/koffice/koffice.spec
index e137cc9b9..9ec132b50 100644
--- a/redhat/applications/office/koffice/koffice.spec
+++ b/redhat/applications/office/koffice/koffice.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.2
%endif
%define tde_pkg koffice
%define tde_prefix /opt/trinity
@@ -46,7 +46,7 @@
%global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/')
# Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
+%global _disable_ld_no_undefined 1
Name: trinity-%{tde_pkg}
@@ -96,22 +96,65 @@ BuildRequires: brp-check-trinity
BuildRequires: fontconfig-devel
BuildRequires: libart_lgpl-devel
-BuildRequires: libtiff-devel
-BuildRequires: libjpeg-devel
-BuildRequires: ImageMagick-devel
BuildRequires: zlib-devel
-BuildRequires: openssl-devel
BuildRequires: pcre-devel
BuildRequires: gettext-devel
BuildRequires: mysql-devel
BuildRequires: perl
BuildRequires: doxygen
BuildRequires: aspell-devel
-BuildRequires: libxslt-devel
-BuildRequires: OpenEXR-devel
-BuildRequires: libexif-devel
BuildRequires: readline-devel
+# EXIF support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}exif-devel
+%else
+BuildRequires: libexif-devel
+%endif
+
+# IMAGEMAGICK support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}magick-devel
+%else
+BuildRequires: ImageMagick-devel
+%endif
+
+# JPEG support
+%if 0%{?mdkver}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
+BuildRequires: %{libjpeg}-devel
+
+# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
+BuildRequires: openssl-devel
+%endif
+
+# OPENEXR support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openexr-devel
+%else
+BuildRequires: OpenEXR-devel
+%endif
+
+# TIFF support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}tiff-devel
+%else
+BuildRequires: libtiff-devel
+%endif
+
+# XSLT support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xslt-devel
+%else
+BuildRequires: libxslt-devel
+%endif
+
# PYTHON support
# lib/kross/configure.in.in :
# WARNING: Building Kross python plugin is now prohibited at all times,
@@ -164,10 +207,10 @@ BuildRequires: freetype-devel
%endif
# LIBPNG support
-%if 0%{?mgaversion}
+%if 0%{?mdkver} || 0%{?mgaversion}
BuildRequires: %{_lib}png-devel
%endif
-%if 0%{?mdkversion} && 0%{?pclinuxos} == 0
+%if 0%{?mdkversion} && 0%{?mdkver} < 24090000 && 0%{?pclinuxos} == 0
BuildRequires: %{_lib}png15-devel
%endif
%if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel}
@@ -181,9 +224,13 @@ BuildRequires: libpng-devel
BuildRequires: GraphicsMagick >= 1.1.0
%endif
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}graphicsmagick-devel
+%else
BuildRequires: GraphicsMagick-devel >= 1.1.0
%endif
%endif
+%endif
# UTEMPTER support
%if 0%{?suse_version}
@@ -226,29 +273,45 @@ BuildRequires: postgresql-server-devel
%else
BuildRequires: postgresql-devel
%endif
+%if 0%{?mdkver}
+BuildRequires: %{_lib}pqxx-devel
+%else
BuildRequires: libpqxx-devel
%endif
%endif
+%endif
Obsoletes: trinity-libpqxx < %{?epoch:%{epoch}:}%{version}-%{release}
# WPD support
# For chalk and filters
+%if 0%{?mdkver}
+BuildRequires: %{_lib}wpd-devel
+%else
BuildRequires: libwpd-devel
+%endif
Obsoletes: trinity-libwpd < %{?epoch:%{epoch}:}%{version}-%{release}
# WV2 support
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver} < 24090000
BuildRequires: %{_lib}wv2-devel
%endif
+%endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: wv2-devel
%endif
# MESA support
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver} < 24090000 && 0%{?pclinuxos} == 0
BuildRequires: %{_lib}mesagl-devel
+%endif
+%if 0%{?mdkver} >= 24090000
+BuildRequires: %{_lib}glu-devel
+%else
BuildRequires: %{_lib}mesaglu1-devel
%endif
+%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
@@ -1072,8 +1135,12 @@ This package is part of the TDE Office Suite.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%if 0%{?mdkver}
+touch config.h.in
+%endif
+
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -1122,6 +1189,12 @@ CXXFLAGS="${CXXFLAGS} -std=c++11"
%{?with_kross:--enable-scripting} %{!?with_kross:--disable-scripting} \
%{?with_postgresql:--enable-pgsql} %{!?with_postgresql:--disable-pgsql} \
+%if %{?with_postgresql}
+# Ensure PQXX was detected
+
+
+%endif
+
%__make %{?_smp_mflags} || %__make
@@ -1129,11 +1202,6 @@ CXXFLAGS="${CXXFLAGS} -std=c++11"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
-#%__mkdir_p "%{buildroot}%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/"
-#for i in {16x16,22x22,32x32,48x48,64x64,128x128}; do
-# mv "%{buildroot}%{tde_datadir}/icons/crystalsvg/$i/apps/kplato.png %{buildroot}/opt/kde3/share/icons/hicolor/$i/apps/;
-#done
-
# Fix desktop icon location
%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/KThesaurus.desktop" "%{?buildroot}%{tde_tdeappdir}"
diff --git a/redhat/applications/office/kpilot/kpilot.spec b/redhat/applications/office/kpilot/kpilot.spec
index dd4c68ad5..828963b48 100644
--- a/redhat/applications/office/kpilot/kpilot.spec
+++ b/redhat/applications/office/kpilot/kpilot.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.2
%endif
%define tde_pkg kpilot
%define tde_prefix /opt/trinity
@@ -69,16 +69,28 @@ BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# ICAL support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}ical-devel
+%else
BuildRequires: libical-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -130,7 +142,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -143,7 +155,6 @@ fi
-DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
- -DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
@@ -169,7 +180,7 @@ export PATH="%{tde_bindir}:${PATH}"
# Unwanted files
%__rm -f %{?buildroot}%{tde_libdir}/libkpilot.so
-%__rm -fr %{?buildroot}%{tde_tdeincludedir}/kpilot/ %{?buildroot}%{_includedir}/kpilot/
+%__rm -fr %{?buildroot}%{tde_tdeincludedir}/kpilot/ %{?buildroot}%{tde_includedir}/kpilot/ %{?buildroot}%{_includedir}/kpilot/
# Updates applications categories for openSUSE
%if 0%{?suse_version}
diff --git a/redhat/applications/office/tellico/tellico.spec b/redhat/applications/office/tellico/tellico.spec
index ee92c8f4b..e51a25226 100644
--- a/redhat/applications/office/tellico/tellico.spec
+++ b/redhat/applications/office/tellico/tellico.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tellico
%define tde_prefix /opt/trinity
@@ -110,7 +110,12 @@ BuildRequires: %{_lib}yaz-devel
BuildRequires: libxml2-devel
# XSLT support
-BuildRequires: libxslt-devel
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xslt-devel
+%else
+BuildRequires: libxslt-devel
+%endif
+
%if 0%{?rhel} == 4
# a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241)
BuildRequires: libgcrypt-devel
@@ -145,13 +150,26 @@ BuildRequires: gamin-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# ATTR support
-BuildRequires: libattr-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libattr_devel %{_lib}attr-devel
+%else
+%define libattr_devel libattr-devel
+%endif
+BuildRequires: %{libattr_devel}
# PYTHON support
%global python python3
@@ -220,14 +238,10 @@ documentation.
%{tde_datadir}/apps/tellico/*.xml
%{tde_datadir}/apps/tellico/*.png
%{tde_datadir}/apps/tellico/entry-templates
-%if 0%{?rhel} == 7 || 0%{?suse_version}
%{tde_datadir}/apps/tellico/*.py*
-%if 0%{?rhel} == 7
+%if 0%{?rhel} == 7 || 0%{?mgaversion} == 8
%{tde_datadir}/apps/tellico/__pycache__/
%endif
-%else
-%pycached %{tde_datadir}/apps/tellico/*.py
-%endif
%{tde_datadir}/apps/tellico/pics
%{tde_datadir}/apps/tellico/report-templates
%{tde_datadir}/apps/tellico/tellico.dtd
@@ -305,7 +319,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/settings/kima/kima.spec b/redhat/applications/settings/kima/kima.spec
index 827385dc7..b5dcaed59 100644
--- a/redhat/applications/settings/kima/kima.spec
+++ b/redhat/applications/settings/kima/kima.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.2
%endif
%define tde_pkg kima
%define tde_prefix /opt/trinity
@@ -80,14 +80,22 @@ BuildRequires: brp-check-trinity
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%define with_tdehwlib 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}udev-devel
+%else
BuildRequires: libudev-devel
%endif
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -114,7 +122,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/settings/kiosktool/kiosktool.spec b/redhat/applications/settings/kiosktool/kiosktool.spec
index 5aae73aa9..0fae4bcdc 100644
--- a/redhat/applications/settings/kiosktool/kiosktool.spec
+++ b/redhat/applications/settings/kiosktool/kiosktool.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.2
%endif
%define tde_pkg kiosktool
%define tde_prefix /opt/trinity
@@ -69,13 +69,21 @@ BuildRequires: gcc-c++
BuildRequires: pkgconfig
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -112,7 +120,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/settings/kkbswitch/kkbswitch.spec b/redhat/applications/settings/kkbswitch/kkbswitch.spec
index 4381ff697..81cea639a 100644
--- a/redhat/applications/settings/kkbswitch/kkbswitch.spec
+++ b/redhat/applications/settings/kkbswitch/kkbswitch.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.2
%endif
%define tde_pkg kkbswitch
%define tde_prefix /opt/trinity
@@ -66,16 +66,28 @@ BuildRequires: gcc-c++
BuildRequires: pkgconfig
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# XKBFILES support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}xkbfile-devel
+%else
BuildRequires: libxkbfile-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -119,7 +131,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/settings/klcddimmer/klcddimmer.spec b/redhat/applications/settings/klcddimmer/klcddimmer.spec
index 918f57f48..00dc8836c 100644
--- a/redhat/applications/settings/klcddimmer/klcddimmer.spec
+++ b/redhat/applications/settings/klcddimmer/klcddimmer.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.2
%endif
%define tde_pkg klcddimmer
%define tde_prefix /opt/trinity
@@ -69,7 +69,11 @@ BuildRequires: pkgconfig
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -104,7 +108,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec
index 7998140e5..16d3e34ca 100644
--- a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec
+++ b/redhat/applications/settings/kmyfirewall/kmyfirewall.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.2
%endif
%define tde_pkg kmyfirewall
%define tde_prefix /opt/trinity
@@ -146,6 +146,7 @@ university etc.)
%{tde_datadir}/mimelnk/application/kmfrs.desktop
%{tde_datadir}/services/kmf*.desktop
%{tde_datadir}/servicetypes/kmf*.desktop
+%{tde_mandir}/man1/kmyfirewall.1*
##########
@@ -177,7 +178,7 @@ Requires: %{name} = %{version}-%{release}
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
diff --git a/redhat/applications/settings/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec
index 946a06d97..ccacc149f 100644
--- a/redhat/applications/settings/tde-guidance/tde-guidance.spec
+++ b/redhat/applications/settings/tde-guidance/tde-guidance.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.2
%endif
%define tde_pkg tde-guidance
%define tde_prefix /opt/trinity
@@ -63,12 +63,13 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: trinity-pytdeextensions
BuildRequires: trinity-libpythonize0-devel
BuildRequires: trinity-pytde
BuildRequires: chrpath
-BuildRequires: autoconf automake libtool m4
+BuildRequires: libtool
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -92,14 +93,6 @@ BuildRequires: pytqt-devel
BuildRequires: trinity-pytde-devel
BuildRequires: trinity-pytqt-tools
-# LIBXXF86VM support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}xxf86vm-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
-BuildRequires: libXxf86vm-devel
-%endif
-
# XSCREENSAVER support
# RHEL 4: disabled
# RHEL 6: available in EPEL
@@ -144,7 +137,9 @@ BuildRequires: xscreensaver-gl
%endif
# PYTHON support
+%if "%{python}" == ""
%global python python3
+%endif
%global __python %__python3
%global python_sitearch %{python3_sitearch}
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
@@ -173,7 +168,6 @@ look after your system:
o userconfig - User and Group administration
o serviceconfig - Service/daemon administration
o mountconfig - Disk and filesystem administration
- o wineconfig - Wine configuration
These tools are available in Trinity Control Center, System Settings
or can be run as standalone applications.
@@ -181,55 +175,46 @@ or can be run as standalone applications.
%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING README TODO
-%{tde_bindir}/grubconfig
%{tde_bindir}/mountconfig
%{tde_bindir}/serviceconfig
%{tde_bindir}/userconfig
-%{tde_bindir}/wineconfig
%attr(0644,root,root) %{tde_tdelibdir}/*.so
%attr(0644,root,root) %{tde_tdelibdir}/*.la
%{tde_datadir}/apps/guidance/
%{tde_tdeappdir}/*.desktop
%{tde_datadir}/icons/crystalsvg/*/*/*.png
-%if 0%{?rhel} == 7 || 0%{?suse_version}
-%{python_sitearch}/%{name}/SMBShareSelectDialog.py*
-%{python_sitearch}/%{name}/SimpleCommandRunner.py*
-%{python_sitearch}/%{name}/fuser.py*
-%{python_sitearch}/%{name}/fuser_ui.py*
-%{python_sitearch}/%{name}/grubconfig.py*
-%{python_sitearch}/%{name}/mountconfig.py*
-%{python_sitearch}/%{name}/serviceconfig.py*
-%{python_sitearch}/%{name}/sizeview.py*
-%{python_sitearch}/%{name}/unixauthdb.py*
-%{python_sitearch}/%{name}/userconfig.py*
-%{python_sitearch}/%{name}/wineconfig.py*
+%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
+%{python_sitelib}/tde-guidance/SMBShareSelectDialog.py*
+%{python_sitelib}/tde-guidance/SimpleCommandRunner.py*
+%{python_sitelib}/tde-guidance/fuser.py*
+%{python_sitelib}/tde-guidance/fuser_ui.py*
+%{python_sitelib}/tde-guidance/mountconfig.py*
+%{python_sitelib}/tde-guidance/serviceconfig.py*
+%{python_sitelib}/tde-guidance/sizeview.py*
+%{python_sitelib}/tde-guidance/unixauthdb.py*
+%{python_sitelib}/tde-guidance/userconfig.py*
%if 0%{?rhel} == 7
-%{python_sitearch}/%{name}/__pycache__/SMBShareSelectDialog.*.pyc
-%{python_sitearch}/%{name}/__pycache__/SimpleCommandRunner.*.pyc
-%{python_sitearch}/%{name}/__pycache__/fuser.*.pyc
-%{python_sitearch}/%{name}/__pycache__/fuser_ui.*.pyc
-%{python_sitearch}/%{name}/__pycache__/grubconfig.*.pyc
-%{python_sitearch}/%{name}/__pycache__/mountconfig.*.pyc
-%{python_sitearch}/%{name}/__pycache__/serviceconfig.*.pyc
-%{python_sitearch}/%{name}/__pycache__/sizeview.*.pyc
-%{python_sitearch}/%{name}/__pycache__/unixauthdb.*.pyc
-%{python_sitearch}/%{name}/__pycache__/userconfig.*.pyc
-%{python_sitearch}/%{name}/__pycache__/wineconfig.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/SMBShareSelectDialog.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/SimpleCommandRunner.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/fuser.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/fuser_ui.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/mountconfig.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/serviceconfig.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/sizeview.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/unixauthdb.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/userconfig.*.pyc
%endif
%else
-%pycached %{python_sitearch}/%{name}/SMBShareSelectDialog.py
-%pycached %{python_sitearch}/%{name}/SimpleCommandRunner.py
-%pycached %{python_sitearch}/%{name}/fuser.py
-%pycached %{python_sitearch}/%{name}/fuser_ui.py
-%pycached %{python_sitearch}/%{name}/grubconfig.py
-%pycached %{python_sitearch}/%{name}/mountconfig.py
-%pycached %{python_sitearch}/%{name}/serviceconfig.py
-%pycached %{python_sitearch}/%{name}/sizeview.py
-%pycached %{python_sitearch}/%{name}/unixauthdb.py
-%pycached %{python_sitearch}/%{name}/userconfig.py
-%pycached %{python_sitearch}/%{name}/wineconfig.py
+%pycached %{python_sitelib}/tde-guidance/SMBShareSelectDialog.py
+%pycached %{python_sitelib}/tde-guidance/SimpleCommandRunner.py
+%pycached %{python_sitelib}/tde-guidance/fuser.py
+%pycached %{python_sitelib}/tde-guidance/fuser_ui.py
+%pycached %{python_sitelib}/tde-guidance/mountconfig.py
+%pycached %{python_sitelib}/tde-guidance/serviceconfig.py
+%pycached %{python_sitelib}/tde-guidance/sizeview.py
+%pycached %{python_sitelib}/tde-guidance/unixauthdb.py
+%pycached %{python_sitelib}/tde-guidance/userconfig.py
%endif
-%{tde_tdedocdir}/HTML/en/guidance/
# Files from powermanager
%if 0%{?with_powermanager}
@@ -239,6 +224,11 @@ or can be run as standalone applications.
%exclude %{tde_datadir}/apps/guidance/pics/processor.png
%endif
+%{tde_tdedocdir}/HTML/en/tde-guidance/
+%{tde_mandir}/man1/mountconfig-trinity.1*
+%{tde_mandir}/man1/serviceconfig-trinity.1*
+%{tde_mandir}/man1/userconfig-trinity.1*
+
##########
%package backends
@@ -258,29 +248,15 @@ Guidance configuration tools.
%files backends
%defattr(-,root,root,-)
-%dir %{python_sitearch}/%{name}
-%if 0%{?rhel} == 7 || 0%{?suse_version}
-%{python_sitearch}/%{name}/MicroHAL.py*
-%{python_sitearch}/%{name}/drivedetect.py*
-%{python_sitearch}/%{name}/wineread.py*
-%{python_sitearch}/%{name}/winewrite.py*
-%{python_sitearch}/%{name}/xf86misc.py*
+%dir %{python_sitelib}/tde-guidance
+%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
+%{python_sitelib}/tde-guidance/MicroHAL.py*
%if 0%{?rhel} == 7
-%{python_sitearch}/%{name}/__pycache__/MicroHAL.*.pyc
-%{python_sitearch}/%{name}/__pycache__/drivedetect.*.pyc
-%{python_sitearch}/%{name}/__pycache__/wineread.*.pyc
-%{python_sitearch}/%{name}/__pycache__/winewrite.*.pyc
-%{python_sitearch}/%{name}/__pycache__/xf86misc.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/MicroHAL.*.pyc
%endif
%else
-%pycached %{python_sitearch}/%{name}/MicroHAL.py
-%pycached %{python_sitearch}/%{name}/drivedetect.py
-%pycached %{python_sitearch}/%{name}/wineread.py
-%pycached %{python_sitearch}/%{name}/winewrite.py
-%pycached %{python_sitearch}/%{name}/xf86misc.py
+%pycached %{python_sitelib}/tde-guidance/MicroHAL.py
%endif
-%{python_sitearch}/ixf86misc*.so
-%{python_sitearch}/xf86misc*.pyc
##########
@@ -307,32 +283,32 @@ suspend using HAL.
%files powermanager
%defattr(-,root,root,-)
%{tde_bindir}/guidance-power-manager
-%if 0%{?rhel} == 7 || 0%{?suse_version}
-%{python_sitearch}/%{name}/MicroHAL.py*
-%{python_sitearch}/%{name}/guidance-power-manager.py*
-%{python_sitearch}/%{name}/powermanage.py*
-%{python_sitearch}/%{name}/gpmhelper.py*
-%{python_sitearch}/%{name}/powermanager_ui.py*
-%{python_sitearch}/%{name}/guidance_power_manager_ui.py*
-%{python_sitearch}/%{name}/notify.py*
-%{python_sitearch}/%{name}/tooltip.py*
-%{python_sitearch}/%{name}/__pycache__/MicroHAL.*.pyc
-%{python_sitearch}/%{name}/__pycache__/guidance-power-manager.*.pyc
-%{python_sitearch}/%{name}/__pycache__/powermanage.*.pyc
-%{python_sitearch}/%{name}/__pycache__/gpmhelper.*.pyc
-%{python_sitearch}/%{name}/__pycache__/powermanager_ui.*.pyc
-%{python_sitearch}/%{name}/__pycache__/guidance_power_manager_ui.*.pyc
-%{python_sitearch}/%{name}/__pycache__/notify.*.pyc
-%{python_sitearch}/%{name}/__pycache__/tooltip.*.pyc
+%if 0%{?mdkver} ||0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
+%{python_sitelib}/tde-guidance/MicroHAL.py*
+%{python_sitelib}/tde-guidance/guidance-power-manager.py*
+%{python_sitelib}/tde-guidance/powermanage.py*
+%{python_sitelib}/tde-guidance/gpmhelper.py*
+%{python_sitelib}/tde-guidance/powermanager_ui.py*
+%{python_sitelib}/tde-guidance/guidance_power_manager_ui.py*
+%{python_sitelib}/tde-guidance/notify.py*
+%{python_sitelib}/tde-guidance/tooltip.py*
+%{python_sitelib}/tde-guidance/__pycache__/MicroHAL.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/guidance-power-manager.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/powermanage.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/gpmhelper.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/powermanager_ui.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/guidance_power_manager_ui.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/notify.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/tooltip.*.pyc
%else
-%pycached %{python_sitearch}/%{name}/MicroHAL.py
-%pycached %{python_sitearch}/%{name}/guidance-power-manager.py
-%pycached %{python_sitearch}/%{name}/powermanage.py
-%pycached %{python_sitearch}/%{name}/gpmhelper.py
-%pycached %{python_sitearch}/%{name}/powermanager_ui.py
-%pycached %{python_sitearch}/%{name}/guidance_power_manager_ui.py
-%pycached %{python_sitearch}/%{name}/notify.py
-%pycached %{python_sitearch}/%{name}/tooltip.py
+%pycached %{python_sitelib}/tde-guidance/MicroHAL.py
+%pycached %{python_sitelib}/tde-guidance/guidance-power-manager.py
+%pycached %{python_sitelib}/tde-guidance/powermanage.py
+%pycached %{python_sitelib}/tde-guidance/gpmhelper.py
+%pycached %{python_sitelib}/tde-guidance/powermanager_ui.py
+%pycached %{python_sitelib}/tde-guidance/guidance_power_manager_ui.py
+%pycached %{python_sitelib}/tde-guidance/notify.py
+%pycached %{python_sitelib}/tde-guidance/tooltip.py
%endif
%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
%{tde_datadir}/apps/guidance/pics/ac-adapter.png
@@ -363,151 +339,43 @@ suspend using HAL.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-#export PYTHONPATH=%{python_sitearch}/pytqt
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
-export PYTHONDONTWRITEBYTECODE=
-
-# FTBFS on PCLOS ...
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I%{tde_tdeincludedir} -I%{tde_includedir}"
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
- export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
- %__sed -i "setup.py" -e "s|/usr/X11R6/lib|/usr/X11R6/%{_lib}|g"
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+ %__mkdir_p build
+ cd build
fi
-%__python ./setup.py build
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON" \
+ ..
+
+%__make %{?_smp_mflags} || %__make
%install
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}"
-export SIPTQT_DIR="%{python_sitearch}/sip4_tqt"
-export PYTHONPATH="%{python_sitearch}/pytqt"
-
-# Support for 'sip4-tqt'
-export PYTHONPATH="%{python_sitearch}/sip4_tqt:${PYTHONPATH}"
-
-# For Mageia/Mandriva: Avoids 'error: byte-compiling must be disabled.
-export PYTHONDONTWRITEBYTECODE=
-
-%__rm -rf %{buildroot}
-%__python ./setup.py install \
- --prefix=%{tde_prefix} \
- --root=%{buildroot}
-
-# Fix temporary build directories remaining inside .py files
-for f in %{buildroot}%{tde_datadir}/apps/guidance/*.py; do
- %__sed -i "${f}" -e "s|%{buildroot}||g"
-done
-
-##### MAIN PACKAGE INSTALLATION (based on Debian/Ubuntu packaging rules)
-# install icons to right place
-%__mkdir_p %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps
-%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-app-daemons.png \
- %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/daemons.png
-%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/kcmpartitions.png \
- %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/disksfilesystems.png
-%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-user.png \
- %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/userconfig.png
-%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/32-wine.png \
- %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/wineconfig.png
-%__install -D -p -m0644 kde/wineconfig/pics/16x16/wineconfig.png \
- %{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/apps/wineconfig.png
-
-# fix binary-or-shlib-defines-rpath
-chrpath -r %{tde_libdir} %{buildroot}%{tde_tdelibdir}/kcm_*.so
-
-# fix executable-not-elf-or-script
-%__chmod 0644 %{buildroot}%{tde_datadir}/apps/guidance/pics/kdewinewizard.png
-
-# move python modules in %{python_sitearch} (/usr/lib/pythonXX/site-packages)
-%__mkdir_p %{buildroot}%{python_sitearch}/%{name}
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/*.py* %{buildroot}%{python_sitearch}/%{name}
-
-# Generates the startup scripts
-%__rm -f %{buildroot}%{tde_bindir}/*
-%__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{tde_bindir}/mountconfig
-%__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{tde_bindir}/serviceconfig
-%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{tde_bindir}/userconfig
-%__ln_s -f %{python_sitearch}/%{name}/wineconfig.py %{buildroot}%{tde_bindir}/wineconfig
-%__ln_s -f %{python_sitearch}/%{name}/grubconfig.py %{buildroot}%{tde_bindir}/grubconfig
-
-# fix script-not-executable
-%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py
-%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/grubconfig.py
-
-##### BACKENDS INSTALLATION
-
-# The xf86misc stuff should not go under /opt/trinity bur under /usr !!!
-%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/ixf86misc*.so %{buildroot}%{python_sitearch}/
-%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/__pycache__/xf86misc*.pyc %{buildroot}%{python_sitearch}/
-%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/xf86misc.py* %{buildroot}%{python_sitearch}/%{name}/
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
-%__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
-%endif
-
-%if 0%{?with_powermanager}
-##### POWERMANAGER INSTALLATION
-# install icon to right place
-%__install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
- %{buildroot}%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%__install -D -p -m0644 kde/powermanager/pics/*.png \
- %{buildroot}%{tde_datadir}/apps/guidance/pics/
-
-# install desktop file
-%__install -D -p -m0644 powermanager/guidance-power-manager.desktop \
- %{buildroot}%{tde_datadir}/autostart/guidance-power-manager.desktop
-
-# copy python modules in PYSUPPORT_PATH
-%__cp powermanager/guidance_power_manager_ui.py %{buildroot}%{python_sitearch}/%{name}
-%__cp powermanager/notify.py %{buildroot}%{python_sitearch}/%{name}
-%__cp powermanager/tooltip.py %{buildroot}%{python_sitearch}/%{name}
-
-# generate guidance-power-manager script
-cat <<EOF >%{?buildroot}%{tde_bindir}/guidance-power-manager
-#!/bin/sh
-export PYTHONPATH=%{python_sitearch}/%{name}:%{python_sitearch}/sip4-tqt
-%{python_sitearch}/%{name}/guidance-power-manager.py &
-EOF
-chmod +x %{buildroot}%{tde_bindir}/guidance-power-manager
-
-# fix script-not-executable
-chmod 0755 %{buildroot}%{python_sitearch}/%{name}/powermanage.py
-chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py
-
-%else
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py*
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance-power-manager.py*
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance_power_manager_ui.py*
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanage.py*
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanager_ui.py*
-%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/powermanager_ui.ui
-
-%endif
-
-# Replace all '#!' calls to python with /usr/bin/python
-# and make them executable
-for i in `find %{buildroot} -type f`; do
- sed '1s,#!.*python[^ ]*\(.*\),#!/usr/bin/env %python\1,' \
- $i > $i.temp;
- if cmp --quiet $i $i.temp; then
- rm -f $i.temp;
- else
- mv -f $i.temp $i;
- chmod 755 $i;
- echo "fixed interpreter: $i";
- fi;
-done
-
-# Removes useless files
-find %{buildroot} -name "*.egg-info" -exec rm -f {} \;
-find %{buildroot}%{tde_libdir} -name "*.a" -exec rm -f {} \;
-%__rm -rf %{buildroot}%{tde_libdir}/python*/site-packages/guidance-*.egg-info/
+%__rm -fr $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
%clean
diff --git a/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec
index 18b2af3d8..39cf4c8dc 100644
--- a/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec
+++ b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.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.2
%endif
%define tde_pkg tde-systemsettings
%define tde_prefix /opt/trinity
@@ -110,7 +110,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec
index bae1fa842..78b5236f7 100644
--- a/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec
+++ b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.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.2
%endif
%define tde_pkg tdenetworkmanager
%define tde_prefix /opt/trinity
@@ -98,7 +98,7 @@ Requires: NetworkManager-gnome
Requires: networkmanager
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} != 8
+%if 0%{?mgaversion} && 0%{?mgaversion} <= 7
BuildRequires: %{_lib}nm-util-devel
%endif
%endif
@@ -107,29 +107,45 @@ BuildRequires: %{_lib}nm-util-devel
%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
BuildRequires: NetworkManager-libnm-devel
%else
+%if 0%{?mdkver}
+BuildRequires: %{_lib}nm-devel
+%else
BuildRequires: NetworkManager-glib-devel
%endif
%endif
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: NetworkManager-devel
Requires: NetworkManager
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# DBUS support
BuildRequires: trinity-dbus-1-tqt-devel >= 1:0.9
BuildRequires: trinity-dbus-tqt-devel >= 1:0.63
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}udev-devel
+%else
BuildRequires: libudev-devel
%endif
+%endif
# IDN support
BuildRequires: libidn-devel
@@ -142,7 +158,11 @@ BuildRequires: gamin-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -209,7 +229,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/settings/tdesudo/tdesudo.spec b/redhat/applications/settings/tdesudo/tdesudo.spec
index 78395d8da..e14e40149 100644
--- a/redhat/applications/settings/tdesudo/tdesudo.spec
+++ b/redhat/applications/settings/tdesudo/tdesudo.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.2
%endif
%define tde_pkg tdesudo
%define tde_prefix /opt/trinity
@@ -66,13 +66,21 @@ BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -113,7 +121,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/settings/wlassistant/wlassistant.spec b/redhat/applications/settings/wlassistant/wlassistant.spec
index 00322f76c..b60b75b61 100644
--- a/redhat/applications/settings/wlassistant/wlassistant.spec
+++ b/redhat/applications/settings/wlassistant/wlassistant.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.2
%endif
%define tde_pkg wlassistant
%define tde_prefix /opt/trinity
@@ -110,7 +110,11 @@ BuildRequires: %{python}
BuildRequires: %{python}-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -143,7 +147,7 @@ if [ -d "/usr/X11R6" ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/system/dolphin/dolphin.spec b/redhat/applications/system/dolphin/dolphin.spec
index be49385f3..b9278b00a 100644
--- a/redhat/applications/system/dolphin/dolphin.spec
+++ b/redhat/applications/system/dolphin/dolphin.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.2
%endif
%define tde_pkg dolphin
%define tde_prefix /opt/trinity
@@ -68,13 +68,21 @@ BuildRequires: pkgconfig
BuildRequires: libtool
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -109,7 +117,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/system/katapult/katapult.spec b/redhat/applications/system/katapult/katapult.spec
index a2d25b15f..ec9756fd2 100644
--- a/redhat/applications/system/katapult/katapult.spec
+++ b/redhat/applications/system/katapult/katapult.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.2
%endif
%define tde_pkg katapult
%define tde_prefix /opt/trinity
@@ -66,13 +66,21 @@ BuildRequires: gcc-c++
BuildRequires: pkgconfig
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -110,7 +118,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/system/kbfx/kbfx.spec b/redhat/applications/system/kbfx/kbfx.spec
index 415697e00..849735a3c 100644
--- a/redhat/applications/system/kbfx/kbfx.spec
+++ b/redhat/applications/system/kbfx/kbfx.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.2
%endif
%define tde_pkg kbfx
%define tde_prefix /opt/trinity
@@ -91,10 +91,18 @@ BuildRequires: gamin-devel
BuildRequires: pcre-devel
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -137,7 +145,7 @@ if [ -d "/usr/X11R6" ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -228,6 +236,7 @@ export PATH="%{tde_bindir}:${PATH}"
%lang(hu) %{tde_datadir}/locale/hu/LC_MESSAGES/kbfxconfigapp.mo
%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/kbfxconfigapp.mo
%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/kbfxconfigapp.mo
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kbfxconfigapp.mo
%{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop
diff --git a/redhat/applications/system/kcmautostart/kcmautostart.spec b/redhat/applications/system/kcmautostart/kcmautostart.spec
index 09b86d7a6..fcf85ed7d 100644
--- a/redhat/applications/system/kcmautostart/kcmautostart.spec
+++ b/redhat/applications/system/kcmautostart/kcmautostart.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.2
%endif
%define tde_pkg kcmautostart
%define tde_prefix /opt/trinity
@@ -66,13 +66,21 @@ BuildRequires: gcc-c++
BuildRequires: pkgconfig
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -109,7 +117,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/system/kdbusnotification/kdbusnotification.spec b/redhat/applications/system/kdbusnotification/kdbusnotification.spec
index 380ea714c..693084f0d 100644
--- a/redhat/applications/system/kdbusnotification/kdbusnotification.spec
+++ b/redhat/applications/system/kdbusnotification/kdbusnotification.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.2
%endif
%define tde_pkg kdbusnotification
%define tde_prefix /opt/trinity
@@ -75,7 +75,11 @@ BuildRequires: brp-check-trinity
%endif
# GTK2 stuff
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gtk+2.0-devel
+%else
BuildRequires: gtk2-devel
+%endif
# DBUS stuff
%if 0%{?suse_version}
@@ -85,13 +89,21 @@ BuildRequires: dbus-glib-devel
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -123,7 +135,7 @@ if [ -r "/usr/include/harfbuzz/hb.h" ]; then
RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/include/harfbuzz"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/system/klamav/klamav.spec b/redhat/applications/system/klamav/klamav.spec
index 015eaa364..4b892dcf1 100644
--- a/redhat/applications/system/klamav/klamav.spec
+++ b/redhat/applications/system/klamav/klamav.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.2
%endif
%define tde_pkg klamav
%define tde_prefix /opt/trinity
@@ -67,7 +67,14 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: curl-devel
BuildRequires: gmp-devel
-BuildRequires: sqlite-devel
+
+# SQLITE3 support
+%if 0%{?mgaversion}
+BuildRequires: sqlite3-devel
+%else
+BuildRequires: sqlite-devel
+%endif
+
#BuildRequires: unsermake
# CLAMAV support
@@ -76,7 +83,11 @@ BuildRequires: clamav-devel
Requires: clamav
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -95,7 +106,7 @@ A TDE front-end for the Clam AntiVirus antivirus toolkit.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/system/knemo/knemo.spec b/redhat/applications/system/knemo/knemo.spec
index b6f820d57..0b8398d96 100644
--- a/redhat/applications/system/knemo/knemo.spec
+++ b/redhat/applications/system/knemo/knemo.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.2
%endif
%define tde_pkg knemo
%define tde_prefix /opt/trinity
@@ -89,28 +89,44 @@ Requires: net-tools-deprecated
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# Wireless support
-%define with_wifi 1
+# Wifi support
%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
-BuildRequires: wireless-tools-devel
+%define wifi_devel wireless-tools-devel
%endif
%if 0%{?mgaversion} == 2 || 0%{?mdkversion}
-BuildRequires: %{_lib}iw29-devel
+%define wifi_devel %{_lib}iw29-devel
%endif
%if 0%{?rhel} == 5 || 0%{?suse_version}
-BuildRequires: wireless-tools
+%define wifi_devel wireless-tools
%endif
%if 0%{?suse_version} || 0%{?mgaversion} >= 3
-BuildRequires: libiw-devel
+%define wifi_devel libiw-devel
%endif
+%if 0%{?mdkver}
+%define wifi_devel %nil
+%endif
+%if "%{wifi_devel}" != ""
+%define with_wifi 1
+BuildRequires: %{wifi_devel}
+%endif
+
%description
@@ -141,7 +157,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/system/knetload/knetload.spec b/redhat/applications/system/knetload/knetload.spec
index 33cddaa00..3eccc8401 100644
--- a/redhat/applications/system/knetload/knetload.spec
+++ b/redhat/applications/system/knetload/knetload.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.2
%endif
%define tde_pkg knetload
%define tde_prefix /opt/trinity
@@ -67,13 +67,21 @@ BuildRequires: pkgconfig
BuildRequires: libtool
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -114,7 +122,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/system/knetstats/knetstats.spec b/redhat/applications/system/knetstats/knetstats.spec
index 6fc41e1f5..7f8f0a3ce 100644
--- a/redhat/applications/system/knetstats/knetstats.spec
+++ b/redhat/applications/system/knetstats/knetstats.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.2
%endif
%define tde_pkg knetstats
%define tde_prefix /opt/trinity
@@ -67,13 +67,21 @@ BuildRequires: pkgconfig
BuildRequires: libtool
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -109,7 +117,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/system/kooldock/kooldock.spec b/redhat/applications/system/kooldock/kooldock.spec
index 410e8e783..36cc07ac7 100644
--- a/redhat/applications/system/kooldock/kooldock.spec
+++ b/redhat/applications/system/kooldock/kooldock.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.2
%endif
%define tde_pkg kooldock
%define tde_prefix /opt/trinity
@@ -71,10 +71,18 @@ BuildRequires: libtool
BuildRequires: libidn-devel
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -118,7 +126,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/system/krusader/krusader.spec b/redhat/applications/system/krusader/krusader.spec
index cf314c68f..e07247721 100644
--- a/redhat/applications/system/krusader/krusader.spec
+++ b/redhat/applications/system/krusader/krusader.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.2
%endif
%define tde_pkg krusader
%define tde_prefix /opt/trinity
@@ -110,7 +110,7 @@ great on your desktop.
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -169,6 +169,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%{tde_tdeappdir}/krusader.desktop
%{tde_tdeappdir}/krusader_root-mode.desktop
%{tde_datadir}/apps/krusader
+%{tde_datadir}/apps/tdeconf_update/krusader_tqt_selection.upd
%{tde_datadir}/icons/crystalsvg/*/apps/*.png
%{tde_datadir}/icons/locolor/*/apps/*.png
%{tde_datadir}/services/krarc.protocol
diff --git a/redhat/applications/system/kshutdown/kshutdown.spec b/redhat/applications/system/kshutdown/kshutdown.spec
index f86297e04..ef3ca8ff9 100644
--- a/redhat/applications/system/kshutdown/kshutdown.spec
+++ b/redhat/applications/system/kshutdown/kshutdown.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.2
%endif
%define tde_pkg kshutdown
%define tde_prefix /opt/trinity
@@ -66,13 +66,21 @@ BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -115,7 +123,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/system/ksystemlog/ksystemlog.spec b/redhat/applications/system/ksystemlog/ksystemlog.spec
index 731557a72..6af7a8049 100644
--- a/redhat/applications/system/ksystemlog/ksystemlog.spec
+++ b/redhat/applications/system/ksystemlog/ksystemlog.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.2
%endif
%define tde_pkg ksystemlog
%define tde_prefix /opt/trinity
@@ -103,7 +103,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/system/kvkbd/kvkbd.spec b/redhat/applications/system/kvkbd/kvkbd.spec
index 1a36e6ce4..74a5caa52 100644
--- a/redhat/applications/system/kvkbd/kvkbd.spec
+++ b/redhat/applications/system/kvkbd/kvkbd.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.2
%endif
%define tde_pkg kvkbd
%define tde_prefix /opt/trinity
@@ -66,13 +66,21 @@ BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -108,7 +116,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec b/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec
index bbcf45ee8..790250940 100644
--- a/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec
+++ b/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec
@@ -17,7 +17,7 @@
# TDE variables
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg polkit-agent-tde
%define tde_prefix /opt/trinity
@@ -89,7 +89,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/system/smartcardauth/smartcardauth.spec b/redhat/applications/system/smartcardauth/smartcardauth.spec
index ac53e189a..0bb7cda1f 100644
--- a/redhat/applications/system/smartcardauth/smartcardauth.spec
+++ b/redhat/applications/system/smartcardauth/smartcardauth.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.2
%endif
%define tde_pkg smartcardauth
%define tde_prefix /opt/trinity
@@ -163,7 +163,7 @@ in addition to the PKCS certificate functionality
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/system/tastymenu/tastymenu.spec b/redhat/applications/system/tastymenu/tastymenu.spec
index 635273ad1..1956800a0 100644
--- a/redhat/applications/system/tastymenu/tastymenu.spec
+++ b/redhat/applications/system/tastymenu/tastymenu.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.2
%endif
%define tde_pkg tastymenu
%define tde_prefix /opt/trinity
@@ -68,13 +68,21 @@ BuildRequires: pkgconfig
BuildRequires: libtool
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -107,7 +115,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/system/tdebluez/tdebluez.spec b/redhat/applications/system/tdebluez/tdebluez.spec
index e17236b1c..7bffd6839 100644
--- a/redhat/applications/system/tdebluez/tdebluez.spec
+++ b/redhat/applications/system/tdebluez/tdebluez.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.2
%endif
%define tde_pkg tdebluez
%define tde_prefix /opt/trinity
@@ -68,7 +68,11 @@ BuildRequires: pkgconfig
BuildRequires: libtool
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
@@ -208,7 +212,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/system/tdedocker/tdedocker.spec b/redhat/applications/system/tdedocker/tdedocker.spec
index 1b7f796f1..811015d8d 100644
--- a/redhat/applications/system/tdedocker/tdedocker.spec
+++ b/redhat/applications/system/tdedocker/tdedocker.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.2
%endif
%define tde_pkg tdedocker
%define tde_prefix /opt/trinity
@@ -66,16 +66,28 @@ BuildRequires: gcc-c++
BuildRequires: pkgconfig
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# XKBFILES support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}xkbfile-devel
+%else
BuildRequires: libxkbfile-devel
+%endif
# XMU support
%if 0%{?suse_version} == 1140
@@ -85,7 +97,7 @@ BuildRequires: xorg-x11-libXmu-devel
BuildRequires: libXmu-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion} >= 4
-BuildRequires: libxmu-devel
+BuildRequires: %{_lib}xmu-devel
%endif
%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel
@@ -136,7 +148,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -190,7 +202,6 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_tdeappdir}/tdedocker.desktop
%{tde_datadir}/apps/tdedocker/
%{tde_datadir}/icons/hicolor/*/apps/tdedocker.png
-%{tde_datadir}/apps/tdedocker/icons/question.png
%{tde_mandir}/man1/tdedocker.1*
diff --git a/redhat/applications/system/tdepowersave/tdepowersave.spec b/redhat/applications/system/tdepowersave/tdepowersave.spec
index a57c0e328..ebbce92b3 100644
--- a/redhat/applications/system/tdepowersave/tdepowersave.spec
+++ b/redhat/applications/system/tdepowersave/tdepowersave.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.2
%endif
%define tde_pkg tdepowersave
%define tde_prefix /opt/trinity
@@ -82,8 +82,12 @@ BuildRequires: brp-check-trinity
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%define with_tdehwlib 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}udev-devel
+%else
BuildRequires: libudev-devel
%endif
+%endif
# XSCREENSAVER support
# Disabled on RHEL4
@@ -111,7 +115,11 @@ BuildRequires: xscreensaver
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
@@ -124,7 +132,11 @@ BuildRequires: gamin-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
Obsoletes: trinity-kpowersave < %{?epoch:%{epoch}:}%{version}-%{release}
@@ -179,7 +191,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec
index 8277d6397..93761e347 100644
--- a/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec
+++ b/redhat/applications/system/tdesshaskpass/tdesshaskpass.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.2
%endif
%define tde_pkg tdesshaskpass
%define tde_prefix /opt/trinity
@@ -66,13 +66,21 @@ BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -110,7 +118,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -145,12 +153,14 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
+%find_lang %{tde_pkg}
+
%clean
%__rm -rf %{buildroot}
-%files
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc ChangeLog COPYING README.md
%{tde_bindir}/*
diff --git a/redhat/applications/system/yakuake/yakuake.spec b/redhat/applications/system/yakuake/yakuake.spec
index 97d9157af..bacb6c882 100644
--- a/redhat/applications/system/yakuake/yakuake.spec
+++ b/redhat/applications/system/yakuake/yakuake.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.2
%endif
%define tde_pkg yakuake
%define tde_prefix /opt/trinity
@@ -66,13 +66,21 @@ BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -105,7 +113,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec b/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec
index 57f61207f..aa49a5634 100644
--- a/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec
+++ b/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.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.2
%endif
%define tde_pkg tdeio-appinfo
%define tde_prefix /opt/trinity
@@ -67,13 +67,21 @@ BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -110,7 +118,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec b/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec
index 3efdf5d7e..f4631631e 100644
--- a/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec
+++ b/redhat/applications/tdeio/tdeio-apt/tdeio-apt.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.2
%endif
%define tde_pkg tdeio-apt
%define tde_prefix /opt/trinity
@@ -66,7 +66,11 @@ BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
@@ -108,7 +112,7 @@ browsing the packages easier. It provides:
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec b/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec
index 947e89b16..8dc6b9097 100644
--- a/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec
+++ b/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.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.2
%endif
%define tde_pkg tdeio-ftps
%define tde_prefix /opt/trinity
@@ -67,13 +67,21 @@ BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -111,7 +119,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec b/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec
index 8b833c35e..18dab2b6b 100644
--- a/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec
+++ b/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.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.2
%endif
%define tde_pkg tdeio-gopher
%define tde_prefix /opt/trinity
@@ -67,7 +67,11 @@ BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
@@ -107,7 +111,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec b/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec
index e8a4418ed..c58492e13 100644
--- a/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec
+++ b/redhat/applications/tdeio/tdeio-locate/tdeio-locate.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.2
%endif
%define tde_pkg tdeio-locate
%define tde_prefix /opt/trinity
@@ -77,7 +77,11 @@ BuildRequires: brp-check-trinity
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
@@ -90,7 +94,11 @@ BuildRequires: gamin-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
Obsoletes: trinity-kio-locate < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-kio-locate = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -123,7 +131,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec b/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec
index 8a3804e89..5881bdfbe 100644
--- a/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec
+++ b/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec
@@ -23,7 +23,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdeio-sword
%define tde_prefix /opt/trinity
@@ -72,13 +72,21 @@ BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -121,7 +129,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec b/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec
index 6bb629f89..73a3a7b33 100644
--- a/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec
+++ b/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.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.2
%endif
%define tde_pkg tdeio-umountwrapper
%define tde_prefix /opt/trinity
@@ -71,13 +71,21 @@ BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -113,7 +121,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec b/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec
index 457febb76..833a7dcd9 100644
--- a/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec
+++ b/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.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.2
%endif
%define tde_pkg gtk-qt-engine
%define tde_prefix /opt/trinity
@@ -79,9 +79,13 @@ BuildRequires: %{_lib}gtk+2.0-devel
%if 0%{?pclinuxos}
BuildRequires: %{_lib}gtk+2.0_0-devel
%else
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gtk+2.0-devel
+%else
BuildRequires: gtk+2.0-devel
%endif
%endif
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -122,7 +126,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec b/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec
index ce227d406..43c565fd1 100644
--- a/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec
+++ b/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.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.2
%endif
%define tde_pkg gtk3-tqt-engine
%define tde_prefix /opt/trinity
@@ -86,6 +86,34 @@ BuildRequires: gtk+3.0-devel
%description
GTK3 style engine which uses the active TDE style to draw its widgets
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_libdir}/libtqtcairo.so.0
+%{tde_libdir}/libtqtcairo.so.0.0.0
+%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.la
+%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so
+%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so.0
+%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so.0.0.0
+%dir %{_datadir}/themes/tdegtk
+%dir %{_datadir}/themes/tdegtk/gtk-3.0
+%{_datadir}/themes/tdegtk/gtk-3.0/gtk.css
+
+##########
+
+%package devel
+Summary: Files for the development of applications which will use %{name}
+Group: Development/Libraries
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel
+%{summary}.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libtqtcairo.la
+%{tde_libdir}/libtqtcairo.so
+
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -103,7 +131,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -142,20 +170,4 @@ fi
%__rm -rf %{buildroot}
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_libdir}/libtqtcairo.la
-%{tde_libdir}/libtqtcairo.so
-%{tde_libdir}/libtqtcairo.so.0
-%{tde_libdir}/libtqtcairo.so.0.0.0
-%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.la
-%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so
-%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so.0
-%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so.0.0.0
-%dir %{_datadir}/themes/tdegtk
-%dir %{_datadir}/themes/tdegtk/gtk-3.0
-%{_datadir}/themes/tdegtk/gtk-3.0/gtk.css
-
-
%changelog
diff --git a/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec b/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec
index 76893f3c9..029d46345 100644
--- a/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec
+++ b/redhat/applications/themes/kgtk-qt3/kgtk-qt3.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.2
%endif
%define tde_pkg kgtk-qt3
%define tde_prefix /opt/trinity
@@ -84,8 +84,12 @@ BuildRequires: libidn-devel
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
BuildRequires: gtk2-devel
%else
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gtk+2.0-devel
+%else
BuildRequires: gtk+2.0-devel
%endif
+%endif
# GAMIN support
# Not on openSUSE.
@@ -95,10 +99,18 @@ BuildRequires: gamin-devel
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -128,7 +140,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec b/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec
index 97ac46a3f..1d2ae2a1a 100644
--- a/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec
+++ b/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.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.2
%endif
%define tde_pkg ksplash-engine-moodin
%define tde_prefix /opt/trinity
@@ -70,7 +70,11 @@ BuildRequires: fdupes
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -119,7 +123,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -165,9 +169,7 @@ export PATH="%{tde_bindir}:${PATH}"
%defattr(-,root,root,-)
%{tde_tdelibdir}/ksplashmoodin.la
%{tde_tdelibdir}/ksplashmoodin.so
-%if "%{?tde_version}" == "14.1.0"
%{tde_datadir}/apps/ksplash/Themes/Architecture/
-%endif
%{tde_datadir}/apps/ksplash/Themes/FingerPrint/
%{tde_datadir}/apps/ksplash/Themes/MoodinKDE/
%{tde_datadir}/services/ksplashmoodin.desktop
diff --git a/redhat/applications/themes/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec b/redhat/applications/themes/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec
index d564e576e..588d43858 100644
--- a/redhat/applications/themes/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec
+++ b/redhat/applications/themes/qt4-tqt-theme-engine/qt4-tqt-theme-engine.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.2
%endif
%define tde_pkg qt4-tqt-theme-engine
%define tde_prefix /opt/trinity
diff --git a/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec b/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec
index 3ae8a3cf4..eb1c1224d 100644
--- a/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec
+++ b/redhat/applications/themes/tde-style-baghira/tde-style-baghira.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.2
%endif
%define tde_pkg tde-style-baghira
%define tde_prefix /opt/trinity
@@ -67,8 +67,14 @@ BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
+# JPEG support
+%if 0%{?mdkver}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
-BuildRequires: libjpeg-devel
+BuildRequires: %{libjpeg}-devel
%else
BuildRequires: jpeg-devel
%endif
@@ -92,7 +98,7 @@ Panther and Jaguar looks, and also includes its own 'Baghira' look
%build
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/themes/tde-style-domino/tde-style-domino.spec b/redhat/applications/themes/tde-style-domino/tde-style-domino.spec
index 55517e191..7bde60350 100644
--- a/redhat/applications/themes/tde-style-domino/tde-style-domino.spec
+++ b/redhat/applications/themes/tde-style-domino/tde-style-domino.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.2
%endif
%define tde_pkg tde-style-domino
%define tde_prefix /opt/trinity
@@ -67,10 +67,16 @@ BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
+# JPEG support
+%if 0%{?mdkver}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
-BuildRequires: libjpeg-devel
+BuildRequires: %{libjpeg}-devel
%else
-BuildRequires: jpeg-devel
+BuildRequires: jpeg-devel
%endif
%description
@@ -88,7 +94,7 @@ of the widgets by customizable color gradients.
%build
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec b/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec
index febea2eab..8f6d5dbea 100644
--- a/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec
+++ b/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.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.2
%endif
%define tde_pkg tde-style-ia-ora
%define tde_prefix /opt/trinity
@@ -66,13 +66,21 @@ BuildRequires: pkgconfig
BuildRequires: libtool
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
Requires: trinity-twin
@@ -96,7 +104,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -145,6 +153,10 @@ fi
%{tde_tdelibdir}/twin_iaora_config.so
%{tde_datadir}/apps/tdestyle/themes/ia_ora.themerc
%{tde_datadir}/apps/twin/iaora.desktop
+%{_libdir}/gtk-2.0/2.10.0/engines/libia_ora.la
+%{_libdir}/gtk-2.0/2.10.0/engines/libia_ora.so
+%{_datadir}/themes/Ia*
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/twin_iaora.mo
%changelog
diff --git a/redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec b/redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec
index d021dccf8..351022128 100644
--- a/redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec
+++ b/redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.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.2
%endif
%define tde_pkg tde-style-lipstik
%define tde_prefix /opt/trinity
@@ -84,7 +84,11 @@ BuildRequires: brp-check-trinity
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -111,7 +115,7 @@ Lipstik also provides Lipstik-color-schemes
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec b/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec
new file mode 100644
index 000000000..fe9f3ef40
--- /dev/null
+++ b/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec
@@ -0,0 +1,149 @@
+#
+# spec file for package tde-style-polyester (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# 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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.1.2
+%endif
+%define tde_pkg tde-style-polyester
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+# Required for Mageia and PCLinuxOS: removes the ldflag '--no-undefined'
+%define _disable_ld_no_undefined 1
+
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 1.0.3
+Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary: Domino widget style and twin decoration for TDE
+Group: Graphical desktop/TDE
+URL: http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
+
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+
+BuildRequires: trinity-tde-cmake >= %{tde_version}
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: libtool
+
+# JPEG support
+%if 0%{?mdkver}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
+%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
+BuildRequires: %{libjpeg}-devel
+%else
+BuildRequires: jpeg-devel
+%endif
+
+%description
+Domino is a style with a soft look. It allows to fine adjust the shininess
+of the widgets by customizable color gradients.
+
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+ %__mkdir_p build
+ cd build
+fi
+
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DBUILD_ALL=ON \
+ ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root)
+%{tde_tdelibdir}/plugins/styles/polyester.la
+%{tde_tdelibdir}/plugins/styles/polyester.so
+%{tde_tdelibdir}/tdestyle_polyester_config.la
+%{tde_tdelibdir}/tdestyle_polyester_config.so
+%{tde_tdelibdir}/twin3_polyester.la
+%{tde_tdelibdir}/twin3_polyester.so
+%{tde_tdelibdir}/twin_polyester_config.la
+%{tde_tdelibdir}/twin_polyester_config.so
+%{tde_datadir}/apps/tdedisplay/color-schemes/PolyesterBlue.kcsrc
+%{tde_datadir}/apps/tdedisplay/color-schemes/PolyesterEmerald.kcsrc
+%{tde_datadir}/apps/tdedisplay/color-schemes/PolyesterOrangeJuice.kcsrc
+%{tde_datadir}/apps/tdestyle/themes/polyester.themerc
+%{tde_datadir}/apps/twin/polyester.desktop
+
+
+%changelog
diff --git a/redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec b/redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec
index f7df29f07..c6c675070 100644
--- a/redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec
+++ b/redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.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.2
%endif
%define tde_pkg tde-style-qtcurve
%define tde_prefix /opt/trinity
@@ -81,7 +81,11 @@ BuildRequires: brp-check-trinity
BuildRequires: libidn-devel
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# GAMIN support
# Not on openSUSE.
@@ -91,7 +95,11 @@ BuildRequires: gamin-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
Obsoletes: trinity-kde-style-qtcurve < %{?epoch:%{epoch}:}%{version}-%{release}
@@ -137,7 +145,7 @@ fi
%__rm -f "po/tr.po"
%endif
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/themes/tdmtheme/tdmtheme.spec b/redhat/applications/themes/tdmtheme/tdmtheme.spec
index abb9f2240..94a76585f 100644
--- a/redhat/applications/themes/tdmtheme/tdmtheme.spec
+++ b/redhat/applications/themes/tdmtheme/tdmtheme.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.2
%endif
%define tde_pkg tdmtheme
%define tde_prefix /opt/trinity
@@ -67,13 +67,21 @@ BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -110,7 +118,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec b/redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec
index 8d53b5469..2397c1ed6 100644
--- a/redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec
+++ b/redhat/applications/themes/twin-style-crystal/twin-style-crystal.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.2
%endif
%define tde_pkg twin-style-crystal
%define tde_prefix /opt/trinity
@@ -105,7 +105,7 @@ And it is of course nice to look at. Upstream says:
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec b/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec
index e5a20e401..c522aa406 100644
--- a/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec
+++ b/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.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.2
%endif
%define tde_pkg twin-style-dekorator
%define tde_prefix /opt/trinity
@@ -103,7 +103,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec b/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec
new file mode 100644
index 000000000..6c440c0fe
--- /dev/null
+++ b/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec
@@ -0,0 +1,158 @@
+#
+# spec file for package twin-style-fahrenheit (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# 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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.1.2
+%endif
+%define tde_pkg twin-style-fahrenheit
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 0.1
+Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary: TDE window decoration from SUSE 9.3
+Group: Applications/Utilities
+URL: http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
+
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+
+BuildRequires: trinity-tde-cmake >= %{tde_version}
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
+
+%description
+This is a port of the SUSE 9.3 KDE Window decoration extracted from SUSE.
+
+It features in additon to the original theme several new button
+styles and a changeable titlebar image.
+
+A color scheme for TDE is provided too.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+ %__mkdir_p build
+ cd build
+fi
+
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+ -DLIB_INSTALL_DIR="%{tde_libdir}" \
+ \
+ -DWITH_ALL_OPTIONS=ON \
+ \
+ -DBUILD_ALL=ON \
+ -DBUILD_DOC=ON \
+ -DBUILD_TRANSLATIONS=ON \
+ ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/twin3_fahrenheit.la
+%{tde_tdelibdir}/twin3_fahrenheit.so
+%{tde_datadir}/apps/twin/fahrenheit.desktop
+%{tde_datadir}/apps/twin/fahrenheit/close.png
+%{tde_datadir}/apps/twin/fahrenheit/help.png
+%{tde_datadir}/apps/twin/fahrenheit/maximize.png
+%{tde_datadir}/apps/twin/fahrenheit/minimize.png
+%{tde_datadir}/apps/twin/fahrenheit/minmax.png
+%{tde_datadir}/apps/twin/fahrenheit/sticky.png
+%{tde_datadir}/apps/twin/fahrenheit/unsticky.png
+
+
+%changelog
diff --git a/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec b/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec
index d8734ef3d..dc504b67a 100644
--- a/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec
+++ b/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.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.2
%endif
%define tde_pkg twin-style-machbunt
%define tde_prefix /opt/trinity
@@ -100,7 +100,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -149,6 +149,6 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_tdelibdir}/twin3_MachBunt.so
%{tde_datadir}/apps/tdedisplay/color-schemes/MachBunt.kcsrc
%{tde_datadir}/apps/twin/MachBunt.desktop
-
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/twin-style-machbunt.mo
%changelog
diff --git a/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec b/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec
index 48ae0e695..d688430b5 100644
--- a/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec
+++ b/redhat/applications/themes/twin-style-suse2/twin-style-suse2.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.2
%endif
%define tde_pkg twin-style-suse2
%define tde_prefix /opt/trinity
@@ -102,7 +102,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/utilities/abakus/abakus.spec b/redhat/applications/utilities/abakus/abakus.spec
index 432c6072c..4e11d387e 100644
--- a/redhat/applications/utilities/abakus/abakus.spec
+++ b/redhat/applications/utilities/abakus/abakus.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.2
%endif
%define tde_pkg abakus
%define tde_prefix /opt/trinity
@@ -68,7 +68,11 @@ BuildRequires: bison
BuildRequires: flex
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
@@ -81,7 +85,11 @@ BuildRequires: gamin-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -121,7 +129,7 @@ if [ -d "/usr/X11R6" ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/utilities/filelight/filelight.spec b/redhat/applications/utilities/filelight/filelight.spec
index 09023a7c8..32825f481 100644
--- a/redhat/applications/utilities/filelight/filelight.spec
+++ b/redhat/applications/utilities/filelight/filelight.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.2
%endif
%define tde_pkg filelight
%define tde_prefix /opt/trinity
@@ -76,13 +76,26 @@ BuildRequires: gamin-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# ATTR support
-BuildRequires: libattr-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libattr_devel %{_lib}attr-devel
+%else
+%define libattr_devel libattr-devel
+%endif
+BuildRequires: %{libattr_devel}
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -117,7 +130,7 @@ directories on your computer.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/utilities/kbarcode/kbarcode.spec b/redhat/applications/utilities/kbarcode/kbarcode.spec
index b197f9741..6164dc971 100644
--- a/redhat/applications/utilities/kbarcode/kbarcode.spec
+++ b/redhat/applications/utilities/kbarcode/kbarcode.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.2
%endif
%define tde_pkg kbarcode
%define tde_prefix /opt/trinity
@@ -69,13 +69,21 @@ BuildRequires: gcc-c++
BuildRequires: pkgconfig
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# PCRE support
BuildRequires: pcre-devel
@@ -163,7 +171,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/utilities/kchmviewer/kchmviewer.spec b/redhat/applications/utilities/kchmviewer/kchmviewer.spec
index c2904d693..b3c11038d 100644
--- a/redhat/applications/utilities/kchmviewer/kchmviewer.spec
+++ b/redhat/applications/utilities/kchmviewer/kchmviewer.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.2
%endif
%define tde_pkg kchmviewer
%define tde_prefix /opt/trinity
@@ -84,13 +84,21 @@ BuildRequires: chmlib-devel
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
KchmViewer is a chm (MS HTML help file format) viewer, written in C++.
@@ -131,7 +139,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/utilities/kcpuload/kcpuload.spec b/redhat/applications/utilities/kcpuload/kcpuload.spec
index 594396581..04cc9a1cd 100644
--- a/redhat/applications/utilities/kcpuload/kcpuload.spec
+++ b/redhat/applications/utilities/kcpuload/kcpuload.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.2
%endif
%define tde_pkg kcpuload
%define tde_prefix /opt/trinity
@@ -70,7 +70,11 @@ BuildRequires: pkgconfig
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -110,7 +114,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/utilities/kdirstat/kdirstat.spec b/redhat/applications/utilities/kdirstat/kdirstat.spec
index 1b9bc1148..08cd58522 100644
--- a/redhat/applications/utilities/kdirstat/kdirstat.spec
+++ b/redhat/applications/utilities/kdirstat/kdirstat.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.2
%endif
%define tde_pkg kdirstat
%define tde_prefix /opt/trinity
@@ -67,13 +67,21 @@ BuildRequires: pkgconfig
BuildRequires: libtool
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -115,7 +123,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/utilities/keep/keep.spec b/redhat/applications/utilities/keep/keep.spec
index adbf9d811..d76f6b613 100644
--- a/redhat/applications/utilities/keep/keep.spec
+++ b/redhat/applications/utilities/keep/keep.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.2
%endif
%define tde_pkg keep
%define tde_prefix /opt/trinity
@@ -78,13 +78,21 @@ BuildRequires: brp-check-trinity
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
Requires: rdiff-backup
@@ -114,7 +122,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/utilities/knutclient/knutclient.spec b/redhat/applications/utilities/knutclient/knutclient.spec
index ab101e33e..2f96d7d0b 100644
--- a/redhat/applications/utilities/knutclient/knutclient.spec
+++ b/redhat/applications/utilities/knutclient/knutclient.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.2
%endif
%define tde_pkg knutclient
%define tde_prefix /opt/trinity
@@ -67,13 +67,21 @@ BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -114,7 +122,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -171,8 +179,7 @@ fi
%doc AUTHORS ChangeLog COPYING README.md
%{tde_bindir}/knutclient
%{tde_tdeappdir}/knutclient.desktop
-%{tde_datadir}/apps/knutclient/knutclientui.rc
-%{tde_datadir}/apps/knutclient
+%{tde_datadir}/apps/knutclient/
%{tde_tdedocdir}/HTML/cs/knutclient
%{tde_tdedocdir}/HTML/en/knutclient
%{tde_datadir}/icons/hicolor/*/apps/*.png
diff --git a/redhat/applications/utilities/kommando/kommando.spec b/redhat/applications/utilities/kommando/kommando.spec
new file mode 100644
index 000000000..cc39c7652
--- /dev/null
+++ b/redhat/applications/utilities/kommando/kommando.spec
@@ -0,0 +1,162 @@
+#
+# spec file for package kommando (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# 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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.1.2
+%endif
+%define tde_pkg kommando
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 0.5.2
+Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary: Calculator for TDE
+Group: Applications/Utilities
+URL: http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
+
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+
+BuildRequires: desktop-file-utils
+
+BuildRequires: trinity-tde-cmake >= %{tde_version}
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
+
+%description
+AbaKus is a complex calculator, which provides
+many different kinds of calculations.
+Think of it as bc (the command-line calculator) with a nice GUI.
+It also gives information about mathematical variables and
+has the user-friendly menu options of a normal TDE application.
+
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+# Specific path for RHEL4
+if [ -d "/usr/X11R6" ]; then
+ export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+fi
+
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+ %__mkdir_p build
+ cd build
+fi
+
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON" \
+ ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+# Clean unwanted files
+%__rm -f %{?buildroot}%{tde_libdir}/libkommando.la
+%__rm -f %{?buildroot}%{tde_libdir}/libkommando.so
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_datadir}/icons/hicolor/*/apps/kommando.png
+%{tde_tdedocdir}/HTML/en/kommando/
+%{tde_tdeappdir}/kommando.desktop
+%{tde_mandir}/man1/kommando.1*
+%{tde_datadir}/services/kded/kommandod.desktop
+%{tde_libdir}/libkommando.so.1
+%{tde_libdir}/libkommando.so.1.0.0
+%{tde_tdelibdir}/kcm_kommando.la
+%{tde_tdelibdir}/kcm_kommando.so
+%{tde_tdelibdir}/kded_kommandod.la
+%{tde_tdelibdir}/kded_kommandod.so
+
+
+%changelog
diff --git a/redhat/applications/utilities/kompose/kompose.spec b/redhat/applications/utilities/kompose/kompose.spec
index 6fbe30cfa..e9d65c5a4 100644
--- a/redhat/applications/utilities/kompose/kompose.spec
+++ b/redhat/applications/utilities/kompose/kompose.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.2
%endif
%define tde_pkg kompose
%define tde_prefix /opt/trinity
@@ -103,7 +103,7 @@ by a scaled screen shot of it. It appears as a panel applet.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/utilities/krename/krename.spec b/redhat/applications/utilities/krename/krename.spec
index e36feb919..5b1b0e216 100644
--- a/redhat/applications/utilities/krename/krename.spec
+++ b/redhat/applications/utilities/krename/krename.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.2
%endif
%define tde_pkg krename
%define tde_prefix /opt/trinity
@@ -69,10 +69,18 @@ BuildRequires: fdupes
BuildRequires: libidn-devel
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -108,7 +116,7 @@ or Exif informations of an image.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/utilities/ksensors/ksensors.spec b/redhat/applications/utilities/ksensors/ksensors.spec
index f89269441..f9f515aa2 100644
--- a/redhat/applications/utilities/ksensors/ksensors.spec
+++ b/redhat/applications/utilities/ksensors/ksensors.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.2
%endif
%define tde_pkg ksensors
%define tde_prefix /opt/trinity
@@ -70,7 +70,11 @@ BuildRequires: fdupes
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -116,7 +120,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/utilities/mathemagics/mathemagics.spec b/redhat/applications/utilities/mathemagics/mathemagics.spec
index 7164239fb..be04a512f 100644
--- a/redhat/applications/utilities/mathemagics/mathemagics.spec
+++ b/redhat/applications/utilities/mathemagics/mathemagics.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.2
%endif
%define tde_pkg mathemagics
%define tde_prefix /opt/trinity
@@ -78,7 +78,7 @@ Mathemagics is a RPN Calculator.
%build
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec b/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec
index 4a421c78a..a343befe6 100644
--- a/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec
+++ b/redhat/applications/utilities/qalculate-tde/qalculate-tde.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.2
%endif
%define tde_pkg qalculate-tde
%define tde_prefix /opt/trinity
@@ -66,7 +66,11 @@ BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}qalculate-devel >= 0.9.6
+%else
BuildRequires: libqalculate-devel >= 0.9.6
+%endif
%if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500 || 0%{?rhel}
BuildRequires: cln-devel
@@ -114,7 +118,7 @@ This package contains the TDE user interface of qalculate.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi