summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-03-07 20:01:19 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2014-03-07 20:01:19 +0100
commit420b1189896aae59757997087773c8488b7c0c3b (patch)
tree0e1268d91ace5007e4736e621923262cc824d891 /redhat
parent0bba90061f0fbda1e3e284a052f714b0c203ed7b (diff)
downloadtde-packaging-420b1189896aae59757997087773c8488b7c0c3b.tar.gz
tde-packaging-420b1189896aae59757997087773c8488b7c0c3b.zip
RPM packaging: update applications
Diffstat (limited to 'redhat')
-rw-r--r--redhat/applications/bibletime/bibletime-14.0.0.spec11
-rw-r--r--redhat/applications/k3b/k3b-14.0.0.spec2
-rw-r--r--redhat/applications/kasablanca/kasablanca-14.0.0.spec2
-rw-r--r--redhat/applications/kbookreader/kbookreader-14.0.0.spec2
-rw-r--r--redhat/applications/kchmviewer/kchmviewer-14.0.0.spec5
-rw-r--r--redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec2
-rw-r--r--redhat/applications/kmymoney/kmymoney-14.0.0.spec17
-rw-r--r--redhat/applications/koffice/koffice-14.0.0.spec3
-rw-r--r--redhat/applications/krusader/krusader-14.0.0.spec6
-rw-r--r--redhat/applications/ksensors/ksensors-14.0.0.spec4
-rw-r--r--redhat/applications/ktorrent/ktorrent-14.0.0.spec1
-rw-r--r--redhat/applications/kvkbd/kvkbd-14.0.0.spec4
-rw-r--r--redhat/applications/kvpnc/kvpnc-14.0.0.spec2
-rw-r--r--redhat/applications/yakuake/yakuake-14.0.0.spec2
14 files changed, 50 insertions, 13 deletions
diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime-14.0.0.spec
index cd2730021..e1d4a97a5 100644
--- a/redhat/applications/bibletime/bibletime-14.0.0.spec
+++ b/redhat/applications/bibletime/bibletime-14.0.0.spec
@@ -39,6 +39,7 @@ Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Patch0: bibletime-14.0.0-ftbfs.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
@@ -75,6 +76,7 @@ texts, write own notes, save, print etc.).
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch0 -p1 -b .ftbfs
%__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"
@@ -84,6 +86,7 @@ texts, write own notes, save, print etc.).
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%configure \
--prefix=%{tde_prefix} \
@@ -99,13 +102,17 @@ export PATH="%{tde_bindir}:${PATH}"
--enable-final \
--enable-closure \
--enable-rpath \
- --disable-gcc-hidden-visibility
+ --disable-gcc-hidden-visibility \
+ \
+%if 0%{?fedora} >= 20
+ --with-sword-dir=%{tde_prefix}
+%endif
# Not SMP safe !
%__make -C bibletime/frontend
# SMP safe !
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b-14.0.0.spec
index a2ae9d682..8e2310afb 100644
--- a/redhat/applications/k3b/k3b-14.0.0.spec
+++ b/redhat/applications/k3b/k3b-14.0.0.spec
@@ -248,7 +248,7 @@ BuildArch: noarch
%{tde_datadir}/sounds/k3b_error1.wav
%{tde_datadir}/sounds/k3b_success1.wav
%{tde_datadir}/sounds/k3b_wait_media1.wav
-
+%{tde_tdedocdir}/HTML/en/tdeioslave/videodvd/
%post common
touch --no-create %{tde_datadir}/icons/hicolor ||:
diff --git a/redhat/applications/kasablanca/kasablanca-14.0.0.spec b/redhat/applications/kasablanca/kasablanca-14.0.0.spec
index 583f8b65a..799da2d99 100644
--- a/redhat/applications/kasablanca/kasablanca-14.0.0.spec
+++ b/redhat/applications/kasablanca/kasablanca-14.0.0.spec
@@ -34,6 +34,7 @@ Group: Applications/Internet
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Patch1: kasablanca-14.0.0-fix_ftp.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
@@ -71,6 +72,7 @@ Kasablanca is an ftp client, among its features are currently:
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch1 -p1 -b .ftpthread
%__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"
diff --git a/redhat/applications/kbookreader/kbookreader-14.0.0.spec b/redhat/applications/kbookreader/kbookreader-14.0.0.spec
index 6a62019b6..1ed0a672d 100644
--- a/redhat/applications/kbookreader/kbookreader-14.0.0.spec
+++ b/redhat/applications/kbookreader/kbookreader-14.0.0.spec
@@ -114,7 +114,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%doc AUTHORS COPYING
%{tde_bindir}/bookreader
%{tde_bindir}/bookreader_client
-%{tde_datadir}/applnk/Utilities/bookreader.desktop
+%{tde_datadir}/applnk/Office/bookreader.desktop
%{tde_datadir}/apps/bookreader/
%{tde_datadir}/config.kcfg/bookreader.kcfg
%{tde_tdedocdir}/HTML/en/bookreader/
diff --git a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec b/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec
index 2bb4cb854..aa7094eee 100644
--- a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec
+++ b/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec
@@ -88,7 +88,7 @@ export PATH="%{tde_bindir}:${PATH}"
# Specific path for RHEL4
if [ -d /usr/X11R6 ]; then
- export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+ export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
# Warning: --enable-final causes FTBFS !
@@ -132,6 +132,7 @@ export PATH="%{tde_bindir}:${PATH}"
touch --no-create %{tde_datadir}/icons/crystalsvg || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
+
%postun
touch --no-create %{tde_datadir}/icons/crystalsvg || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
@@ -146,6 +147,8 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
%{tde_datadir}/applnk/kchmviewer.desktop
%{tde_datadir}/icons/crystalsvg/*/apps/kchmviewer.png
%{tde_datadir}/services/msits.protocol
+%{tde_tdedocdir}/HTML/en/kchmviewer/
+%{tde_tdedocdir}/HTML/en/tdeioslave/msits/
%changelog
diff --git a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec b/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec
index 491aa084e..67d590624 100644
--- a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec
+++ b/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec
@@ -165,6 +165,8 @@ done
%{tde_datadir}/services/kftpimportplugin_kftp.desktop
%{tde_datadir}/services/kftpimportplugin_ncftp.desktop
%{tde_datadir}/servicetypes/kftpbookmarkimportplugin.desktop
+%{tde_tdedocdir}/HTML/en/kftpgrabber/
+
%files devel
%defattr(-,root,root,-)
diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
index ae3161d3c..2de1da6ba 100644
--- a/redhat/applications/kmymoney/kmymoney-14.0.0.spec
+++ b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
@@ -45,6 +45,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Source1: kmymoneytitlelabel.png
+Source2: 23011-qt-sqlite3-0.2.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
@@ -58,7 +59,11 @@ BuildRequires: libofx-devel
# OPENSP support
%if 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?pclinuxos}
+%if 0%{?mgaversion} >= 4
+BuildRequires: %{_lib}osp-devel
+%else
BuildRequires: %{_lib}OpenSP5-devel
+%endif
%else
BuildRequires: opensp-devel
%endif
@@ -70,7 +75,7 @@ BuildRequires: opensp-devel
BuildRequires: openjade-devel
%endif
-Requires: %{name}-common == %{version}
+Requires: %{name}-common == %{version}-%{release}
%description
KMyMoney is the Personal Finance Manager for TDE. It operates similar to
@@ -108,6 +113,7 @@ This package contains development files needed for KMyMoney plugins.
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__install -m644 %{SOURCE1} kmymoney2/widgets/
+%__install -m644 %{SOURCE2} .
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -124,6 +130,9 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
grep -v "^#~" po/it.po >/tmp/it.po && mv -f /tmp/it.po po/it.po
%endif
+# Needed for SQLITE3 plugin installation
+export QTDIR=%{_libdir}/tqt3
+
# Warning: --enable-final causes FTBFS
%configure \
--prefix=%{tde_prefix} \
@@ -149,7 +158,7 @@ grep -v "^#~" po/it.po >/tmp/it.po && mv -f /tmp/it.po po/it.po
--enable-ofxplugin \
--enable-ofxbanking \
--enable-qtdesigner \
- --disable-sqlite3
+ --enable-sqlite3
%__make %{?_smp_mflags}
@@ -214,7 +223,8 @@ done
%{tde_mandir}/man1/kmymoney2.*
%{tde_datadir}/apps/kmm_ofximport/kmm_ofximport.rc
%{tde_datadir}/services/kmm_ofximport.desktop
-
+# SQLITE3 plugin
+%{_libdir}/tqt3/plugins/sqldrivers/libsqlite3*.so
%files devel
%defattr(-,root,root,-)
@@ -225,6 +235,7 @@ done
%{tde_libdir}/*.so
%{_libdir}/tqt3/plugins/designer/libkmymoney.so
+
%changelog
* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-7
- Initial release for TDE 14.0.0
diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec
index 9e8548860..b697a0049 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -55,6 +55,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Patch0: koffice-14.0.0-ftbfs.patch
+
# BuildRequires: world-devel ;)
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
@@ -1061,6 +1063,7 @@ This package is part of the TDE Office Suite.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch0 -p1 -b .ftbfs
%__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"
diff --git a/redhat/applications/krusader/krusader-14.0.0.spec b/redhat/applications/krusader/krusader-14.0.0.spec
index 3bfdf2332..b62b79384 100644
--- a/redhat/applications/krusader/krusader-14.0.0.spec
+++ b/redhat/applications/krusader/krusader-14.0.0.spec
@@ -146,13 +146,15 @@ done
%{tde_tdeappdir}/krusader.desktop
%{tde_tdeappdir}/krusader_root-mode.desktop
%{tde_datadir}/apps/krusader
-%{tde_tdedocdir}/HTML/en/krusader/
-%lang(ru) %{tde_tdedocdir}/HTML/ru/krusader/
%{tde_datadir}/icons/crystalsvg/*/apps/*.png
%{tde_datadir}/icons/locolor/*/apps/*.png
%{tde_datadir}/services/krarc.protocol
%{tde_datadir}/services/virt.protocol
%{tde_mandir}/man1/krusader.1
+%{tde_tdedocdir}/HTML/en/krusader/
+%{tde_tdedocdir}/HTML/en/tdeioslave/krarc/
+%{tde_tdedocdir}/HTML/en/tdeioslave/virt/
+%lang(ru) %{tde_tdedocdir}/HTML/ru/krusader/
%changelog
diff --git a/redhat/applications/ksensors/ksensors-14.0.0.spec b/redhat/applications/ksensors/ksensors-14.0.0.spec
index 132e7ff99..5cb57fb87 100644
--- a/redhat/applications/ksensors/ksensors-14.0.0.spec
+++ b/redhat/applications/ksensors/ksensors-14.0.0.spec
@@ -132,11 +132,11 @@ done
%lang(de) %doc LIESMICH
%lang(fr) %doc LISEZMOI
%{tde_bindir}/ksensors
-%{tde_datadir}/applnk/Utilities/ksensors.desktop
+%{tde_datadir}/applnk/System/ksensors.desktop
%{tde_datadir}/apps/ksensors/
%{tde_datadir}/autostart/ksensors.desktop
%{tde_datadir}/icons/hicolor/*/apps/ksensors.png
-%{tde_datadir}/icons/locolor/
+%{tde_datadir}/icons/locolor/*/apps/ksensors.png
%{tde_datadir}/sounds/ksensors_alert.wav
%{tde_tdedocdir}/HTML/en/ksensors/
diff --git a/redhat/applications/ktorrent/ktorrent-14.0.0.spec b/redhat/applications/ktorrent/ktorrent-14.0.0.spec
index e6ee9b499..36112872f 100644
--- a/redhat/applications/ktorrent/ktorrent-14.0.0.spec
+++ b/redhat/applications/ktorrent/ktorrent-14.0.0.spec
@@ -180,6 +180,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_datadir}/icons/hicolor/*/*/*.svgz
%{tde_datadir}/services/*.desktop
%{tde_datadir}/servicetypes/ktorrentplugin.desktop
+%{tde_tdedocdir}/HTML/en/ktorrent/
%if 0%{?with_avahi}
%{tde_tdelibdir}/ktzeroconfplugin.la
diff --git a/redhat/applications/kvkbd/kvkbd-14.0.0.spec b/redhat/applications/kvkbd/kvkbd-14.0.0.spec
index 2efe31e48..6ab5f5c5b 100644
--- a/redhat/applications/kvkbd/kvkbd-14.0.0.spec
+++ b/redhat/applications/kvkbd/kvkbd-14.0.0.spec
@@ -69,7 +69,7 @@ a systray widget as well as a dockwidget.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+
%configure \
--prefix=%{tde_prefix} \
@@ -105,6 +105,7 @@ export PATH="%{tde_bindir}:${PATH}"
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+
%postun
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
@@ -118,6 +119,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_datadir}/apps/kvkbd/pics/dock.png
%{tde_datadir}/apps/kvkbd/pics/tray.png
%{tde_datadir}/icons/hicolor/*/apps/kvkbd.png
+%{tde_tdedocdir}/HTML/en/kvkbd/
%changelog
diff --git a/redhat/applications/kvpnc/kvpnc-14.0.0.spec b/redhat/applications/kvpnc/kvpnc-14.0.0.spec
index 1035ce39e..f5bb1e88f 100644
--- a/redhat/applications/kvpnc/kvpnc-14.0.0.spec
+++ b/redhat/applications/kvpnc/kvpnc-14.0.0.spec
@@ -138,6 +138,8 @@ update-desktop-database %{tde_appdir} -q &> /dev/null ||:
%lang(sv) %{tde_datadir}/doc/tde/HTML/sv/kvpnc/
%{tde_datadir}/icons/hicolor/*/apps/kvpnc.png
%{tde_datadir}/icons/locolor/*/apps/kvpnc.png
+%{tde_tdedocdir}/HTML/en/tdeioslave/pcf/
+%{tde_datadir}/services/pcf.protocol
%Changelog
diff --git a/redhat/applications/yakuake/yakuake-14.0.0.spec b/redhat/applications/yakuake/yakuake-14.0.0.spec
index d5492bd75..50b4d4848 100644
--- a/redhat/applications/yakuake/yakuake-14.0.0.spec
+++ b/redhat/applications/yakuake/yakuake-14.0.0.spec
@@ -116,6 +116,8 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_datadir}/icons/hicolor/*/*/*
%{tde_datadir}/locale/*/*/*.mo
%{tde_datadir}/config.kcfg/*.kcfg
+%{tde_tdedocdir}/HTML/en/yakuake/
+
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.8.1-7