From 9814f425f0dae6fa0fb869ef038495df9dd0e588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Fri, 30 May 2014 12:32:22 +0200 Subject: [PATCH] RPM Packaging: update R14 packages --- .../gtk-qt-engine/gtk-qt-engine-14.0.0.spec | 7 +++-- .../kmymoney/kmymoney-14.0.0.spec | 15 +++++----- .../tde-guidance/tde-guidance-14.0.0.spec | 5 ++-- redhat/dependencies/sip4-tqt/sip4-tqt.spec | 6 ++-- redhat/dependencies/tqt3/tqt3-14.0.0.spec | 15 ++++++++++ redhat/tde-i18n/tde-i18n-14.0.0.spec | 2 +- ...ase-14.0.0-displayconfig_translation.patch | 29 ++++++++++--------- redhat/tdebase/tdebase-14.0.0.spec | 10 +++++-- redhat/tdelibs/tdelibs-14.0.0.spec | 4 +-- 9 files changed, 58 insertions(+), 35 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 diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec index 1eea2f210..8d3a7e8c9 100644 --- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec +++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec @@ -28,7 +28,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= %{version} +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} # TDE specific building variables BuildRequires: python @@ -116,9 +116,9 @@ python ../configure.py \ -d %{python_sitearch}/sip4_tqt \ -e %{tde_includedir} \ -u STRIP="" \ - CFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/tqt -I%{_includedir}/tqt3" \ + CFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/tqt -I%{_includedir}/tqt3 -I${PWD}/../sipgen" \ CFLAGS_RELEASE="" \ - CXXFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/tqt -I%{_includedir}/tqt3" \ + CXXFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/tqt -I%{_includedir}/tqt3 -I${PWD}/../sipgen" \ CXXFLAGS_RELEASE="" diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec index a622c18bc..2cceff38c 100644 --- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec +++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec @@ -420,6 +420,20 @@ sqlite driver for TQt 3's SQL classes (QSQL) ########## +%package sqlite3 +Summary: sqlite3 drivers for TQt 3's SQL classes +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} + +%description sqlite3 +sqlite3 driver for TQt 3's SQL classes (QSQL) + +%files sqlite3 +%defattr(-,root,root,-) +%{tde_libdir}/tqt3/plugins/sqldrivers/libqsqlite3.so + +########## + %if 0%{?with_ibase} %package ibase Summary: ibase drivers for TQt 3's SQL classes @@ -576,6 +590,7 @@ echo yes | ./configure \ -plugin-sql-mysql \ %{?with_ibase:-plugin-sql-ibase} \ -plugin-sql-sqlite \ + -plugin-sql-sqlite3 \ \ -lfontconfig \ -inputmethod \ diff --git a/redhat/tde-i18n/tde-i18n-14.0.0.spec b/redhat/tde-i18n/tde-i18n-14.0.0.spec index a2ebe63f7..093d02d5e 100644 --- a/redhat/tde-i18n/tde-i18n-14.0.0.spec +++ b/redhat/tde-i18n/tde-i18n-14.0.0.spec @@ -1216,4 +1216,4 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %changelog * Fri Jul 05 2013 Francois Andriot - 14.0.0-1 -- Initial release for +- Initial release for TDE 14.0.0 diff --git a/redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch b/redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch index 231b258e0..5bcf98edd 100644 --- a/redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch +++ b/redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch @@ -1,35 +1,36 @@ ---- trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/displayconfig/displayconfig.desktop.ORI 2013-05-11 14:53:30.914170537 +0200 -+++ trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/displayconfig/displayconfig.desktop 2013-05-11 14:53:59.495582944 +0200 -@@ -2,6 +2,7 @@ +--- ./kcontrol/displayconfig/displayconfig.desktop.displayconfigtranslation 2014-05-30 12:16:09.448919875 +0200 ++++ ./kcontrol/displayconfig/displayconfig.desktop 2014-05-30 12:19:18.104578759 +0200 +@@ -13,6 +13,7 @@ Categories=Qt;TDE;X-TDE-settings-system; Comment=Configure display Comment[en_US]=Configure display +Comment[fr]=Configuration de l'affichage - DocPath=kcontrol/displayconfig/index.html - Exec=tdecmshell displayconfig + Comment[ru]=Конфигурация экрана + Comment[uk]=Конфігурація екрану GenericName= -@@ -11,6 +12,7 @@ +@@ -21,6 +22,7 @@ MimeType= Name=Monitor & Display Name[en_US]=Monitor & Display +Name[fr]=Moniteurs & Affichage + Name[ru]=Монитор & Экран + Name[uk]=Монітор & Екран NoDisplay=false - Path= - StartupNotify=true ---- trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/iccconfig/iccconfig.desktop.ORI 2013-05-11 21:21:04.241337141 +0200 -+++ trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/iccconfig/iccconfig.desktop 2013-05-11 21:21:44.782537929 +0200 +--- ./kcontrol/iccconfig/iccconfig.desktop.displayconfigtranslation 2014-05-30 12:16:09.448919875 +0200 ++++ ./kcontrol/iccconfig/iccconfig.desktop 2014-05-30 12:20:36.526770672 +0200 @@ -12,6 +12,7 @@ Categories=Qt;TDE;X-TDE-settings-hardware; Comment=Configure display ICC profile Comment[en_US]=Configure display ICC profile +Comment[fr]=Configurer les profils de couleurs ICC + Comment[ru]=Конфигурация профиля ICC экрана + Comment[uk]=Конфігурація профілю ICC екрану GenericName= - GenericName[en_US]= - Keywords=ICC,display,color,profile -@@ -18,5 +19,6 @@ +@@ -20,6 +21,7 @@ MimeType= Name=ICC Color Profile Name[en_US]=ICC Color Profile +Name[fr]=Profils de couleurs ICC + Name[ru]=ICC Профиль цвета + Name[uk]=ICC Профіль кольору - NoDisplay=false diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec index ad4cd3386..80d13557f 100644 --- a/redhat/tdebase/tdebase-14.0.0.spec +++ b/redhat/tdebase/tdebase-14.0.0.spec @@ -65,8 +65,14 @@ Source7: tdm.service%{?dist} Source7: xdm.oss114 %endif -# Fedora 17: special selinux policy required -%if 0%{?fedora} >= 17 || 0%{?rhel} == 6 +# Fedora >= 17: special selinux policy required for TDM +# If login through TDM takes ages, then look at '/var/log/audit/audit.log'. +# Locate the line containing 'USER_AVC' and dbus stuff. +# Put this line into a temporary file, then (e.g for Fedora 17): +# audit2allow -i /tmp/file -m tdm.fc17 >tdm.fc17.te +# audit2allow -i /tmp/file -M tdm.fc17 + +%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 %define with_selinux_policy 1 Source8: tdm%{?dist}.pp %endif diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec index bb5c96206..c865d591b 100644 --- a/redhat/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/tdelibs/tdelibs-14.0.0.spec @@ -305,8 +305,8 @@ Requires: trinity-arts >= 1:1.5.10 %description Libraries for the Trinity Desktop Environment: -TDE Libraries included: tdecore (TDE core library), kdeui (user interface), -kfm (file manager), khtmlw (HTML widget), tdeio (Input/Output, networking), +TDE Libraries included: tdecore (TDE core library), tdeui (user interface), +kfm (file manager), tdehtmlw (HTML widget), tdeio (Input/Output, networking), kspell (spelling checker), jscript (javascript), kab (addressbook), kimgio (image manipulation).