diff options
Diffstat (limited to 'redhat/applications')
3 files changed, 14 insertions, 13 deletions
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec index 06b4a1cc4..efe337232 100644 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec @@ -109,9 +109,9 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang gtkqtengine # Adds TDE's specific GTKRC -%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh -%__install -D -m 644 %{SOURCE2} %{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde4 -%__install -D -m 644 %{SOURCE3} %{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4 +%__install -D -m 644 "%{SOURCE1}" "%{buildroot}%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh" +%__install -D -m 644 "%{SOURCE2}" "%{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde4" +%__install -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4" %clean @@ -130,6 +130,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_tdedocdir}/HTML/en/kcmgtk/ # The following files are outside TDE's directory +%{_libdir}/gtk-2.0/2.10.0/engines/libqtengine.la %{_libdir}/gtk-2.0/2.10.0/engines/libqtengine.so %{_datadir}/themes/Qt/gtk-2.0/gtkrc diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney-14.0.0.spec index 2de1da6ba..75a5d9c0a 100644 --- a/redhat/applications/kmymoney/kmymoney-14.0.0.spec +++ b/redhat/applications/kmymoney/kmymoney-14.0.0.spec @@ -45,7 +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 +Patch0: kmymoney-sqlite3-detection.diff BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 @@ -75,6 +75,10 @@ BuildRequires: opensp-devel BuildRequires: openjade-devel %endif +# TQT3-sqlite3 +BuildRequires: trinity-tqt3-sqlite3 +Requires: trinity-tqt3-sqlite3 + Requires: %{name}-common == %{version}-%{release} %description @@ -111,9 +115,9 @@ This package contains development files needed for KMyMoney plugins. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%patch0 -p1 -b .sqlite3 %__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" @@ -130,9 +134,6 @@ 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} \ @@ -158,7 +159,7 @@ export QTDIR=%{_libdir}/tqt3 --enable-ofxplugin \ --enable-ofxbanking \ --enable-qtdesigner \ - --enable-sqlite3 + --disable-sqlite3 %__make %{?_smp_mflags} @@ -223,8 +224,6 @@ 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,-) diff --git a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec index 7f81e757e..b3eed810c 100644 --- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec +++ b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec @@ -58,7 +58,7 @@ BuildRequires: trinity-python-trinity BuildRequires: chrpath BuildRequires: gcc-c++ -# SIP +# SIP support BuildRequires: trinity-sip4-tqt-devel >= 4.10.5 Requires: trinity-sip4-tqt >= 4.10.5 @@ -333,9 +333,10 @@ chrpath -r %{tde_libdir} %{buildroot}%{tde_tdelibdir}/kcm_*.so # Generates the startup scripts %__rm -f %{buildroot}%{tde_bindir}/* -%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{tde_bindir}/userconfig +#%__ln_s -f %{python_sitearch}/%{name}/displayconfig.py %{buildroot}%{tde_bindir}/displayconfig %__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 |