summaryrefslogtreecommitdiffstats
path: root/redhat/applications
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/applications')
-rw-r--r--redhat/applications/development/piklab/piklab.spec3
-rw-r--r--redhat/applications/graphics/ksquirrel/ksquirrel.spec14
-rw-r--r--redhat/applications/internet/tork/tork.spec2
-rw-r--r--redhat/applications/misc/kcmldap/kcmldap.spec6
-rw-r--r--redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec2
-rw-r--r--redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec2
-rw-r--r--redhat/applications/misc/kerberostray/kerberostray.spec2
-rw-r--r--redhat/applications/multimedia/amarok/amarok.spec12
-rw-r--r--redhat/applications/multimedia/codeine/codeine.spec2
-rw-r--r--redhat/applications/multimedia/k3b/k3b.spec10
-rw-r--r--redhat/applications/multimedia/k9copy/k9copy.spec14
-rw-r--r--redhat/applications/multimedia/kaffeine/kaffeine.spec8
-rw-r--r--redhat/applications/multimedia/kmplayer/kmplayer.spec6
-rw-r--r--redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec2
-rw-r--r--redhat/applications/multimedia/soundkonverter/soundkonverter.spec56
-rw-r--r--redhat/applications/office/koffice/koffice.spec50
-rw-r--r--redhat/applications/office/tde-ebook-reader/tde-ebook-reader.spec251
-rw-r--r--redhat/applications/settings/kmyfirewall/kmyfirewall.spec1
-rw-r--r--redhat/applications/settings/tde-guidance/tde-guidance.spec4
-rw-r--r--redhat/applications/settings/wlassistant/wlassistant.spec4
-rw-r--r--redhat/applications/system/kdbusnotification/kdbusnotification.spec4
-rw-r--r--redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec1
-rw-r--r--redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec2
-rw-r--r--redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec1
24 files changed, 373 insertions, 86 deletions
diff --git a/redhat/applications/development/piklab/piklab.spec b/redhat/applications/development/piklab/piklab.spec
index 6c354769d..3f1243416 100644
--- a/redhat/applications/development/piklab/piklab.spec
+++ b/redhat/applications/development/piklab/piklab.spec
@@ -161,9 +161,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
-# Incorrect extension on manpage
-%__mv -f %{buildroot}%{tde_mandir}/man1/piklab.1x %{buildroot}%{tde_mandir}/man1/piklab.1
-
%find_lang %{tde_pkg}
%clean
diff --git a/redhat/applications/graphics/ksquirrel/ksquirrel.spec b/redhat/applications/graphics/ksquirrel/ksquirrel.spec
index 670670175..1bc7e9746 100644
--- a/redhat/applications/graphics/ksquirrel/ksquirrel.spec
+++ b/redhat/applications/graphics/ksquirrel/ksquirrel.spec
@@ -80,24 +80,20 @@ BuildRequires: brp-check-trinity
%endif
# MESA support
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel}
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
+%if 0%{?mgaversion} || 0%{?pclinuxos}
+BuildRequires: %{_lib}mesaglu1-devel
%endif
+%if 0%{?mdkver} >= 5000000
+BuildRequires: %{_lib}glu-devel
%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
%endif
-%if 0%{?rhel} == 4
-BuildRequires: xorg-x11-Mesa-libGLU
-%endif
%description
diff --git a/redhat/applications/internet/tork/tork.spec b/redhat/applications/internet/tork/tork.spec
index 97c96d3a4..436faee58 100644
--- a/redhat/applications/internet/tork/tork.spec
+++ b/redhat/applications/internet/tork/tork.spec
@@ -190,6 +190,6 @@ fi
%{tde_datadir}/pixmaps/tork.xpm
%{tde_mandir}/man1/tork.1*
%{tde_mandir}/man1/torkarkollon.1*
-
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/libkickermenu_tork.mo
%changelog
diff --git a/redhat/applications/misc/kcmldap/kcmldap.spec b/redhat/applications/misc/kcmldap/kcmldap.spec
index b44904f44..f7d8695f2 100644
--- a/redhat/applications/misc/kcmldap/kcmldap.spec
+++ b/redhat/applications/misc/kcmldap/kcmldap.spec
@@ -100,7 +100,7 @@ BuildRequires: brp-check-trinity
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 5000000
BuildRequires: lib64ldap-devel
%else
BuildRequires: openldap-devel
@@ -128,7 +128,11 @@ BuildRequires: libheimdal-devel
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%define with_tdehwlib 1
%if 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?pclinuxos}
+BuildRequires: %{_lib}udev1-devel
+%else
BuildRequires: %{_lib}udev-devel
+%endif
%else
BuildRequires: libudev-devel
%endif
diff --git a/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec
index cacb6565a..5d27f0b13 100644
--- a/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec
+++ b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec
@@ -79,7 +79,7 @@ BuildRequires: brp-check-trinity
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 5000000
BuildRequires: lib64ldap-devel
%else
BuildRequires: openldap-devel
diff --git a/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec
index 06875f9c1..d35a213b9 100644
--- a/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec
+++ b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec
@@ -79,7 +79,7 @@ BuildRequires: brp-check-trinity
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 5000000
BuildRequires: lib64ldap-devel
%else
BuildRequires: openldap-devel
diff --git a/redhat/applications/misc/kerberostray/kerberostray.spec b/redhat/applications/misc/kerberostray/kerberostray.spec
index 10ea73152..99fd0cfe9 100644
--- a/redhat/applications/misc/kerberostray/kerberostray.spec
+++ b/redhat/applications/misc/kerberostray/kerberostray.spec
@@ -79,7 +79,7 @@ BuildRequires: brp-check-trinity
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 5000000
BuildRequires: lib64ldap-devel
%else
BuildRequires: openldap-devel
diff --git a/redhat/applications/multimedia/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec
index e26f7d276..04fb0fc54 100644
--- a/redhat/applications/multimedia/amarok/amarok.spec
+++ b/redhat/applications/multimedia/amarok/amarok.spec
@@ -89,7 +89,7 @@ BuildRequires: brp-check-trinity
%endif
# ALSA supportl
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}asound-devel
%else
BuildRequires: alsa-lib-devel
@@ -173,13 +173,17 @@ BuildRequires: trinity-dbus-tqt-devel >= 1:0.63
%if 0%{?pclinuxos} == 0
%if ( 0%{?fedora} && 0%{?fedora} <= 40 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_ifp 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}ifp-devel
+%else
+BuildRequires: libifp-devel
+%endif
%endif
%endif
# KARMA support
%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos} == 0 && 0%{?mdkver} < 24090000
+%if 0%{?pclinuxos} == 0 && 0%{?mdkver} < 5000000
%define with_karma 1
BuildRequires: libkarma-devel
BuildRequires: karma-sharp
@@ -268,7 +272,7 @@ BuildRequires: xine-lib-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
%define with_xine 1
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}xine-devel
%else
BuildRequires: %{_lib}xine1.2-devel
@@ -292,7 +296,7 @@ BuildRequires: trinity-akode-devel
# MP4V2 support
%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%if 0%{?mdkver} < 24090000
+%if 0%{?mdkver} < 5000000
%define with_mp4v2 1
BuildRequires: libmp4v2-devel
%endif
diff --git a/redhat/applications/multimedia/codeine/codeine.spec b/redhat/applications/multimedia/codeine/codeine.spec
index 8dad74e8c..6cfb3e002 100644
--- a/redhat/applications/multimedia/codeine/codeine.spec
+++ b/redhat/applications/multimedia/codeine/codeine.spec
@@ -81,7 +81,7 @@ 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}
+%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}xine-devel
%else
BuildRequires: %{_lib}xine1.2-devel
diff --git a/redhat/applications/multimedia/k3b/k3b.spec b/redhat/applications/multimedia/k3b/k3b.spec
index ddbdf76df..3a4fe93d1 100644
--- a/redhat/applications/multimedia/k3b/k3b.spec
+++ b/redhat/applications/multimedia/k3b/k3b.spec
@@ -78,7 +78,7 @@ BuildRequires: brp-check-trinity
%endif
# ALSA supportl
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}asound-devel
%else
BuildRequires: alsa-lib-devel
@@ -91,7 +91,11 @@ BuildRequires: zlib-devel
# VORBIS support
%if 0%{?mdkver} || 0%{?mgaversion}
+%if 0%{?pclinuxos}
+%define libvorbis_devel %{_lib}vorbis0-devel
+%else
%define libvorbis_devel %{_lib}vorbis-devel
+%endif
%else
%define libvorbis_devel libvorbis-devel
%endif
@@ -152,7 +156,11 @@ Requires: cdrdao
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%if 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?pclinuxos}
+BuildRequires: %{_lib}udev1-devel
+%else
BuildRequires: %{_lib}udev-devel
+%endif
%else
BuildRequires: libudev-devel
%endif
diff --git a/redhat/applications/multimedia/k9copy/k9copy.spec b/redhat/applications/multimedia/k9copy/k9copy.spec
index 69ac53556..8aa140484 100644
--- a/redhat/applications/multimedia/k9copy/k9copy.spec
+++ b/redhat/applications/multimedia/k9copy/k9copy.spec
@@ -89,24 +89,20 @@ BuildRequires: libdvdread-devel
%endif
# MESA support
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel}
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
+%if 0%{?mgaversion} || 0%{?pclinuxos}
+BuildRequires: %{_lib}mesaglu1-devel
%endif
+%if 0%{?mdkver} >= 5000000
+BuildRequires: %{_lib}glu-devel
%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
%endif
-%if 0%{?rhel} == 4
-BuildRequires: xorg-x11-Mesa-libGLU
-%endif
%description
diff --git a/redhat/applications/multimedia/kaffeine/kaffeine.spec b/redhat/applications/multimedia/kaffeine/kaffeine.spec
index e445da856..7e7ce9826 100644
--- a/redhat/applications/multimedia/kaffeine/kaffeine.spec
+++ b/redhat/applications/multimedia/kaffeine/kaffeine.spec
@@ -80,7 +80,11 @@ BuildRequires: brp-check-trinity
# VORBIS support
%if 0%{?mdkver} || 0%{?mgaversion}
+%if 0%{?pclinuxos}
+%define libvorbis_devel %{_lib}vorbis0-devel
+%else
%define libvorbis_devel %{_lib}vorbis-devel
+%endif
%else
%define libvorbis_devel libvorbis-devel
%endif
@@ -143,7 +147,7 @@ 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}
+%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}gstreamer-devel
BuildRequires: %{_lib}gst-plugins-base1.0-devel
%else
@@ -169,7 +173,7 @@ 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}
+%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}xine-devel
%else
BuildRequires: %{_lib}xine1.2-devel
diff --git a/redhat/applications/multimedia/kmplayer/kmplayer.spec b/redhat/applications/multimedia/kmplayer/kmplayer.spec
index 09a2fd48b..7aee31397 100644
--- a/redhat/applications/multimedia/kmplayer/kmplayer.spec
+++ b/redhat/applications/multimedia/kmplayer/kmplayer.spec
@@ -84,7 +84,7 @@ BuildRequires: trinity-dbus-tqt-devel >= %{tde_version}
# GSTREAMER support
%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}gstreamer-devel
BuildRequires: %{_lib}gst-plugins-base1.0-devel
%else
@@ -109,7 +109,7 @@ 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}
+%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}xine-devel
%else
BuildRequires: %{_lib}xine1.2-devel
@@ -139,7 +139,7 @@ BuildRequires: xorg-x11-libXv-devel
%endif
# GTK2 stuff
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}gtk+2.0-devel
%else
BuildRequires: gtk2-devel
diff --git a/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec
index e1830719f..1eaf26d39 100644
--- a/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec
+++ b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec
@@ -169,7 +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(it) %{tde_datadir}/locale/it/LC_MESSAGES/mplayer-thumbnailer.mo
%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/mplayer-thumbnailer.mo
-
%changelog
diff --git a/redhat/applications/multimedia/soundkonverter/soundkonverter.spec b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec
index 6b713c452..0b13bf8cf 100644
--- a/redhat/applications/multimedia/soundkonverter/soundkonverter.spec
+++ b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec
@@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -133,40 +133,45 @@ See the 'trinity-soundkonverter' package for more information.
%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/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}"
-%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="" \
+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} \
+ -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
-
-%__make %{?_smp_mflags}
+ -DWITH_ALL_OPTIONS=ON \
+ %{?!with_dvb:-DWITH_DVB=OFF} \
+ %{?!with_lame:-DWITH_LAME=OFF} \
+ %{?!with_xcb:-DWITH_XCB=OFF} \
+ -DBUILD_ALL=ON \
+ ..
+
+%__make %{?_smp_mflags} || %__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
%find_lang %{tde_pkg}
@@ -182,9 +187,8 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc AUTHORS ChangeLog COPYING README
%{tde_bindir}/soundkonverter
-%{tde_bindir}/userscript.sh
%{tde_tdeappdir}/soundkonverter.desktop
%{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop
%{tde_datadir}/apps/soundkonverter
diff --git a/redhat/applications/office/koffice/koffice.spec b/redhat/applications/office/koffice/koffice.spec
index ee072fad4..f47ad25d1 100644
--- a/redhat/applications/office/koffice/koffice.spec
+++ b/redhat/applications/office/koffice/koffice.spec
@@ -48,6 +48,10 @@
# Required for Mageia 2: removes the ldflag '--no-undefined'
%global _disable_ld_no_undefined 1
+%if 0%{?mdkver} >= 5000000
+%global build_cxxflags %optflags -Wl,--allow-shlib-undefined
+%endif
+
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
@@ -210,7 +214,7 @@ BuildRequires: freetype-devel
%if 0%{?mdkver} || 0%{?mgaversion}
BuildRequires: %{_lib}png-devel
%endif
-%if 0%{?mdkversion} && 0%{?mdkver} < 24090000 && 0%{?pclinuxos} == 0
+%if 0%{?mdkversion} && 0%{?mdkver} < 5000000 && 0%{?pclinuxos} == 0
BuildRequires: %{_lib}png15-devel
%endif
%if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel}
@@ -293,32 +297,32 @@ Obsoletes: trinity-libwpd < %{?epoch:%{epoch}:}%{version}-%{release}
# WV2 support
%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mdkver} < 24090000
+%define with_wv2 1
+%if 0%{mdkver} >= 5000000
+BuildRequires: wv2-devel
+%else
BuildRequires: %{_lib}wv2-devel
%endif
%endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+%define with_wv2 1
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
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libGLU-devel
%endif
+%if 0%{?mgaversion} || 0%{?pclinuxos}
+BuildRequires: %{_lib}mesaglu1-devel
%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: libGL-devel
-BuildRequires: libGLU-devel
+%if 0%{?mdkver} >= 5000000
+BuildRequires: %{_lib}glu-devel
%endif
-%if 0%{?suse_version} >= 1220
-BuildRequires: Mesa-libGL-devel
-BuildRequires: Mesa-libGLU-devel
+%if 0%{?suse_version}
+BuildRequires: Mesa-libGL-devel
+BuildRequires: Mesa-libGLU-devel
%endif
# LIBXI support
@@ -883,7 +887,9 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
%{tde_tdelibdir}/libwmlimport.*
%{tde_tdelibdir}/libwpexport.*
%{tde_tdelibdir}/libwpimport.*
+%if 0%{?with_wv2}
%{tde_tdelibdir}/libmswordimport.*
+%endif
%{tde_tdelibdir}/libxsltimport.*
%{tde_tdelibdir}/libxsltexport.*
%{tde_tdelibdir}/libhancomwordimport.*
@@ -1189,10 +1195,18 @@ CXXFLAGS="${CXXFLAGS} -std=c++11"
%{?with_kross:--enable-scripting} %{!?with_kross:--disable-scripting} \
%{?with_postgresql:--enable-pgsql} %{!?with_postgresql:--disable-pgsql} \
+# Ensure PQXX was detected (required by kexidb/pgsql)
%if "%{?with_postgresql}" != ""
-# Ensure PQXX was detected
-
+if grep 'S\["compile_pgsql_plugin_TRUE"\]="#"' config.status; then
+ exit 1
+fi
+%endif
+# Ensure WV2 was detected
+%if 0%{?with_wv2}
+if grep 'S\["include_wv2_msword_filter_TRUE"\]="#"' config.status; then
+ exit 2
+fi
%endif
%__make %{?_smp_mflags} || %__make
diff --git a/redhat/applications/office/tde-ebook-reader/tde-ebook-reader.spec b/redhat/applications/office/tde-ebook-reader/tde-ebook-reader.spec
new file mode 100644
index 000000000..e0c97e5be
--- /dev/null
+++ b/redhat/applications/office/tde-ebook-reader/tde-ebook-reader.spec
@@ -0,0 +1,251 @@
+#
+# spec file for package tde-ebook-reader (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-ebook-reader
+%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.99.6
+Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary: e-book reader for TDE
+Group: Applications/Publishing
+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: %{_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: cmake
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+
+# UNIBREAK support
+%if 0%{?mgaversion} || 0%{?mdkver} >= 5000000
+BuildRequires: %{_lib}unibreak-devel
+%else
+BuildRequires: libunibreak-devel
+%endif
+
+# 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
+tde-ebook-reader is an e-book reader for TDE.
+
+Main features:
+ * supports several open e-book formats: fb2, html, chm, plucker,
+ palmdoc, ztxt, tcr (psion text), rtf, oeb, openreader, non-DRM'ed
+ mobipocket, plain text, epub, eReader
+ * reads directly from tar, zip, gzip, bzip2 archives (you can have
+ several books in one archive)
+ * supports a structured view of your e-book collection
+ * automatically determines encodings
+ * automatically generates a table of contents
+ * keeps the last open book and the last read positions for all open books
+ between runs
+ * automatic hyphenation (patterns for several languages are included)
+ * searching and downloading books from www.feedbooks.com and www.litres.ru
+ * partial CSS support for epub files
+
+%files
+%defattr(-,root,root,-)
+%{tde_bindir}/tde-ebook-reader
+%{tde_tdeappdir}/tde-ebook-reader.desktop
+%{tde_datadir}/apps/tde-ebook-reader/
+%{tde_mandir}/man1/tde-ebook-reader.1*
+
+##########
+
+%package -n libzlcore-tqt
+Requires: libzlcore-data-tqt
+Summary: Summary: TQt3-based development library (shared library)
+
+%description -n libzlcore-tqt
+This is the core of Summary: , the library that tde-ebook-reader is based on.
+
+%files -n libzlcore-tqt
+%{tde_libdir}/libzlcore-tqt.so.*
+
+##########
+
+%package -n libzlcore-tqt-devel
+Requires: libzlcore-tqt
+Summary: TQt3-based development library (development files)
+
+%description -n libzlcore-tqt-devel
+This package contains development files for the Summary: core.
+
+%files -n libzlcore-tqt-devel
+%{tde_includedir}/zlibrary-tqt/core
+%{tde_libdir}/libzlcore-tqt.la
+%{tde_libdir}/libzlcore-tqt.so
+
+##########
+
+%package -n libzlcore-data-tqt
+Summary: TQt3-based development library (support files)
+
+%description -n libzlcore-data-tqt
+This package contains the support files for the core of Summary: , the library
+that the fbreader e-book reader is based on.
+
+%files -n libzlcore-data-tqt
+%{tde_datadir}/zlibrary-tqt/keynames.desktop-tqt.xml
+%{tde_datadir}/zlibrary-tqt/languagePatterns.zip
+%{tde_datadir}/zlibrary-tqt/unicode.xml.gz
+%{tde_datadir}/zlibrary-tqt/default/
+%{tde_datadir}/zlibrary-tqt/encodings/
+%{tde_datadir}/zlibrary-tqt/resources/
+
+##########
+
+%package -n libzltext-tqt
+Requires: libzlcore-tqt
+Requires: libzltext-data-tqt
+Summary: TQt3-based text model/viewer part (shared library)
+
+%description -n libzltext-tqt
+This package provides text model/viewer part of Summary: .
+
+%files -n libzltext-tqt
+%{tde_libdir}/libzltext-tqt.so.*
+
+##########
+
+%package -n libzltext-tqt-devel
+Requires: libzltext-tqt
+Summary: TQt3-based text model/viewer part (development files)
+
+%description -n libzltext-tqt-devel
+This package contains development files for the Summary: text model/viewer
+library.
+
+%files -n libzltext-tqt-devel
+%{tde_includedir}/zlibrary-tqt/text
+%{tde_libdir}/libzltext-tqt.la
+%{tde_libdir}/libzltext-tqt.so
+
+##########
+
+%package -n libzltext-data-tqt
+Summary: TQt3-based text model/viewer part (support files)
+
+%description -n libzltext-data-tqt
+This package contains the support files for the text model/viewer part
+of Summary: .
+
+%files -n libzltext-data-tqt
+%{tde_datadir}/zlibrary-tqt/hyphenationPatterns.zip
+
+##########
+
+%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:${PKG_CONFIG_PATH}"
+
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+ %__mkdir_p build
+ cd build
+fi
+
+# Warning: GCC visibility causes the KCM not to work at all !
+%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_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+ -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ ..
+
+%__make %{?_smp_mflags}
+
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+
+%changelog
diff --git a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec
index 16d3e34ca..b5dbf456d 100644
--- a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec
+++ b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec
@@ -144,6 +144,7 @@ university etc.)
%{tde_datadir}/mimelnk/application/kmfnet.desktop
%{tde_datadir}/mimelnk/application/kmfpkg.desktop
%{tde_datadir}/mimelnk/application/kmfrs.desktop
+%{tde_datadir}/pixmaps/kmyfirewall.xpm
%{tde_datadir}/services/kmf*.desktop
%{tde_datadir}/servicetypes/kmf*.desktop
%{tde_mandir}/man1/kmyfirewall.1*
diff --git a/redhat/applications/settings/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec
index ccacc149f..65cb97f99 100644
--- a/redhat/applications/settings/tde-guidance/tde-guidance.spec
+++ b/redhat/applications/settings/tde-guidance/tde-guidance.spec
@@ -183,7 +183,7 @@ or can be run as standalone applications.
%{tde_datadir}/apps/guidance/
%{tde_tdeappdir}/*.desktop
%{tde_datadir}/icons/crystalsvg/*/*/*.png
-%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
+%if 0%{?mdkversion} || 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*
@@ -249,7 +249,7 @@ Guidance configuration tools.
%files backends
%defattr(-,root,root,-)
%dir %{python_sitelib}/tde-guidance
-%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
+%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%{python_sitelib}/tde-guidance/MicroHAL.py*
%if 0%{?rhel} == 7
%{python_sitelib}/tde-guidance/__pycache__/MicroHAL.*.pyc
diff --git a/redhat/applications/settings/wlassistant/wlassistant.spec b/redhat/applications/settings/wlassistant/wlassistant.spec
index b60b75b61..2b52c07a3 100644
--- a/redhat/applications/settings/wlassistant/wlassistant.spec
+++ b/redhat/applications/settings/wlassistant/wlassistant.spec
@@ -82,8 +82,12 @@ BuildRequires: brp-check-trinity
BuildRequires: wireless-tools-devel
%endif
%if 0%{?mgaversion} == 2 || 0%{?mdkversion}
+%if 0%{?mdkver} >= 5000000
+BuildRequires: %{_lib}iw-devel
+%else
BuildRequires: %{_lib}iw29-devel
%endif
+%endif
%if 0%{?rhel} == 5 || 0%{?suse_version}
BuildRequires: wireless-tools
%endif
diff --git a/redhat/applications/system/kdbusnotification/kdbusnotification.spec b/redhat/applications/system/kdbusnotification/kdbusnotification.spec
index 693084f0d..4d4788fe3 100644
--- a/redhat/applications/system/kdbusnotification/kdbusnotification.spec
+++ b/redhat/applications/system/kdbusnotification/kdbusnotification.spec
@@ -75,7 +75,7 @@ BuildRequires: brp-check-trinity
%endif
# GTK2 stuff
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}gtk+2.0-devel
%else
BuildRequires: gtk2-devel
@@ -183,7 +183,7 @@ export PATH="%{tde_bindir}:${PATH}"
%defattr(-,root,root,-)
%{tde_bindir}/notification-daemon-tde
%{tde_datadir}/autostart/kdbusnotification-autostart.desktop
-
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/notification-daemon-tde.mo
%changelog
diff --git a/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec b/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec
index aa49a5634..4d909278a 100644
--- a/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec
+++ b/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec
@@ -164,6 +164,7 @@ fi
%{tde_tdelibdir}/tdeio_appinfo.la
%{tde_tdelibdir}/tdeio_appinfo.so
%{tde_datadir}/services/appinfo.protocol
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/tdeio_appinfo.mo
%changelog
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 eb1c1224d..5c85709fa 100644
--- a/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec
+++ b/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec
@@ -199,6 +199,8 @@ export PATH="%{tde_bindir}:${PATH}"
%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/baghira-starter.mo
%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/baghira-usermanager.mo
%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/baghira-usermanager.mo
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/baghira-kmenuapplet.mo
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/baghira-switcher.mo
%{tde_mandir}/man1/bab.1*
diff --git a/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec b/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec
index 6c440c0fe..2ddf79e73 100644
--- a/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec
+++ b/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec
@@ -153,6 +153,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/apps/twin/fahrenheit/minmax.png
%{tde_datadir}/apps/twin/fahrenheit/sticky.png
%{tde_datadir}/apps/twin/fahrenheit/unsticky.png
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/twin-style-fahrenheit.mo
%changelog