summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2011-12-10 00:52:10 +0100
committerFrancois Andriot <francois.andriot@free.fr>2011-12-10 00:52:10 +0100
commit4368359c6192aaff174d4ec6fde1a8ae0682defa (patch)
treee2dcc0c82393bde2af6463da82e6e4120d70cbdc /redhat
parent39b93ce6be5b6d1ef6cc322f816b6f5173e715a3 (diff)
downloadtde-packaging-4368359c6192aaff174d4ec6fde1a8ae0682defa.tar.gz
tde-packaging-4368359c6192aaff174d4ec6fde1a8ae0682defa.zip
RHEL/Fedora: minor packaging fixes for kdelibs, kdebase, kde-i18n
Diffstat (limited to 'redhat')
-rw-r--r--redhat/kde-i18n/trinity-kde-i18n-3.5.12.spec485
-rw-r--r--redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec153
-rw-r--r--redhat/kdebase/kdebase-3.5.12-kickoff_unstable.patch428
-rw-r--r--redhat/kdebase/kdebase-3.5.12-kio_man_utf8.patch40
-rw-r--r--redhat/kdebase/kdebase-3.5.12-konq_menu_tab_background.patch136
-rw-r--r--redhat/kdebase/kdebase-3.5.13-kickoff_unstable.patch2
-rw-r--r--redhat/kdebase/trinity-kdebase-3.5.12.spec76
-rw-r--r--redhat/kdelibs/kdelibs-3.5.12-fixx11h.patch21
-rw-r--r--redhat/kdelibs/kdelibs-3.5.12-kstandarddirs_trinity.patch29
-rwxr-xr-xredhat/kdelibs/trinity-kdelibs-3.5.12.spec38
-rwxr-xr-xredhat/kdelibs/trinity-kdelibs-3.5.13.spec3
11 files changed, 1032 insertions, 379 deletions
diff --git a/redhat/kde-i18n/trinity-kde-i18n-3.5.12.spec b/redhat/kde-i18n/trinity-kde-i18n-3.5.12.spec
index 1d46ff40f..2f6aaf0ab 100644
--- a/redhat/kde-i18n/trinity-kde-i18n-3.5.12.spec
+++ b/redhat/kde-i18n/trinity-kde-i18n-3.5.12.spec
@@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.12
%endif
-%define release 7
+%define release 8
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -46,12 +46,18 @@ AutoReq: no
Source0: kde-i18n-%{version}.tar.gz
-# Patch for 'kdesu': the message was modified in 'kdebase' package
+# [zh_TW] Updated translations, thanks to Wei-Lun Chao !
+Source1: kde-i18n-zh_TW-3.5.10.tar.bz2
+
+# TDE 3.5.12: Translate 'kdesu' message was modified in 'kdebase' package
Patch0: kde-i18n-kdesu.patch
-# Patch to translate 'Open Terminal Here' desktop shortcut
+# TDE 3.5.12: Translate 'Open Terminal Here' desktop shortcut
Patch1: trinity-kde-i18n-fr-openterminalhere.patch
+# TDE 3.5.13: French translations for new features
+Patch2: kde-i18n-3.5.13-add_french_translations.patch
+
BuildRequires: findutils
BuildRequires: gettext
BuildRequires: trinity-arts-devel
@@ -64,7 +70,7 @@ BuildRequires: trinity-kdelibs-devel
Summary: Afrikaans(af) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-af = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Afrikaans
%{summary}.
@@ -72,7 +78,7 @@ Requires: kde-filesystem
Summary: Arabic(ar) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-ar = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Arabic
%{summary}.
@@ -80,7 +86,7 @@ Requires: kde-filesystem
Summary: Azerbaijani(az) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-az = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Azerbaijani
%{summary}.
@@ -88,7 +94,7 @@ Requires: kde-filesystem
Summary: Belarusian(be) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-be = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Belarusian
%{summary}.
@@ -96,7 +102,7 @@ Requires: kde-filesystem
Summary: Bulgarian(bg) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-bg = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Bulgarian
%{summary}.
@@ -104,7 +110,7 @@ Requires: kde-filesystem
Summary: Bengali(bn) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-bn = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Bengali
%{summary}.
@@ -112,7 +118,7 @@ Requires: kde-filesystem
Summary: Tibetan(bo) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-bo = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Tibetan
%{summary}.
@@ -120,7 +126,7 @@ Requires: kde-filesystem
Summary: Breton(br) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-br = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Breton
%{summary}.
@@ -128,7 +134,7 @@ Requires: kde-filesystem
Summary: Bosnian(bs) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-bs = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Bosnian
%{summary}.
@@ -136,7 +142,7 @@ Requires: kde-filesystem
Summary: Catalan(ca) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-ca = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Catalan
%{summary}.
@@ -144,14 +150,14 @@ Requires: kde-filesystem
Summary: Czech(cs) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-cs = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Czech
%{summary}.
%package Cymraeg
Summary: Cymraeg language support for KDE3
Group: User Interface/Desktops
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Cymraeg
%{summary}.
@@ -159,7 +165,7 @@ Requires: kde-filesystem
Summary: Welsh(cy) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-cy = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Welsh
%{summary}.
@@ -167,7 +173,7 @@ Requires: kde-filesystem
Summary: Danish(da) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-da = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Danish
%{summary}.
@@ -175,7 +181,7 @@ Requires: kde-filesystem
Summary: German(de) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-de = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description German
%{summary}.
@@ -183,7 +189,7 @@ Requires: kde-filesystem
Summary: Greek(el) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-el = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Greek
%{summary}.
@@ -191,7 +197,7 @@ Requires: kde-filesystem
Summary: British(en_GB) English support for KDE3
Group: User Interface/Desktops
Provides: %{name}-en_GB = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description British
%{summary}.
@@ -199,7 +205,7 @@ Requires: kde-filesystem
Summary: Esperanto(eo) support for KDE3
Group: User Interface/Desktops
Provides: %{name}-eo = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Esperanto
%{summary}.
@@ -207,7 +213,7 @@ Requires: kde-filesystem
Summary: Spanish(es) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-es = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Spanish
%{summary}.
@@ -215,7 +221,7 @@ Requires: kde-filesystem
Summary: Estonian(et) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-et = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Estonian
%{summary}.
@@ -223,7 +229,7 @@ Requires: kde-filesystem
Summary: Basque(eu) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-eu = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Basque
%{summary}.
@@ -231,7 +237,7 @@ Requires: kde-filesystem
Summary: Farsi(fa) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-fa = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Farsi
%{summary}.
@@ -239,7 +245,7 @@ Requires: kde-filesystem
Summary: Finnish(fi) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-fi = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Finnish
%{summary}.
@@ -247,7 +253,7 @@ Requires: kde-filesystem
Summary: Faroese(fo) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-fo = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Faroese
%{summary}.
@@ -255,7 +261,7 @@ Requires: kde-filesystem
Summary: French(fr) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-fr = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description French
%{summary}.
@@ -263,7 +269,7 @@ Requires: kde-filesystem
Summary: Frisian(fy) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-fy = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Frisian
%{summary}.
@@ -272,7 +278,7 @@ Summary: Irish(ga) language support for KDE3
Group: User Interface/Desktops
Obsoletes: kde-i18n-Gaeilge < %{version}
Provides: %{name}-ga = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Irish
%{summary}.
@@ -280,7 +286,7 @@ Requires: kde-filesystem
Summary: Galician(gl) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-gl = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Galician
%{summary}.
@@ -288,7 +294,7 @@ Requires: kde-filesystem
Summary: Hebrew(he) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-he = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Hebrew
%{summary}.
@@ -296,7 +302,7 @@ Requires: kde-filesystem
Summary: Hindi(hi) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-hi = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Hindi
%{summary}.
@@ -304,7 +310,7 @@ Requires: kde-filesystem
Summary: Croatian(hr) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-hr = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Croatian
%{summary}.
@@ -312,7 +318,7 @@ Requires: kde-filesystem
Summary: Hungarian(hu) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-hu = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Hungarian
%{summary}.
@@ -320,7 +326,7 @@ Requires: kde-filesystem
Summary: Indonesian(id) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-id = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Indonesian
%{summary}.
@@ -328,7 +334,7 @@ Requires: kde-filesystem
Summary: Icelandic(is) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-is = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Icelandic
%{summary}.
@@ -336,7 +342,7 @@ Requires: kde-filesystem
Summary: Italian(it) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-it = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Italian
%{summary}.
@@ -344,7 +350,7 @@ Requires: kde-filesystem
Summary: Japanese(ja) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-ja = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Japanese
%{summary}.
@@ -352,7 +358,7 @@ Requires: kde-filesystem
Summary: Korean(ko) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-ko = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Korean
%{summary}.
@@ -360,7 +366,7 @@ Requires: kde-filesystem
Summary: Kurdish(ku) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-ku = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Kurdish
%{summary}.
@@ -368,7 +374,7 @@ Requires: kde-filesystem
Summary: Lao(lo) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-lo = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Lao
%{summary}.
@@ -376,7 +382,7 @@ Requires: kde-filesystem
Summary: Lithuanian(lt) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-lt = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Lithuanian
%{summary}.
@@ -384,7 +390,7 @@ Requires: kde-filesystem
Summary: Latvian(lv) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-lv = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Latvian
%{summary}.
@@ -392,7 +398,7 @@ Requires: kde-filesystem
Summary: Maori(mi) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-mi = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Maori
%{summary}.
@@ -400,7 +406,7 @@ Requires: kde-filesystem
Summary: Macedonian(mk) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-mk = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Macedonian
%{summary}.
@@ -408,7 +414,7 @@ Requires: kde-filesystem
Summary: Maltese(mt) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-mt = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Maltese
%{summary}.
@@ -416,7 +422,7 @@ Requires: kde-filesystem
Summary: Dutch(nl) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-nl = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Dutch
%{summary}.
@@ -424,7 +430,7 @@ Requires: kde-filesystem
Summary: Norwegian(no) (Bokmaal) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-no = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Norwegian
%{summary}.
@@ -432,7 +438,7 @@ Requires: kde-filesystem
Summary: Norwegian(nn) (Nynorsk) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-nn = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Norwegian-Nynorsk
%{summary}.
@@ -440,7 +446,7 @@ Requires: kde-filesystem
Summary: Occitan(oc) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-oc = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Occitan
%{summary}.
@@ -448,7 +454,7 @@ Requires: kde-filesystem
Summary: Polish(pl) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-pl = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Polish
%{summary}.
@@ -456,7 +462,7 @@ Requires: kde-filesystem
Summary: Portuguese(pt) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-pt = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Portuguese
%{summary}.
@@ -464,7 +470,7 @@ Requires: kde-filesystem
Summary: Punjabi(pa) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-pa = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Punjabi
%{summary}.
@@ -472,7 +478,7 @@ Requires: kde-filesystem
Summary: Brazil(pt_BR) Portuguese language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-pt_BR = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Brazil
%{summary}.
@@ -480,7 +486,7 @@ Requires: kde-filesystem
Summary: Romanian(ro) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-ro = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Romanian
%{summary}.
@@ -488,7 +494,7 @@ Requires: kde-filesystem
Summary: Russian(ru) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-ru = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Russian
%{summary}.
@@ -496,7 +502,7 @@ Requires: kde-filesystem
Summary: Slovak(sk) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-sk = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Slovak
%{summary}.
@@ -504,7 +510,7 @@ Requires: kde-filesystem
Summary: Slovenian(sl) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-sl = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Slovenian
%{summary}.
@@ -512,7 +518,7 @@ Requires: kde-filesystem
Summary: Serbian(sr) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-sr = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Serbian
%{summary}.
@@ -520,7 +526,7 @@ Requires: kde-filesystem
Summary: Swedish(sv) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-sv = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Swedish
%{summary}.
@@ -528,7 +534,7 @@ Requires: kde-filesystem
Summary: Tamil(ta) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-ta = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Tamil
%{summary}.
@@ -536,7 +542,7 @@ Requires: kde-filesystem
Summary: Tajik(tg) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-tg = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Tajik
%{summary}.
@@ -544,7 +550,7 @@ Requires: kde-filesystem
Summary: Thai(th) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-th = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Thai
%{summary}.
@@ -552,7 +558,7 @@ Requires: kde-filesystem
Summary: Turkish(tr) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-tr = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Turkish
%{summary}.
@@ -560,7 +566,7 @@ Requires: kde-filesystem
Summary: Ukrainian(uk) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-uk = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Ukrainian
%{summary}.
@@ -568,7 +574,7 @@ Requires: kde-filesystem
Summary: Venda(ven) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-ven = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Venda
%{summary}.
@@ -576,7 +582,7 @@ Requires: kde-filesystem
Summary: Vietnamese(vi) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-vi = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Vietnamese
%{summary}.
@@ -584,7 +590,7 @@ Requires: kde-filesystem
Summary: Walloon(wa) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-wa = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Walloon
%{summary}.
@@ -592,7 +598,7 @@ Requires: kde-filesystem
Summary: Xhosa(xh) (a Bantu language) support for KDE3
Group: User Interface/Desktops
Provides: %{name}-xh = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Xhosa
%{summary}.
@@ -600,7 +606,7 @@ Requires: kde-filesystem
Summary: Chinese(zh_CN) (Simplified Chinese) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-zh_CN = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Chinese
%{summary}.
@@ -608,7 +614,7 @@ Requires: kde-filesystem
Summary: Chinese(zh_TW) (Big5) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-tz_TW = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Chinese-Big5
%{summary}.
@@ -616,57 +622,54 @@ Requires: kde-filesystem
%prep
%setup -q -n kde-i18n
+%__cp -f %{SOURCE1} .
for l in %{KDE_LANGS}; do
for f in kde-i18n-${l}-*.tar.bz2; do
- tar xjf ${f}
+ tar xjf "${f}"
done
done
%patch0
%patch1
+%patch2
%build
export PATH="%{_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export kde_htmldir="%{tde_docdir}/HTML"
+
for l in %{KDE_LANGS}; do
for f in kde-i18n-${l}-*/; do
if [ -d "${f}" ] && [ -x "${f}/configure" ] ; then
pushd ${f}
- %configure --prefix=%{_prefix}
- %{__make} %{?_smp_mflags}
+ %configure
+ %__make %{?_smp_mflags}
popd
fi
done
done
%install
-rm -rf %{?buildroot}
+%__rm -rf %{?buildroot}
export PATH="%{_bindir}:${PATH}"
for l in %{KDE_LANGS}; do
for f in kde-i18n-${l}-*/; do
if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then
- pushd ${f}
-
- # Thales: dirty hack to remove directory 'common' from install list (else it fails to install)
- if [ -r docs/Makefile ]; then
- sed -i docs/Makefile -e "s,^\(SUBDIRS =.*\)common\(.*\)$,\1 \2,"
- fi
-
- %__make install DESTDIR=%{?buildroot}
- popd
+ %__make install DESTDIR="%{?buildroot}" -C "${f}"
fi
done
done
# make symlinks relative
-pushd %{buildroot}%{_docdir}/HTML
+%if "%{_prefix}" == "/usr"
+pushd "%{buildroot}%{tde_docdir}/HTML"
for lang in *; do
- if [ -d $lang ]; then
- pushd $lang
+ if [ -d "$lang" ]; then
+ pushd "$lang"
for i in */*/*; do
if [ -d $i -a -L $i/common ]; then
rm -f $i/common
@@ -692,543 +695,483 @@ for lang in *; do
fi
done
popd
+%endif
# remove zero-length file
-find %{buildroot}%{_docdir}/HTML -size 0 -exec rm -f {} \;
+find "%{buildroot}%{tde_docdir}/HTML" -size 0 -exec rm -f {} \;
# See http://fedoraproject.org/wiki/Languages (???)
-rm -f %{buildroot}%{_datadir}/locale/*/flag.png
-# And also the 'desktop.entry' (???)
-rm -f %{buildroot}%{_datadir}/locale/*/entry.desktop
+%__rm -f %{buildroot}%{_datadir}/locale/*/flag.png
+
+# Removes conflict with KDE4
+%if "%{?_prefix}" == "/usr"
+%__rm -f %{buildroot}%{_datadir}/locale/*/entry.desktop
+%endif
# remove obsolete KDE 3 application data translations
-rm -rf %{buildroot}%{_datadir}/apps
+%__rm -rf "%{buildroot}%{_datadir}/apps"
%clean
-rm -rf %{buildroot}
+%__rm -rf %{buildroot}
%if "%( grep -w af <<< '%{KDE_LANGS}' )" != ""
%files Afrikaans
%defattr(-,root,root,-)
-%lang(af) %{_datadir}/locale/af/LC_MESSAGES/*
-%lang(af) %{_datadir}/locale/af/charset
-%lang(af) %{_docdir}/HTML/af/
+%lang(af) %{_datadir}/locale/af/*
+%lang(af) %{tde_docdir}/HTML/af/
%endif
%if "%( grep -w ar <<< '%{KDE_LANGS}' )" != ""
%files Arabic
%defattr(-,root,root,-)
-%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
-%lang(ar) %{_datadir}/locale/ar/charset
+%lang(ar) %{_datadir}/locale/ar/*
%endif
%if "%( grep -w az <<< '%{KDE_LANGS}' )" != ""
%files Azerbaijani
%defattr(-,root,root,-)
-%lang(az) %{_datadir}/locale/az/LC_MESSAGES/*
-%lang(az) %{_datadir}/locale/az/charset
+%lang(az) %{_datadir}/locale/az/*
%endif
%if "%( grep -w be <<< '%{KDE_LANGS}' )" != ""
%files Belarusian
%defattr(-,root,root,-)
-%lang(be) %{_datadir}/locale/be/LC_MESSAGES/*
-%lang(be) %{_datadir}/locale/be/charset
+%lang(be) %{_datadir}/locale/be/*
%endif
%if "%( grep -w bg <<< '%{KDE_LANGS}' )" != ""
%files Bulgarian
%defattr(-,root,root,-)
-%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
-%lang(bg) %{_datadir}/locale/bg/charset
+%lang(bg) %{_datadir}/locale/bg/*
%endif
%if "%( grep -w bn <<< '%{KDE_LANGS}' )" != ""
%files Bengali
%defattr(-,root,root,-)
-%lang(bn) %{_datadir}/locale/bn/LC_MESSAGES/*
-%lang(bn) %{_datadir}/locale/bn/charset
+%lang(bn) %{_datadir}/locale/bn/*
%endif
%if "%( grep -w bo <<< '%{KDE_LANGS}' )" != ""
%files Tibetan
%defattr(-,root,root,-)
-%lang(bo) %{_datadir}/locale/bo/LC_MESSAGES/*
-%lang(bo) %{_datadir}/locale/bo/charset
+%lang(bo) %{_datadir}/locale/bo/*
%endif
%if "%( grep -w br <<< '%{KDE_LANGS}' )" != ""
%files Breton
%defattr(-,root,root,-)
-%lang(br) %{_datadir}/locale/br/LC_MESSAGES/*
-%lang(br) %{_datadir}/locale/br/charset
+%lang(br) %{_datadir}/locale/br/*
%endif
%if "%( grep -w bs <<< '%{KDE_LANGS}' )" != ""
%files Bosnian
%defattr(-,root,root,-)
-%lang(bs) %{_datadir}/locale/bs/LC_MESSAGES/*
-%lang(bs) %{_datadir}/locale/bs/charset
+%lang(bs) %{_datadir}/locale/bs/*
%endif
%if "%( grep -w ca <<< '%{KDE_LANGS}' )" != ""
%files Catalan
%defattr(-,root,root,-)
-%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
-%lang(ca) %{_datadir}/locale/ca/charset
-%lang(ca) %{_docdir}/HTML/ca/
+%lang(ca) %{_datadir}/locale/ca/*
+%lang(ca) %{tde_docdir}/HTML/ca/
%endif
%if "%( grep -w cs <<< '%{KDE_LANGS}' )" != ""
%files Czech
%defattr(-,root,root,-)
-%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
-%lang(cs) %{_datadir}/locale/cs/charset
-%lang(cs) %{_docdir}/HTML/cs/
+%lang(cs) %{_datadir}/locale/cs/*
+%lang(cs) %{tde_docdir}/HTML/cs/
%endif
%if "%( grep -w cy <<< '%{KDE_LANGS}' )" != ""
%files Welsh
%defattr(-,root,root,-)
-%lang(cy) %{_datadir}/locale/cy/LC_MESSAGES/*
-%lang(cy) %{_datadir}/locale/cy/charset
+%lang(cy) %{_datadir}/locale/cy/*
%endif
%if "%( grep -w da <<< '%{KDE_LANGS}' )" != ""
%files Danish
%defattr(-,root,root,-)
-%lang(da) %{_datadir}/locale/da/LC_MESSAGES/*
-%lang(da) %{_datadir}/locale/da/charset
-%lang(da) %{_datadir}/locale/da/da.compendium
-%lang(da) %{_docdir}/HTML/da/
+%lang(da) %{_datadir}/locale/da/*
+%lang(da) %{tde_docdir}/HTML/da/
%endif
%if "%( grep -w de <<< '%{KDE_LANGS}' )" != ""
%files German
%defattr(-,root,root,-)
-%lang(de) %{_datadir}/locale/de/LC_MESSAGES/*
-%lang(de) %{_datadir}/locale/de/charset
-%lang(de) %{_docdir}/HTML/de/
+%lang(de) %{_datadir}/locale/de/*
+%lang(de) %{tde_docdir}/HTML/de/
%endif
%if "%( grep -w el <<< '%{KDE_LANGS}' )" != ""
%files Greek
%defattr(-,root,root,-)
-%lang(el) %{_datadir}/locale/el/LC_MESSAGES/*
-%lang(el) %{_datadir}/locale/el/charset
+%lang(el) %{_datadir}/locale/el/*
%endif
%if "%( grep -w en_GB <<< '%{KDE_LANGS}' )" != ""
%files British
%defattr(-,root,root,-)
-%lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
-%lang(en_GB) %{_datadir}/locale/en_GB/charset
-%lang(en_GB) %{_docdir}/HTML/en_GB/
+%lang(en_GB) %{_datadir}/locale/en_GB/*
+%lang(en_GB) %{tde_docdir}/HTML/en_GB/
%endif
%if "%( grep -w eo <<< '%{KDE_LANGS}' )" != ""
%files Esperanto
%defattr(-,root,root,-)
-%lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
-%lang(eo) %{_datadir}/locale/eo/charset
+%lang(eo) %{_datadir}/locale/eo/*
%endif
%if "%( grep -w es <<< '%{KDE_LANGS}' )" != ""
%files Spanish
%defattr(-,root,root,-)
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
-%lang(es) %{_datadir}/locale/es/charset
-%lang(es) %{_docdir}/HTML/es/
+%lang(es) %{_datadir}/locale/es/*
+%lang(es) %{tde_docdir}/HTML/es/
%endif
%if "%( grep -w et <<< '%{KDE_LANGS}' )" != ""
%files Estonian
%defattr(-,root,root,-)
-%lang(et) %{_datadir}/locale/et/LC_MESSAGES/*
-%lang(et) %{_datadir}/locale/et/charset
-%lang(et) %{_docdir}/HTML/et/
+%lang(et) %{_datadir}/locale/et/*
+%lang(et) %{tde_docdir}/HTML/et/
%endif
%if "%( grep -w eu <<< '%{KDE_LANGS}' )" != ""
%files Basque
%defattr(-,root,root,-)
-%lang(eu) %{_datadir}/locale/eu/LC_MESSAGES/*
-%lang(eu) %{_datadir}/locale/eu/charset
+%lang(eu) %{_datadir}/locale/eu/*
%endif
%if "%( grep -w fa <<< '%{KDE_LANGS}' )" != ""
%files Farsi
%defattr(-,root,root,-)
-%lang(fa) %{_datadir}/locale/fa/LC_MESSAGES/*
-%lang(fa) %{_datadir}/locale/fa/charset
+%lang(fa) %{_datadir}/locale/fa/*
%endif
%if "%( grep -w fi <<< '%{KDE_LANGS}' )" != ""
%files Finnish
%defattr(-,root,root,-)
-%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/*
-%lang(fi) %{_datadir}/locale/fi/charset
-%lang(fi) %{_docdir}/HTML/fi/
+%lang(fi) %{_datadir}/locale/fi/*
+%lang(fi) %{tde_docdir}/HTML/fi/
%endif
%if "%( grep -w fo <<< '%{KDE_LANGS}' )" != ""
%files Faroese
%defattr(-,root,root,-)
-%lang(fo) %{_datadir}/locale/fo/LC_MESSAGES/*
-%lang(fo) %{_datadir}/locale/fo/charset
+%lang(fo) %{_datadir}/locale/fo/*
%endif
%if "%( grep -w fr <<< '%{KDE_LANGS}' )" != ""
%files French
%defattr(-,root,root,-)
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/*
-%lang(fr) %{_datadir}/locale/fr/charset
-%lang(fr) %{_datadir}/locale/fr/nbsp_gui_fr.txt
-%lang(fr) %{_datadir}/locale/fr/relecture_*
-%lang(fr) %{_docdir}/HTML/fr/
+%lang(fr) %{_datadir}/locale/fr/*
+%lang(fr) %{tde_docdir}/HTML/fr/
%endif
%if "%( grep -w fy <<< '%{KDE_LANGS}' )" != ""
%files Frisian
%defattr(-,root,root,-)
-%lang(fy) %{_datadir}/locale/fy/LC_MESSAGES/*
-%lang(fy) %{_datadir}/locale/fy/charset
+%lang(fy) %{_datadir}/locale/fy/*
%endif
%if "%( grep -w ga <<< '%{KDE_LANGS}' )" != ""
%files Irish
%defattr(-,root,root,-)
-%lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/*
-%lang(ga) %{_datadir}/locale/ga/charset
+%lang(ga) %{_datadir}/locale/ga/*
%endif
%if "%( grep -w gl <<< '%{KDE_LANGS}' )" != ""
%files Galician
%defattr(-,root,root,-)
-%lang(gl) %{_datadir}/locale/gl/LC_MESSAGES/*
-%lang(gl) %{_datadir}/locale/gl/charset
+%lang(gl) %{_datadir}/locale/gl/*
%endif
%if "%( grep -w he <<< '%{KDE_LANGS}' )" != ""
%files Hebrew
%defattr(-,root,root,-)
-%lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
-%lang(he) %{_datadir}/locale/he/charset
-%lang(he) %{_docdir}/HTML/he/
+%lang(he) %{_datadir}/locale/he/*
+%lang(he) %{tde_docdir}/HTML/he/
%endif
%if "%( grep -w hi <<< '%{KDE_LANGS}' )" != ""
%files Hindi
%defattr(-,root,root,-)
-%lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
-%lang(hi) %{_datadir}/locale/hi/charset
+%lang(hi) %{_datadir}/locale/hi/*
%endif
%if "%( grep -w hr <<< '%{KDE_LANGS}' )" != ""
%files Croatian
%defattr(-,root,root,-)
-%lang(hr) %{_datadir}/locale/hr/LC_MESSAGES/*
-%lang(hr) %{_datadir}/locale/hr/charset
-%lang(hr) %{_docdir}/HTML/hr/
+%lang(hr) %{_datadir}/locale/hr/*
+%lang(hr) %{tde_docdir}/HTML/hr/
%endif
%if "%( grep -w hu <<< '%{KDE_LANGS}' )" != ""
%files Hungarian
%defattr(-,root,root,-)
-%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
-%lang(hu) %{_datadir}/locale/hu/charset
-%lang(hu) %{_docdir}/HTML/hu/
+%lang(hu) %{_datadir}/locale/hu/*
+%lang(hu) %{tde_docdir}/HTML/hu/
%endif
%if "%( grep -w id <<< '%{KDE_LANGS}' )" != ""
%files Indonesian
%defattr(-,root,root,-)
-%lang(id) %{_datadir}/locale/id/LC_MESSAGES/*
-%lang(id) %{_datadir}/locale/id/charset
-%lang(id) %{_docdir}/HTML/id/
+%lang(id) %{_datadir}/locale/id/*
+%lang(id) %{tde_docdir}/HTML/id/
%endif
%if "%( grep -w is <<< '%{KDE_LANGS}' )" != ""
%files Icelandic
%defattr(-,root,root,-)
-%lang(is) %{_datadir}/locale/is/LC_MESSAGES/*
-%lang(is) %{_datadir}/locale/is/charset
+%lang(is) %{_datadir}/locale/is/*
%endif
%if "%( grep -w it <<< '%{KDE_LANGS}' )" != ""
%files Italian
%defattr(-,root,root,-)
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/*
-%lang(it) %{_datadir}/locale/it/charset
-%lang(it) %{_docdir}/HTML/it/
+%lang(it) %{_datadir}/locale/it/*
+%lang(it) %{tde_docdir}/HTML/it/
%endif
%if "%( grep -w ja <<< '%{KDE_LANGS}' )" != ""
%files Japanese
%defattr(-,root,root,-)
-%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
-%lang(ja) %{_datadir}/locale/ja/charset
-%lang(ja) %{_docdir}/HTML/ja/
+%lang(ja) %{_datadir}/locale/ja/*
+%lang(ja) %{tde_docdir}/HTML/ja/
%endif
%if "%( grep -w ko <<< '%{KDE_LANGS}' )" != ""
%files Korean
%defattr(-,root,root,-)
-%lang(ko) %{_datadir}/locale/ko/LC_MESSAGES/*
-%lang(ko) %{_datadir}/locale/ko/charset
-%lang(ko) %{_docdir}/HTML/ko/
+%lang(ko) %{_datadir}/locale/ko/*
+%lang(ko) %{tde_docdir}/HTML/ko/
%endif
%if "%( grep -w ku <<< '%{KDE_LANGS}' )" != ""
%files Kurdish
%defattr(-,root,root,-)
-%lang(ku) %{_datadir}/locale/ku/LC_MESSAGES/*
-%lang(ku) %{_datadir}/locale/ku/charset
-%lang(ku) %{_docdir}/HTML/ku/
+%lang(ku) %{_datadir}/locale/ku/*
+%lang(ku) %{tde_docdir}/HTML/ku/
%endif
%if "%( grep -w lao <<< '%{KDE_LANGS}' )" != ""
%files Lao
%defattr(-,root,root,-)
-%lang(lo) %{_datadir}/locale/lo/LC_MESSAGES/*
-%lang(lo) %{_datadir}/locale/lo/charset
-%lang(lo) %{_docdir}/HTML/lo/
+%lang(lo) %{_datadir}/locale/lo/*
+%lang(lo) %{tde_docdir}/HTML/lo/
%endif
%if "%( grep -w lt <<< '%{KDE_LANGS}' )" != ""
%files Lithuanian
%defattr(-,root,root,-)
-%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
-%lang(lt) %{_datadir}/locale/lt/charset
+%lang(lt) %{_datadir}/locale/lt/*
%endif
%if "%( grep -w lv <<< '%{KDE_LANGS}' )" != ""
%files Latvian
%defattr(-,root,root,-)
-%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
-%lang(lv) %{_datadir}/locale/lv/charset
+%lang(lv) %{_datadir}/locale/lv/*
%endif
%if "%( grep -w mi <<< '%{KDE_LANGS}' )" != ""
%files Maori
%defattr(-,root,root,-)
-%lang(mi) %{_datadir}/locale/mi/LC_MESSAGES/*
-%lang(mi) %{_datadir}/locale/mi/charset
+%lang(mi) %{_datadir}/locale/mi/*
%endif
%if "%( grep -w mk <<< '%{KDE_LANGS}' )" != ""
%files Macedonian
%defattr(-,root,root,-)
-%lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/*
-%lang(mk) %{_datadir}/locale/mk/charset
+%lang(mk) %{_datadir}/locale/mk/*
%endif
%if "%( grep -w mt <<< '%{KDE_LANGS}' )" != ""
%files Maltese
%defattr(-,root,root,-)
-%lang(mt) %{_datadir}/locale/mt/LC_MESSAGES/*
-%lang(mt) %{_datadir}/locale/mt/charset
+%lang(mt) %{_datadir}/locale/mt/*
%endif
%if "%( grep -w nl <<< '%{KDE_LANGS}' )" != ""
%files Dutch
%defattr(-,root,root,-)
-%lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
-%lang(nl) %{_datadir}/locale/nl/charset
-%lang(nl) %{_docdir}/HTML/nl/
+%lang(nl) %{_datadir}/locale/nl/*
+%lang(nl) %{tde_docdir}/HTML/nl/
%endif
%if "%( grep -w nb <<< '%{KDE_LANGS}' )" != ""
%files Norwegian
%defattr(-,root,root,-)
-%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
-%lang(nb) %{_datadir}/locale/nb/charset
-%lang(nb) %{_datadir}/locale/nb/README
-#%lang(nb) %{_docdir}/HTML/nb/
+%lang(nb) %{_datadir}/locale/nb/*
+#%lang(nb) %{tde_docdir}/HTML/nb/
%endif
%if "%( grep -w nn <<< '%{KDE_LANGS}' )" != ""
%files Norwegian-Nynorsk
%defattr(-,root,root,-)
-%lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/*
-%lang(nn) %{_datadir}/locale/nn/charset
-#%lang(nn) %{_docdir}/HTML/nn/
+%lang(nn) %{_datadir}/locale/nn/*
+#%lang(nn) %{tde_docdir}/HTML/nn/
%endif
%if "%( grep -w oc <<< '%{KDE_LANGS}' )" != ""
%files Occitan
%defattr(-,root,root,-)
-%lang(oc) %{_datadir}/locale/oc/LC_MESSAGES/*
-%lang(oc) %{_datadir}/locale/oc/charset
+%lang(oc) %{_datadir}/locale/oc/*
%endif
%if "%( grep -w pa <<< '%{KDE_LANGS}' )" != ""
%files Punjabi
%defattr(-,root,root,-)
-%lang(pa) %{_datadir}/locale/pa/LC_MESSAGES/*
-%lang(pa) %{_datadir}/locale/pa/charset
+%lang(pa) %{_datadir}/locale/pa/*
%endif
%if "%( grep -w pl <<< '%{KDE_LANGS}' )" != ""
%files Polish
%defattr(-,root,root,-)
-%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*
-%lang(pl) %{_datadir}/locale/pl/charset
-%lang(pl) %{_docdir}/HTML/pl/
+%lang(pl) %{_datadir}/locale/pl/*
+%lang(pl) %{tde_docdir}/HTML/pl/
%endif
%if "%( grep -w pt <<< '%{KDE_LANGS}' )" != ""
%files Portuguese
%defattr(-,root,root,-)
-%lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
-%lang(pt) %{_datadir}/locale/pt/charset
-%lang(pt) %{_docdir}/HTML/pt/
+%lang(pt) %{_datadir}/locale/pt/*
+%lang(pt) %{tde_docdir}/HTML/pt/
%endif
%if "%( grep -w pt_BR <<< '%{KDE_LANGS}' )" != ""
%files Brazil
%defattr(-,root,root,-)
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*
-%lang(pt_BR) %{_datadir}/locale/pt_BR/charset
-%lang(pt_BR) %{_docdir}/HTML/pt_BR/
+%lang(pt_BR) %{_datadir}/locale/pt_BR/*
+%lang(pt_BR) %{tde_docdir}/HTML/pt_BR/
%endif
%if "%( grep -w ro <<< '%{KDE_LANGS}' )" != ""
%files Romanian
%defattr(-,root,root,-)
-%lang(ro) %{_datadir}/locale/ro/LC_MESSAGES/*
-%lang(ro) %{_datadir}/locale/ro/charset
-%lang(ro) %{_docdir}/HTML/ro/
+%lang(ro) %{_datadir}/locale/ro/*
+%lang(ro) %{tde_docdir}/HTML/ro/
%endif
%if "%( grep -w ru <<< '%{KDE_LANGS}' )" != ""
%files Russian
%defattr(-,root,root,-)
-%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
-%lang(ru) %{_datadir}/locale/ru/charset
-%lang(ru) %{_docdir}/HTML/ru/
+%lang(ru) %{_datadir}/locale/ru/*
+%lang(ru) %{tde_docdir}/HTML/ru/
%endif
%if "%( grep -w sk <<< '%{KDE_LANGS}' )" != ""
%files Slovak
%defattr(-,root,root,-)
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
-%lang(sk) %{_datadir}/locale/sk/charset
-%lang(sk) %{_docdir}/HTML/sk/
+%lang(sk) %{_datadir}/locale/sk/*
+%lang(sk) %{tde_docdir}/HTML/sk/
%endif
%if "%( grep -w sl <<< '%{KDE_LANGS}' )" != ""
%files Slovenian
%defattr(-,root,root,-)
-%lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
-%lang(sl) %{_datadir}/locale/sl/charset
-%lang(sl) %{_docdir}/HTML/sl/
+%lang(sl) %{_datadir}/locale/sl/*
+%lang(sl) %{tde_docdir}/HTML/sl/
%endif
%if "%( grep -w sr <<< '%{KDE_LANGS}' )" != ""
%files Serbian
%defattr(-,root,root,-)
-%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/*
-%lang(sr) %{_datadir}/locale/sr/charset
-%lang(sr) %{_docdir}/HTML/sr/
+%lang(sr) %{_datadir}/locale/sr/*
+%lang(sr) %{tde_docdir}/HTML/sr/
%endif
%if "%( grep -w sv <<< '%{KDE_LANGS}' )" != ""
%files Swedish
%defattr(-,root,root,-)
-%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
-%lang(sv) %{_datadir}/locale/sv/charset
-%lang(sv) %{_docdir}/HTML/sv/
+%lang(sv) %{_datadir}/locale/sv/*
+%lang(sv) %{tde_docdir}/HTML/sv/
%endif
%if "%( grep -w ta <<< '%{KDE_LANGS}' )" != ""
%files Tamil
%defattr(-,root,root,-)
-%lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/*
-%lang(ta) %{_datadir}/locale/ta/charset
+%lang(ta) %{_datadir}/locale/ta/*
%endif
%if "%( grep -w tg <<< '%{KDE_LANGS}' )" != ""
%files Tajik
%defattr(-,root,root,-)
-%lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/*
-%lang(tg) %{_datadir}/locale/tg/charset
+%lang(tg) %{_datadir}/locale/tg/*
%endif
%if "%( grep -w th <<< '%{KDE_LANGS}' )" != ""
%files Thai
%defattr(-,root,root,-)
-%lang(th) %{_datadir}/locale/th/LC_MESSAGES/*
-%lang(th) %{_datadir}/locale/th/charset
+%lang(th) %{_datadir}/locale/th/*
%endif
%if "%( grep -w tr <<< '%{KDE_LANGS}' )" != ""
%files Turkish
%defattr(-,root,root,-)
-%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
-%lang(tr) %{_datadir}/locale/tr/charset
-%lang(tr) %{_docdir}/HTML/tr/
+%lang(tr) %{_datadir}/locale/tr/*
+%lang(tr) %{tde_docdir}/HTML/tr/
%endif
%if "%( grep -w uk <<< '%{KDE_LANGS}' )" != ""
%files Ukrainian
%defattr(-,root,root,-)
-%lang(uk) %{_docdir}/HTML/uk/
-%lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
-%lang(uk) %{_datadir}/locale/uk/charset
+%lang(uk) %{tde_docdir}/HTML/uk/
+%lang(uk) %{_datadir}/locale/uk/*
%endif
%if "%( grep -w ven <<< '%{KDE_LANGS}' )" != ""
%files Venda
%defattr(-,root,root,-)
-%lang(ven) %{_datadir}/locale/ven/LC_MESSAGES/*
-%lang(ven) %{_datadir}/locale/ven/charset
+%lang(ven) %{_datadir}/locale/ven/*
%endif
%if "%( grep -w vi <<< '%{KDE_LANGS}' )" != ""
%files Vietnamese
%defattr(-,root,root,-)
-%lang(vi) %{_datadir}/locale/vi/LC_MESSAGES/*
-%lang(vi) %{_datadir}/locale/vi/charset
+%lang(vi) %{_datadir}/locale/vi/*
%endif
%if "%( grep -w wa <<< '%{KDE_LANGS}' )" != ""
%files Walloon
%defattr(-,root,root,-)
-%lang(wa) %{_datadir}/locale/wa/LC_MESSAGES/*
-%lang(wa) %{_datadir}/locale/wa/charset
+%lang(wa) %{_datadir}/locale/wa/*
%endif
%if "%( grep -w xh <<< '%{KDE_LANGS}' )" != ""
%files Xhosa
%defattr(-,root,root,-)
-%lang(xh) %{_datadir}/locale/xh/LC_MESSAGES/*
-%lang(xh) %{_datadir}/locale/xh/charset
-%lang(xh) %{_docdir}/HTML/xh/
+%lang(xh) %{_datadir}/locale/xh/*
+%lang(xh) %{tde_docdir}/HTML/xh/
%endif
%if "%( grep -w zh_CN <<< '%{KDE_LANGS}' )" != ""
%files Chinese
%defattr(-,root,root,-)
-%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
-%lang(zh_CN) %{_datadir}/locale/zh_CN/charset
-%lang(zh_CN) %{_docdir}/HTML/zh_CN/
+%lang(zh_CN) %{_datadir}/locale/zh_CN/*
+%lang(zh_CN) %{tde_docdir}/HTML/zh_CN/
%endif
%if "%( grep -w zh_TW <<< '%{KDE_LANGS}' )" != ""
%files Chinese-Big5
%defattr(-,root,root,-)
-%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/*
-%lang(zh_TW) %{_datadir}/locale/zh_TW/charset
-%lang(zh_TW) %{_docdir}/HTML/zh_TW/
+%lang(zh_TW) %{_datadir}/locale/zh_TW/*
+%lang(zh_TW) %{tde_docdir}/HTML/zh_TW/
%endif
%changelog
+* Fri Dec 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-8
+- Backport from TDE 3.5.13
+- Removes 'kde-filesystem" dependancy
+- Fix HTML directory location
+- Re-adds missing files 'entry.desktop'
+- Updates zh_TW translation, thanks to Wei-Lun Chao
+- Add missing french translations for TDE 3.5.13
+
* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-7
- Add support for RHEL5
* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
-- Re-introduce all languages
+- Re-introduce all languages (again)
* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
- Re-introduce all languages
diff --git a/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec b/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec
index dfd9eb97f..f98405524 100644
--- a/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec
+++ b/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec
@@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
-%define release 4
+%define release 5
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -70,7 +70,7 @@ BuildRequires: trinity-kdelibs-devel
Summary: Afrikaans(af) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-af = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Afrikaans
%{summary}.
@@ -78,7 +78,7 @@ Requires: kde-filesystem
Summary: Arabic(ar) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-ar = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Arabic
%{summary}.
@@ -86,7 +86,7 @@ Requires: kde-filesystem
Summary: Azerbaijani(az) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-az = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Azerbaijani
%{summary}.
@@ -94,7 +94,7 @@ Requires: kde-filesystem
Summary: Belarusian(be) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-be = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Belarusian
%{summary}.
@@ -102,7 +102,7 @@ Requires: kde-filesystem
Summary: Bulgarian(bg) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-bg = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Bulgarian
%{summary}.
@@ -110,7 +110,7 @@ Requires: kde-filesystem
Summary: Bengali(bn) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-bn = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Bengali
%{summary}.
@@ -118,7 +118,7 @@ Requires: kde-filesystem
Summary: Tibetan(bo) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-bo = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Tibetan
%{summary}.
@@ -126,7 +126,7 @@ Requires: kde-filesystem
Summary: Breton(br) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-br = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Breton
%{summary}.
@@ -134,7 +134,7 @@ Requires: kde-filesystem
Summary: Bosnian(bs) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-bs = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Bosnian
%{summary}.
@@ -142,7 +142,7 @@ Requires: kde-filesystem
Summary: Catalan(ca) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-ca = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Catalan
%{summary}.
@@ -150,14 +150,14 @@ Requires: kde-filesystem
Summary: Czech(cs) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-cs = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Czech
%{summary}.
%package Cymraeg
Summary: Cymraeg language support for KDE3
Group: User Interface/Desktops
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Cymraeg
%{summary}.
@@ -165,7 +165,7 @@ Requires: kde-filesystem
Summary: Welsh(cy) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-cy = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Welsh
%{summary}.
@@ -173,7 +173,7 @@ Requires: kde-filesystem
Summary: Danish(da) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-da = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Danish
%{summary}.
@@ -181,7 +181,7 @@ Requires: kde-filesystem
Summary: German(de) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-de = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description German
%{summary}.
@@ -189,7 +189,7 @@ Requires: kde-filesystem
Summary: Greek(el) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-el = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Greek
%{summary}.
@@ -197,7 +197,7 @@ Requires: kde-filesystem
Summary: British(en_GB) English support for KDE3
Group: User Interface/Desktops
Provides: %{name}-en_GB = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description British
%{summary}.
@@ -205,7 +205,7 @@ Requires: kde-filesystem
Summary: Esperanto(eo) support for KDE3
Group: User Interface/Desktops
Provides: %{name}-eo = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Esperanto
%{summary}.
@@ -213,7 +213,7 @@ Requires: kde-filesystem
Summary: Spanish(es) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-es = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Spanish
%{summary}.
@@ -221,7 +221,7 @@ Requires: kde-filesystem
Summary: Estonian(et) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-et = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Estonian
%{summary}.
@@ -229,7 +229,7 @@ Requires: kde-filesystem
Summary: Basque(eu) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-eu = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Basque
%{summary}.
@@ -237,7 +237,7 @@ Requires: kde-filesystem
Summary: Farsi(fa) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-fa = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Farsi
%{summary}.
@@ -245,7 +245,7 @@ Requires: kde-filesystem
Summary: Finnish(fi) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-fi = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Finnish
%{summary}.
@@ -253,7 +253,7 @@ Requires: kde-filesystem
Summary: Faroese(fo) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-fo = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Faroese
%{summary}.
@@ -261,7 +261,7 @@ Requires: kde-filesystem
Summary: French(fr) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-fr = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description French
%{summary}.
@@ -269,7 +269,7 @@ Requires: kde-filesystem
Summary: Frisian(fy) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-fy = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Frisian
%{summary}.
@@ -278,7 +278,7 @@ Summary: Irish(ga) language support for KDE3
Group: User Interface/Desktops
Obsoletes: kde-i18n-Gaeilge < %{version}
Provides: %{name}-ga = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Irish
%{summary}.
@@ -286,7 +286,7 @@ Requires: kde-filesystem
Summary: Galician(gl) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-gl = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Galician
%{summary}.
@@ -294,7 +294,7 @@ Requires: kde-filesystem
Summary: Hebrew(he) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-he = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Hebrew
%{summary}.
@@ -302,7 +302,7 @@ Requires: kde-filesystem
Summary: Hindi(hi) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-hi = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Hindi
%{summary}.
@@ -310,7 +310,7 @@ Requires: kde-filesystem
Summary: Croatian(hr) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-hr = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Croatian
%{summary}.
@@ -318,7 +318,7 @@ Requires: kde-filesystem
Summary: Hungarian(hu) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-hu = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Hungarian
%{summary}.
@@ -326,7 +326,7 @@ Requires: kde-filesystem
Summary: Indonesian(id) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-id = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Indonesian
%{summary}.
@@ -334,7 +334,7 @@ Requires: kde-filesystem
Summary: Icelandic(is) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-is = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Icelandic
%{summary}.
@@ -342,7 +342,7 @@ Requires: kde-filesystem
Summary: Italian(it) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-it = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Italian
%{summary}.
@@ -350,7 +350,7 @@ Requires: kde-filesystem
Summary: Japanese(ja) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-ja = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Japanese
%{summary}.
@@ -358,7 +358,7 @@ Requires: kde-filesystem
Summary: Korean(ko) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-ko = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Korean
%{summary}.
@@ -366,7 +366,7 @@ Requires: kde-filesystem
Summary: Kurdish(ku) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-ku = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Kurdish
%{summary}.
@@ -374,7 +374,7 @@ Requires: kde-filesystem
Summary: Lao(lo) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-lo = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Lao
%{summary}.
@@ -382,7 +382,7 @@ Requires: kde-filesystem
Summary: Lithuanian(lt) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-lt = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Lithuanian
%{summary}.
@@ -390,7 +390,7 @@ Requires: kde-filesystem
Summary: Latvian(lv) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-lv = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Latvian
%{summary}.
@@ -398,7 +398,7 @@ Requires: kde-filesystem
Summary: Maori(mi) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-mi = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Maori
%{summary}.
@@ -406,7 +406,7 @@ Requires: kde-filesystem
Summary: Macedonian(mk) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-mk = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Macedonian
%{summary}.
@@ -414,7 +414,7 @@ Requires: kde-filesystem
Summary: Maltese(mt) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-mt = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Maltese
%{summary}.
@@ -422,7 +422,7 @@ Requires: kde-filesystem
Summary: Dutch(nl) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-nl = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Dutch
%{summary}.
@@ -430,7 +430,7 @@ Requires: kde-filesystem
Summary: Norwegian(no) (Bokmaal) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-no = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Norwegian
%{summary}.
@@ -438,7 +438,7 @@ Requires: kde-filesystem
Summary: Norwegian(nn) (Nynorsk) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-nn = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Norwegian-Nynorsk
%{summary}.
@@ -446,7 +446,7 @@ Requires: kde-filesystem
Summary: Occitan(oc) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-oc = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Occitan
%{summary}.
@@ -454,7 +454,7 @@ Requires: kde-filesystem
Summary: Polish(pl) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-pl = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Polish
%{summary}.
@@ -462,7 +462,7 @@ Requires: kde-filesystem
Summary: Portuguese(pt) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-pt = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Portuguese
%{summary}.
@@ -470,7 +470,7 @@ Requires: kde-filesystem
Summary: Punjabi(pa) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-pa = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Punjabi
%{summary}.
@@ -478,7 +478,7 @@ Requires: kde-filesystem
Summary: Brazil(pt_BR) Portuguese language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-pt_BR = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Brazil
%{summary}.
@@ -486,7 +486,7 @@ Requires: kde-filesystem
Summary: Romanian(ro) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-ro = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Romanian
%{summary}.
@@ -494,7 +494,7 @@ Requires: kde-filesystem
Summary: Russian(ru) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-ru = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Russian
%{summary}.
@@ -502,7 +502,7 @@ Requires: kde-filesystem
Summary: Slovak(sk) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-sk = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Slovak
%{summary}.
@@ -510,7 +510,7 @@ Requires: kde-filesystem
Summary: Slovenian(sl) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-sl = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Slovenian
%{summary}.
@@ -518,7 +518,7 @@ Requires: kde-filesystem
Summary: Serbian(sr) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-sr = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Serbian
%{summary}.
@@ -526,7 +526,7 @@ Requires: kde-filesystem
Summary: Swedish(sv) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-sv = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Swedish
%{summary}.
@@ -534,7 +534,7 @@ Requires: kde-filesystem
Summary: Tamil(ta) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-ta = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Tamil
%{summary}.
@@ -542,7 +542,7 @@ Requires: kde-filesystem
Summary: Tajik(tg) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-tg = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Tajik
%{summary}.
@@ -550,7 +550,7 @@ Requires: kde-filesystem
Summary: Thai(th) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-th = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Thai
%{summary}.
@@ -558,7 +558,7 @@ Requires: kde-filesystem
Summary: Turkish(tr) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-tr = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Turkish
%{summary}.
@@ -566,7 +566,7 @@ Requires: kde-filesystem
Summary: Ukrainian(uk) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-uk = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Ukrainian
%{summary}.
@@ -574,7 +574,7 @@ Requires: kde-filesystem
Summary: Venda(ven) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-ven = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Venda
%{summary}.
@@ -582,7 +582,7 @@ Requires: kde-filesystem
Summary: Vietnamese(vi) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-vi = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Vietnamese
%{summary}.
@@ -590,7 +590,7 @@ Requires: kde-filesystem
Summary: Walloon(wa) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-wa = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Walloon
%{summary}.
@@ -598,7 +598,7 @@ Requires: kde-filesystem
Summary: Xhosa(xh) (a Bantu language) support for KDE3
Group: User Interface/Desktops
Provides: %{name}-xh = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Xhosa
%{summary}.
@@ -606,7 +606,7 @@ Requires: kde-filesystem
Summary: Chinese(zh_CN) (Simplified Chinese) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-zh_CN = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Chinese
%{summary}.
@@ -614,7 +614,7 @@ Requires: kde-filesystem
Summary: Chinese(zh_TW) (Big5) language support for KDE3
Group: User Interface/Desktops
Provides: %{name}-tz_TW = %{version}-%{release}
-Requires: kde-filesystem
+#Requires: kde-filesystem
%description Chinese-Big5
%{summary}.
@@ -659,15 +659,7 @@ export PATH="%{_bindir}:${PATH}"
for l in %{KDE_LANGS}; do
for f in kde-i18n-${l}-*/; do
if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then
- pushd ${f}
-
- # RHEL/Fedora: dirty hack to remove directory 'common' from install list (else it fails to install)
-# if [ -r docs/Makefile ]; then
-# sed -i docs/Makefile -e "s,^\(SUBDIRS =.*\)common\(.*\)$,\1 \2,"
-# fi
-
- %__make install DESTDIR=%{?buildroot}
- popd
+ %__make install DESTDIR=%{?buildroot} -C ${f}
fi
done
done
@@ -1165,6 +1157,9 @@ find %{buildroot}%{tde_docdir}/HTML -size 0 -exec rm -f {} \;
%endif
%changelog
+* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
+- Removes 'kde-filesystem" dependancy
+
* Fri Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
- Fix HTML directory location
diff --git a/redhat/kdebase/kdebase-3.5.12-kickoff_unstable.patch b/redhat/kdebase/kdebase-3.5.12-kickoff_unstable.patch
new file mode 100644
index 000000000..a66bf625d
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.12-kickoff_unstable.patch
@@ -0,0 +1,428 @@
+--- kdebase/kicker/kicker/buttons/knewbutton.cpp.ORI 2011-12-08 21:15:57.551323941 +0100
++++ kdebase/kicker/kicker/buttons/knewbutton.cpp 2011-12-08 21:22:05.216346827 +0100
+@@ -55,26 +55,26 @@
+ : KButton( parent ),
+ m_oldPos(0,0)
+ {
++ setTitle(i18n("K Menu"));
+ Q_ASSERT( !m_self );
+ m_self = this;
+- m_hoverTimer = -1;
+ m_openTimer = -1;
+- m_active = false;
++ m_hoverTimer = -1;
+ m_mouseInside = false;
+ m_drag = false;
+
+- setIconAlignment((Qt::AlignmentFlags)(AlignTop|AlignRight));
+- setAcceptDrops(true);
+- setIcon("kmenu-suse");
+- setDrawArrow(false);
+-
+- m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_basic.mng"));
+- m_movie->connectUpdate(this, TQT_SLOT(updateMovie()));
+- m_movie->connectStatus(this, TQT_SLOT(slotStatus(int)));
+- m_movie->connectResize(this, TQT_SLOT(slotSetSize(const TQSize&)));
++ setIcon("kmenu");
++ setIcon(KickerSettings::customKMenuIcon());
+
+ TQApplication::desktop()->screen()->installEventFilter(this);
+- setMouseTracking(true);
++ if (KickerSettings::showKMenuText())
++ {
++ setButtonText(KickerSettings::kMenuText());
++ setFont(KickerSettings::buttonFont());
++ setTextColor(KickerSettings::buttonTextColor());
++ }
++
++ repaint();
+ }
+
+ KNewButton::~KNewButton()
+@@ -82,28 +82,14 @@
+ if ( m_self == this )
+ m_self = 0;
+ setMouseTracking(false);
+- delete m_movie;
+-}
+-
+-void KNewButton::slotStatus(int status)
+-{
+- if(status == TQMovie::EndOfLoop)
+- slotStopAnimation();
+ }
+
+-TQColor KNewButton::borderColor() const
++void KNewButton::drawButton(TQPainter *p)
+ {
+- TQImage img = m_active_pixmap.convertToImage();
+-
+- for (int i = 0; i < img.width(); ++i) {
+- QRgb rgb = img.pixel(orientation() == Qt::Horizontal ? img.width() - i - 1 :
+- i, 2);
+-
+- if (qGreen(rgb) > 0x50)
+- return rgb;
+- }
+-
+- return img.pixel( orientation() == Qt::Horizontal ? img.width() - 2 : 2, 2);
++ //if (KickerSettings::showDeepButtons())
++ // PanelPopupButton::drawDeepButton(p);
++ //else
++ PanelPopupButton::drawButton(p);
+ }
+
+ void KNewButton::show()
+@@ -111,103 +97,12 @@
+ KButton::show();
+
+ if (KickerSettings::firstRun()) {
+- TQTimer::singleShot(500,this,TQT_SLOT(slotExecMenu()));
++ TQTimer::singleShot(0,this,TQT_SLOT(slotExecMenu()));
+ KickerSettings::setFirstRun(false);
+ KickerSettings::writeConfig();
+ }
+ }
+
+-void KNewButton::updateMovie()
+-{
+- m_oldPos = TQPoint( -1, -1 );
+- drawEye();
+-
+- if (!m_active && m_movie->running())
+- m_movie->pause();
+-}
+-
+-void KNewButton::setPopupDirection(KPanelApplet::Direction d)
+-{
+- KButton::setPopupDirection(d);
+-
+- delete m_movie;
+-
+- switch (d) {
+- case KPanelApplet::Left:
+- setIconAlignment((Qt::AlignmentFlags)(AlignTop|AlignLeft));
+- m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_vertical.mng"));
+- break;
+- case KPanelApplet::Right:
+- setIconAlignment((Qt::AlignmentFlags)(AlignTop|AlignRight));
+- m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_vertical.mng"));
+- break;
+- case KPanelApplet::Up:
+- setIconAlignment((Qt::AlignmentFlags)(AlignTop|AlignHCenter));
+- m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_basic.mng"));
+- break;
+- case KPanelApplet::Down:
+- setIconAlignment((Qt::AlignmentFlags)(AlignBottom|AlignHCenter));
+- m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_flipped.mng"));
+- }
+-
+- m_movie->connectUpdate(this, TQT_SLOT(updateMovie()));
+- m_movie->connectStatus(this, TQT_SLOT(slotStatus(int)));
+- m_movie->connectResize(this, TQT_SLOT(slotSetSize(const TQSize&)));
+-}
+-
+-void KNewButton::slotSetSize(const TQSize& s)
+-{
+- m_iconSize = s;
+-}
+-
+-double KNewButton::buttonScaleFactor(const TQSize& s) const
+-{
+- double sf = 1.0;
+-
+- switch (popupDirection()) {
+- case KPanelApplet::Left:
+- case KPanelApplet::Right:
+-// sf = kMin(double(s.width()) / m_iconSize.height(), double(s.height()) / m_iconSize.width());
+-// break;
+- case KPanelApplet::Up:
+- case KPanelApplet::Down:
+- sf = kMin(double(s.width()) / m_iconSize.width(), double(s.height()) / m_iconSize.height());
+- break;
+- }
+-
+- if (sf > 0.8) sf = 1.0;
+- return sf;
+-}
+-
+-int KNewButton::widthForHeight(int height) const
+-{
+- int r = m_iconSize.width() * buttonScaleFactor(TQSize(m_iconSize.width(), height));
+-
+- if (!m_movie->running() && height != m_active_pixmap.height())
+- {
+- KNewButton* that = const_cast<KNewButton*>(this);
+- TQTimer::singleShot(0, that, TQT_SLOT(slotStopAnimation()));
+- }
+-
+- return r;
+-}
+-
+-int KNewButton::preferredDimension(int panelDim) const
+-{
+- return kMax(m_icon.width(), m_icon.height());
+-}
+-
+-int KNewButton::heightForWidth(int width) const
+-{
+- int r = m_iconSize.width() * buttonScaleFactor(TQSize(width, m_iconSize.height()));
+- if (!m_movie->running() && width != m_active_pixmap.width())
+- {
+- KNewButton* that = const_cast<KNewButton*>(this);
+- TQTimer::singleShot(0, that, TQT_SLOT(slotStopAnimation()));
+- }
+- return r;
+-}
+-
+ bool KNewButton::eventFilter(TQObject *o, TQEvent *e)
+ {
+ if (e->type() == TQEvent::MouseButtonRelease ||
+@@ -223,75 +118,9 @@
+ }
+ }
+
+- if (KickerSettings::kickoffDrawGeekoEye() && e->type() == TQEvent::MouseMove)
+- {
+- TQMouseEvent *me = static_cast<TQMouseEvent *>(e);
+- if ((me->state() & MouseButtonMask) == NoButton)
+- drawEye();
+- }
+-
+ return KButton::eventFilter(o, e);
+ }
+
+-void KNewButton::drawEye()
+-{
+-#define eye_x 62
+-#define eye_y 13
+- TQPoint mouse = TQCursor::pos();
+- TQPoint me = mapToGlobal(TQPoint(eye_x, eye_y));
+- double a = atan2(mouse.y() - me.y(), mouse.x() - me.x());
+- int dx = int(2.1 * cos(a));
+- int dy = int(2.1 * sin(a));
+-
+- TQPoint newpos(eye_x+dx,eye_y+dy);
+- if (newpos!=m_oldPos) {
+- m_oldPos = newpos;
+- TQPixmap pixmap = m_active_pixmap;
+-
+- double sf = 1.0;
+-
+- if(!m_movie->framePixmap().isNull())
+- {
+- pixmap = m_movie->framePixmap();
+- pixmap.detach();
+- m_iconSize = pixmap.size();
+- sf = buttonScaleFactor(size());
+-
+- if (KickerSettings::kickoffDrawGeekoEye()) {
+- TQPainter p(&pixmap);
+- p.setPen(white);
+- p.setBrush(white);
+- // p.setPen(TQColor(110,185,55));
+- p.drawRect(eye_x+dx, eye_y+dy, 2, 2);
+- p. end();
+- }
+- }
+-
+- TQWMatrix matrix;
+- switch (popupDirection()) {
+- case KPanelApplet::Left:
+- matrix.scale(sf, -sf);
+- matrix.rotate(90);
+- break;
+- case KPanelApplet::Up:
+- matrix.scale(sf, sf);
+- break;
+- case KPanelApplet::Right:
+- matrix.scale(sf, -sf);
+- matrix.rotate(90);
+- break;
+- case KPanelApplet::Down:
+- matrix.scale(sf, sf);
+- break;
+- }
+- m_active_pixmap = pixmap.xForm(matrix);
+-
+- repaint(false);
+- }
+-#undef eye_x
+-#undef eye_y
+-}
+-
+ void KNewButton::enterEvent(TQEvent* e)
+ {
+ KButton::enterEvent(e);
+@@ -315,14 +144,6 @@
+ }
+
+ m_active = true;
+- m_movie->unpause();
+- m_movie->restart();
+-}
+-
+-void KNewButton::rewindMovie()
+-{
+- m_oldPos = TQPoint( -1, -1 );
+- m_movie->unpause();
+ }
+
+ void KNewButton::dragEnterEvent(TQDragEnterEvent* /*e*/)
+@@ -369,31 +190,11 @@
+ }
+ }
+
+-void KNewButton::slotStopAnimation()
+-{
+- m_active = false;
+- m_movie->pause();
+- m_movie->restart();
+- TQTimer::singleShot(200, this, TQT_SLOT(rewindMovie()));
+-}
+-
+-const TQPixmap& KNewButton::labelIcon() const
+-{
+- return m_active_pixmap;
+-}
+-
+ void KNewButton::slotExecMenu()
+ {
+- if (m_openTimer != -1)
+- killTimer(m_openTimer);
+-
+- m_openTimer = startTimer(TQApplication::doubleClickInterval() * 3);
+-
+ if (m_active)
+ {
+ m_active = false;
+- m_movie->pause();
+- m_movie->restart();
+ }
+
+ KButton::slotExecMenu();
+@@ -401,40 +202,11 @@
+ assert(!KickerTip::tippingEnabled());
+ assert(dynamic_cast<KMenu*>(m_popup));
+
+- disconnect(dynamic_cast<KMenu*>(m_popup), TQT_SIGNAL(aboutToHide()), this,
+- TQT_SLOT(slotStopAnimation()));
+- connect(dynamic_cast<KMenu*>(m_popup), TQT_SIGNAL(aboutToHide()),
+- TQT_SLOT(slotStopAnimation()));
+-
+ m_popup->move(KickerLib::popupPosition(popupDirection(), m_popup, this));
+ // I wish KMenu would properly done itself when it closes. But it doesn't.
+
+- bool useEffect = true; // could be TQApplication::isEffectEnabled()
+- useEffect = false; // too many TQt bugs to be useful
+- if (m_drag)
+- useEffect = false;
+-
+ m_drag = false; // once is enough
+-
+- if (useEffect)
+- {
+- switch (popupDirection()) {
+- case KPanelApplet::Left:
+- qScrollEffect(m_popup, QEffects::LeftScroll);
+- break;
+- case KPanelApplet::Up:
+- qScrollEffect(m_popup, QEffects::UpScroll);
+- break;
+- case KPanelApplet::Right:
+- qScrollEffect(m_popup, QEffects::RightScroll);
+- break;
+- case KPanelApplet::Down:
+- qScrollEffect(m_popup, QEffects::DownScroll);
+- break;
+- }
+- }
+- else
+- static_cast<KMenu*>(m_popup)->show();
++ static_cast<KMenu*>(m_popup)->show();
+ }
+
+ void KNewButton::timerEvent(TQTimerEvent* e)
+@@ -447,9 +219,4 @@
+ killTimer(m_hoverTimer);
+ m_hoverTimer = -1;
+ }
+- if (e->timerId() == m_openTimer)
+- {
+- killTimer(m_openTimer);
+- m_openTimer = -1;
+- }
+ }
+--- kdebase/kicker/kicker/buttons/knewbutton.h.ORI 2011-12-08 21:22:24.273573281 +0100
++++ kdebase/kicker/kicker/buttons/knewbutton.h 2011-12-08 21:24:16.791338762 +0100
+@@ -28,7 +28,6 @@
+
+ #include "kbutton.h"
+
+-#include <tqmovie.h>
+ #include <tqpoint.h>
+
+ /**
+@@ -46,23 +45,8 @@
+
+ void loadConfig( const KConfigGroup& config );
+
+- virtual const TQPixmap& labelIcon() const;
+-
+- virtual int widthForHeight(int height) const;
+- virtual int preferredDimension(int panelDim) const;
+- virtual int heightForWidth(int width) const;
+-
+ TQColor borderColor() const;
+
+- virtual void setPopupDirection(KPanelApplet::Direction d);
+-
+-private slots:
+- void slotStatus(int);
+- void slotSetSize(const TQSize&);
+- void slotStopAnimation();
+- void rewindMovie();
+- void updateMovie();
+-
+ protected:
+ virtual void show();
+ virtual void slotExecMenu();
+@@ -78,16 +62,13 @@
+ void timerEvent(TQTimerEvent*);
+
+ private:
+- void drawEye();
+- double buttonScaleFactor(const TQSize& s) const;
+-
+- TQMovie* m_movie;
++ void drawButton(TQPainter *p);
+ TQPixmap m_active_pixmap;
+ TQPoint m_oldPos;
+ TQSize m_iconSize;
+ TQRect m_sloppyRegion;
+- int m_hoverTimer;
+ int m_openTimer;
++ int m_hoverTimer;
+ bool m_active;
+ bool m_mouseInside;
+ bool m_drag;
+--- kdebase/kicker/kicker/ui/k_new_mnu.cpp.ORI 2011-12-08 21:24:57.071572016 +0100
++++ kdebase/kicker/kicker/ui/k_new_mnu.cpp 2011-12-08 21:25:54.300324465 +0100
+@@ -1700,8 +1700,6 @@
+ TQPixmap pix( 64, footer->height() );
+ TQPainter p( &pix );
+ p.fillRect( 0, 0, 64, footer->height(), m_branding->colorGroup().brush( TQColorGroup::Base ) );
+- p.fillRect( 0, m_orientation == BottomUp ? footer->height() - 2 : 0,
+- 64, 3, KNewButton::self()->borderColor() );
+ p.end();
+ footer->setPaletteBackgroundPixmap( pix );
+ }
+@@ -3501,6 +3499,8 @@
+ m_systemView->insertItem( iconName, userLabel.isEmpty() ? label : userLabel,
+ descr, "system:/media/" + name, nId++, -1 );
+
++ ++it;
++ ++it;
+ ++it; // skip separator
+ }
+ }
diff --git a/redhat/kdebase/kdebase-3.5.12-kio_man_utf8.patch b/redhat/kdebase/kdebase-3.5.12-kio_man_utf8.patch
new file mode 100644
index 000000000..a85f0286d
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.12-kio_man_utf8.patch
@@ -0,0 +1,40 @@
+--- kdebase/kioslave/man/kio_man.cpp.orig 2010-08-13 00:37:38.000000000 +0200
++++ kdebase/kioslave/man/kio_man.cpp 2011-12-08 21:10:25.720324499 +0100
+@@ -569,20 +569,24 @@
+ }
+ lastdir = filename.left(filename.findRev('/'));
+
+- myStdStream = TQString::null;
+- KProcess proc;
+- /* TODO: detect availability of 'man --recode' so that this can go
+- * upstream */
+- proc << "man" << "--recode" << "UTF-8" << filename;
+-
+- TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (KProcess *, char *, int)),
+- this, TQT_SLOT(slotGetStdOutputUtf8(KProcess *, char *, int)));
+- proc.start(KProcess::Block, KProcess::All);
+-
+- const TQCString cstr=myStdStream.utf8();
+- const int len = cstr.size()-1;
++ QIODevice *fd= KFilterDev::deviceForFile(filename);
++
++ if ( !fd || !fd->open(IO_ReadOnly))
++ {
++ delete fd;
++ return 0;
++ }
++ QByteArray array(fd->readAll());
++ kdDebug(7107) << "read " << array.size() << endl;
++ fd->close();
++ delete fd;
++
++ if (array.isEmpty())
++ return 0;
++
++ const int len = array.size();
+ buf = new char[len + 4];
+- qmemmove(buf + 1, cstr.data(), len);
++ qmemmove(buf + 1, array.data(), len);
+ buf[0]=buf[len]='\n'; // Start and end with a end of line
+ buf[len+1]=buf[len+2]='\0'; // Two NUL characters at end
+ }
diff --git a/redhat/kdebase/kdebase-3.5.12-konq_menu_tab_background.patch b/redhat/kdebase/kdebase-3.5.12-konq_menu_tab_background.patch
new file mode 100644
index 000000000..5971553d1
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.12-konq_menu_tab_background.patch
@@ -0,0 +1,136 @@
+diff -Nuar kcontrol.ORI/konqhtml/advancedTabDialog.cpp kcontrol/konqhtml/advancedTabDialog.cpp
+--- kcontrol.ORI/konqhtml/advancedTabDialog.cpp 2011-12-09 23:45:04.676253975 +0100
++++ kcontrol/konqhtml/advancedTabDialog.cpp 2011-12-09 23:46:28.239256986 +0100
+@@ -58,7 +58,6 @@
+ layout->addSpacing( 20 );
+ layout->addStretch();
+
+- connect(m_advancedWidget->m_pNewTabsInBackground, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect(m_advancedWidget->m_pOpenAfterCurrentPage, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect(m_advancedWidget->m_pTabConfirm, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect(m_advancedWidget->m_pTabCloseActivatePrevious, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+@@ -76,7 +75,6 @@
+ void advancedTabDialog::load()
+ {
+ m_pConfig->setGroup("FMSettings");
+- m_advancedWidget->m_pNewTabsInBackground->setChecked( ! (m_pConfig->readBoolEntry( "NewTabsInFront", false )) );
+ m_advancedWidget->m_pOpenAfterCurrentPage->setChecked( m_pConfig->readBoolEntry( "OpenAfterCurrentPage", false ) );
+ m_advancedWidget->m_pPermanentCloseButton->setChecked( m_pConfig->readBoolEntry( "PermanentCloseButton", false ) );
+ m_advancedWidget->m_pKonquerorTabforExternalURL->setChecked( m_pConfig->readBoolEntry( "KonquerorTabforExternalURL", false ) );
+@@ -92,7 +90,6 @@
+ void advancedTabDialog::save()
+ {
+ m_pConfig->setGroup("FMSettings");
+- m_pConfig->writeEntry( "NewTabsInFront", !(m_advancedWidget->m_pNewTabsInBackground->isChecked()) );
+ m_pConfig->writeEntry( "OpenAfterCurrentPage", m_advancedWidget->m_pOpenAfterCurrentPage->isChecked() );
+ m_pConfig->writeEntry( "PermanentCloseButton", m_advancedWidget->m_pPermanentCloseButton->isChecked() );
+ m_pConfig->writeEntry( "KonquerorTabforExternalURL", m_advancedWidget->m_pKonquerorTabforExternalURL->isChecked() );
+diff -Nuar kcontrol.ORI/konqhtml/advancedTabOptions.ui kcontrol/konqhtml/advancedTabOptions.ui
+--- kcontrol.ORI/konqhtml/advancedTabOptions.ui 2011-12-09 23:45:04.674267416 +0100
++++ kcontrol/konqhtml/advancedTabOptions.ui 2011-12-09 23:56:01.440255647 +0100
+@@ -62,6 +62,17 @@
+ </widget>
+ <widget class="QCheckBox">
+ <property name="name">
++ <cstring>m_pNewTabsInBackground</cstring>
++ </property>
++ <property name="text">
++ <string>O&amp;pen new tabs in the background</string>
++ </property>
++ <property name="whatsThis" stdset="0">
++ <string>This will open a new tab in the background, instead of in the foreground.</string>
++ </property>
++ </widget>
++ <widget class="QCheckBox">
++ <property name="name">
+ <cstring>m_pOpenAfterCurrentPage</cstring>
+ </property>
+ <property name="text">
+diff -Nuar konqueror.ORI/konq_guiclients.cc konqueror/konq_guiclients.cc
+--- konqueror.ORI/konq_guiclients.cc 2011-12-09 23:44:28.950255993 +0100
++++ konqueror/konq_guiclients.cc 2011-12-09 23:49:31.432261289 +0100
+@@ -115,6 +115,11 @@
+ openInTabElement.setAttribute( "group", "tabhandling" );
+ menu.appendChild( openInTabElement );
+
++ TQDomElement openInTabFrontElement = m_doc.createElement( "action" );
++ openInTabFrontElement.setAttribute( "name", "openintabfront" );
++ openInTabFrontElement.setAttribute( "group", "tabhandling" );
++ menu.appendChild( openInTabFrontElement );
++
+ TQDomElement separatorElement = m_doc.createElement( "separator" );
+ separatorElement.setAttribute( "group", "tabhandling" );
+ menu.appendChild( separatorElement );
+diff -Nuar konqueror.ORI/konq_mainwindow.cc konqueror/konq_mainwindow.cc
+--- konqueror.ORI/konq_mainwindow.cc 2011-12-09 23:44:29.030265039 +0100
++++ konqueror/konq_mainwindow.cc 2011-12-09 23:54:27.518255409 +0100
+@@ -2727,6 +2727,14 @@
+ openURL( 0L, popupItems.getFirst()->url() );
+ }
+
++void KonqMainWindow::slotPopupNewTabAtFront()
++{
++ KConfig *config = KGlobal::config();
++ KConfigGroupSaver cs( config, TQString::fromLatin1("FMSettings") );
++ bool openAfterCurrentPage = config->readBoolEntry( "OpenAfterCurrentPage", false );
++ popupNewTab(true, openAfterCurrentPage);
++}
++
+ void KonqMainWindow::slotPopupNewTab()
+ {
+ bool openAfterCurrentPage = KonqSettings::openAfterCurrentPage();
+@@ -2735,7 +2743,7 @@
+ if (KApplication::keyboardMouseState() & Qt::ShiftButton)
+ newTabsInFront = !newTabsInFront;
+
+- popupNewTab(newTabsInFront, openAfterCurrentPage);
++ popupNewTab(false, openAfterCurrentPage);
+ }
+
+ void KonqMainWindow::slotPopupNewTabRight()
+@@ -2755,16 +2763,12 @@
+ KFileItemListIterator it ( popupItems );
+ KonqOpenURLRequest req;
+ req.newTab = true;
+- req.newTabInFront = false;
++ req.newTabInFront = infront;
+ req.openAfterCurrentPage = openAfterCurrentPage;
+ req.args = popupUrlArgs;
+
+ for ( ; it.current(); ++it )
+ {
+- if ( infront && it.atLast() )
+- {
+- req.newTabInFront = true;
+- }
+ openURL( 0L, (*it)->url(), TQString::null, req );
+ }
+ }
+@@ -4783,8 +4787,14 @@
+ else
+ tab_new_x = "tab_new_bg" ;
+
+- actNewTab = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, this, TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
+- actNewTab->setToolTip( i18n( "Open the document in a new tab" ) );
++ KAction *actNewTab = new KAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, this, TQT_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" );
++ actNewTab->setStatusText( i18n( "Open the document in a new background tab" ) );
++ KAction *actNewTabFront = new KAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQT_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" );
++ actNewTabFront->setStatusText( i18n( "Open the document in a new foreground tab" ) );
++ actNewTab = new KAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, this, TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
++ actNewTabFront = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, this, TQT_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" );
++ actNewTab->setToolTip( i18n( "Open the document in a new background tab" ) );
++ actNewTabFront->setToolTip( i18n( "Open the document in a new foreground tab" ) );
+ doTabHandling = true;
+ }
+
+diff -Nuar konqueror.ORI/konq_mainwindow.h konqueror/konq_mainwindow.h
+--- konqueror.ORI/konq_mainwindow.h 2011-12-09 23:44:28.941260682 +0100
++++ konqueror/konq_mainwindow.h 2011-12-09 23:54:57.772255487 +0100
+@@ -444,6 +444,7 @@
+ void slotPopupNewWindow();
+ void slotPopupThisWindow();
+ void slotPopupNewTab();
++ void slotPopupNewTabAtFront();
+ void slotPopupNewTabRight();
+ void slotPopupPasteTo();
+ void slotRemoveView();
diff --git a/redhat/kdebase/kdebase-3.5.13-kickoff_unstable.patch b/redhat/kdebase/kdebase-3.5.13-kickoff_unstable.patch
index 0116d080e..00a0d4b64 100644
--- a/redhat/kdebase/kdebase-3.5.13-kickoff_unstable.patch
+++ b/redhat/kdebase/kdebase-3.5.13-kickoff_unstable.patch
@@ -33,7 +33,7 @@ diff -ur kdebase/kicker/kicker/buttons/knewbutton.cpp kdebase1/kicker/kicker/but
TQApplication::desktop()->screen()->installEventFilter(this);
- setMouseTracking(true);
+
-+ if (KickerSettings::showKMenuText())
++ if (KickerSettings::showKMenuText())
+ {
+ setButtonText(KickerSettings::kMenuText());
+ setFont(KickerSettings::buttonFont());
diff --git a/redhat/kdebase/trinity-kdebase-3.5.12.spec b/redhat/kdebase/trinity-kdebase-3.5.12.spec
index 1e0b0e18b..94332e782 100644
--- a/redhat/kdebase/trinity-kdebase-3.5.12.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.12.spec
@@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.12
%endif
-%define release 12
+%define release 13
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -66,44 +66,67 @@ Patch9: kdebase-3.5.12-r1220927.patch
# TDE for RHEL/Fedora specific patches
## [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box
Patch3: kdebase-3.5.12-kdesu-noignorebutton.patch
-## [kdebase/kdesktop] Modifies "open terminal here" on desktop
+## [kdebase/kdesktop] Modifies 'open terminal here' on desktop
Patch5: kdebase-3.5.12-desktop-openterminalhere.patch
## [kdebase/kioslave] Forces HAL backend to use HAL mount options
Patch6: kdebase-3.5.12-halmountoptions.patch
## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession'
Patch7: kdebase-3.5.13-genkdmconf_Xsession_location.patch
+## [kdebase/kicker/kicker/ui] Fix kickoff menu issues
+Patch10: kdebase-3.5.12-kickoff_unstable.patch
## [kdebase/startkde] Sets default Start Icon in 'kickerrc'
Patch11: kdebase-3.5.13-startkde_icon.patch
-# TDE 3.5.12 patches
-# Fix for DBUS include files in RHEL6
+# TDE 3.5.12 unofficial patches
+## Fix for DBUS include files in RHEL6
Patch0: kdebase-3.5.12-shutdowndlg-dbus-include.patch
-# [kdebase/kcontrol]: disable components that depends of krandr (old distros)
-Patch100: kdebase-3.5.12-disable-krandr.patch
-
+## [kdebase/kate] Restores the 'number of files' and sorting widgets to the Kate configuration
+Patch13: kdebase-3.5.13-kate_mru.patch
+## [kdebase/kioslave/man] Fix kio_man for older distros without 'man-db'
+Patch14: kdebase-3.5.12-kio_man_utf8.patch
+## [kdebase/kcontrol]: disable components that depends of krandr (old distros)
+Patch15: kdebase-3.5.12-disable-krandr.patch
+## [kdebase/konqueror] Re-enable 'open tab in background'
+Patch16: kdebase-3.5.12-konq_menu_tab_background.patch
# Fedora 15 Theme: "Lovelock"
%if 0%{?fedora} == 15
Requires: lovelock-backgrounds-single
%define tde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png
+
+Requires: fedora-release-notes
+%define tde_aboutlabel Fedora 15
+%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
%endif
# Fedora 16 Theme: "Verne"
%if 0%{?fedora} == 16
Requires: verne-backgrounds-single
%define tde_bg /usr/share/backgrounds/verne/default/standard/verne.png
+
+Requires: fedora-release-notes
+%define tde_aboutlabel Fedora 16
+%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
%endif
# RHEL 5 Theme
%if 0%{?rhel} == 5
Requires: desktop-backgrounds-basic
%define tde_bg /usr/share/backgrounds/images/default.jpg
+
+Requires: indexhtml
+%define tde_aboutlabel Enterprise Linux 5
+%define tde_aboutpage /usr/share/doc/HTML/index.html
%endif
# RHEL 6 Theme
%if 0%{?rhel} == 6
Requires: redhat-logos
%define tde_bg /usr/share/backgrounds/default.png
+
+Requires: redhat-indexhtml
+%define tde_aboutlabel Enterprise Linux 6
+%define tde_aboutpage /usr/share/doc/HTML/index.html
%endif
BuildRequires: tqtinterface-devel
@@ -159,7 +182,7 @@ Requires: kde-settings-kdm
%endif
Requires: redhat-menus
-Provides: kdebase%{?_qt_suffix} = %{version}
+#Provides: kdebase%{?_qt_suffix} = %{version}
%if "%{?_prefix}" == "/usr"
Obsoletes: kdebase%{?_qt_suffix} <= 3.5.10
%endif
@@ -185,7 +208,7 @@ Requires: %{name}
Requires: %{name}-libs = %{version}-%{release}
Requires: trinity-kdelibs-devel
Summary: %{summary} - Development files
-Provides: kdebase%{?_qt_suffix}-devel = %{version}
+#Provides: kdebase%{?_qt_suffix}-devel = %{version}
%if "%{?_prefix}" == "/usr"
Obsoletes: kdebase%{?_qt_suffix}-devel <= 3.5.10
%endif
@@ -201,7 +224,7 @@ Kate plugins or KWin styles.
Summary: Extra applications from %{name}
Group: User Interface/Desktops
Requires: %{name} = %{version}-%{release}
-Provides: kdebase%{?_qt_suffix}-extras = %{version}
+#Provides: kdebase%{?_qt_suffix}-extras = %{version}
%if "%{?_prefix}" == "/usr"
Obsoletes: kdebase%{?_qt_suffix}-extras <= 3.5.10
%endif
@@ -217,7 +240,7 @@ Obsoletes: kdebase%{?_qt_suffix}-extras <= 3.5.10
Summary: %{name} runtime libraries
Group: System Environment/Libraries
Requires: trinity-kdelibs
-Provides: kdebase%{?_qt_suffix}-libs = %{version}
+#Provides: kdebase%{?_qt_suffix}-libs = %{version}
%if "%{?_prefix}" == "/usr"
Obsoletes: kdebase%{?_qt_suffix}-libs <= 3.5.10
%endif
@@ -253,11 +276,17 @@ Protocol handlers (KIOslaves) for personal information management, including:
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
%patch11 -p1
%patch12 -p1
+%patch13 -p4
+%if 0%{?rhel} > 0
+%patch14 -p1
+%endif
%if 0%{?rhel} && 0%{?rhel} < 6
-%patch100 -p1
+%patch15 -p1
%endif
+%patch16 -p0
# Applies an optional distro-specific graphical theme
%if "%{?tde_bg}" != ""
@@ -268,7 +297,6 @@ Protocol handlers (KIOslaves) for personal information management, including:
# TDE user default background
%__sed -i "kpersonalizer/keyecandypage.cpp" \
-e 's,#define DEFAULT_WALLPAPER "isadora.png",#define DEFAULT_WALLPAPER "%{tde_bg}",'
-
%__sed -i "startkde" \
-e 's,/usr/share/wallpapers/isadora.png.desktop,%{tde_bg},' \
-e 's,Wallpaper=isadora.png,Wallpaper=%{tde_bg},'
@@ -278,6 +306,17 @@ Protocol handlers (KIOslaves) for personal information management, including:
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
+# TDE branding: removes KUbuntu references
+%__sed -i "kcontrol/kdm/kdm-appear.cpp" \
+ -e "s|Welcome to Kubuntu |Welcome to %{tde_aboutlabel} |"
+%__sed -i "konqueror/about/konq_aboutpage.cc" \
+ -e "s|About Kubuntu|About %{tde_aboutlabel}|" \
+ -e "s|help:/kubuntu/|%{tde_aboutpage}|" \
+ -e "s|Kubuntu Documentation|%{tde_aboutlabel} Documentation|"
+%__sed -i "konqueror/about/launch.html" \
+ -e "s|help:/kubuntu/about-kubuntu/index.html|%{tde_aboutpage}|"
+%__sed -i "kdm/config.def" \
+ -e "s|Welcome to Trinity |Welcome to %{tde_aboutlabel} |"
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -321,7 +360,7 @@ export IMAKEINCLUDE="-I/usr/share/X11/config"
# Modifies 'startkde' to set KDEDIR and KDEHOME hardcoded specific for TDE
%__sed -i "%{?buildroot}%{_bindir}/startkde" \
- -e '/^echo "\[startkde\] Starting startkde.".*/ s,$,\nexport KDEDIR=%{_prefix}\nexport KDEHOME=~/.trinity,'
+ -e '/^echo "\[startkde\] Starting startkde.".*/ s,$,\nexport KDEDIR=%{_prefix}\nexport KDEHOME=~/.trinity,'
# Renames '/etc/ksysguarddrc' to avoid conflict with KDE4 'ksysguard'
%__mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysguarddrc.tde
@@ -442,7 +481,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
# Pam configuration
%{_sysconfdir}/pam.d/*
-%doc AUTHORS COPYING README
+%doc AUTHORS COPYING COPYING-DOCS README README.pam
%{tde_docdir}/HTML/en/*
%config(noreplace) %{_sysconfdir}/ksysguarddrc.tde
%{_bindir}/genkdmconf
@@ -620,6 +659,13 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%exclude %{_libdir}/libkdeinit_*.*
%changelog
+* Thu Dec 08 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-13
+- Backports patches from TDE 3.5.13-10
+- Removes Kubuntu branding [TDE Bug #449]
+- Fix 'kio_man' on RHEL 5 and RHEL 6 [TDE Bug #714]
+- Restores the 'number of files' and sorting widgets to the Kate configuration [TDE Bug #244]
+- Re-enables 'open tab in background' konqueror feature [TDE Bug #245]
+
* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-12
- Updates Kickoff menu Fix [TDE Bugs #281, #508]
- Add distribution-specific start button icon
diff --git a/redhat/kdelibs/kdelibs-3.5.12-fixx11h.patch b/redhat/kdelibs/kdelibs-3.5.12-fixx11h.patch
new file mode 100644
index 000000000..64fc9b841
--- /dev/null
+++ b/redhat/kdelibs/kdelibs-3.5.12-fixx11h.patch
@@ -0,0 +1,21 @@
+--- branches/trinity/kdelibs/kdecore/fixx11h.h 2011/01/03 05:50:03 1211108
++++ branches/trinity/kdelibs/kdecore/fixx11h.h 2011/01/12 22:19:14 1214091
+@@ -57,15 +57,18 @@
+
+ // template --->
+ // Affects: Should be without side effects.
++#ifndef _XTYPEDEF_BOOL
+ #ifdef Bool
+ #ifndef FIXX11H_Bool
+ #define FIXX11H_Bool
+ typedef Bool XBool;
+ #undef Bool
++#define _XTYPEDEF_BOOL
+ typedef XBool Bool;
+ #endif
+ #undef Bool
+ #endif
++#endif // _XTYPEDEF_BOOL
+ // template <---
+
+ // Affects: Should be without side effects.
diff --git a/redhat/kdelibs/kdelibs-3.5.12-kstandarddirs_trinity.patch b/redhat/kdelibs/kdelibs-3.5.12-kstandarddirs_trinity.patch
new file mode 100644
index 000000000..e19aa739f
--- /dev/null
+++ b/redhat/kdelibs/kdelibs-3.5.12-kstandarddirs_trinity.patch
@@ -0,0 +1,29 @@
+--- kdelibs/kdecore/kstandarddirs.cpp.ORI 2011-12-09 23:13:50.089238165 +0100
++++ kdelibs/kdecore/kstandarddirs.cpp 2011-12-09 23:16:23.133210143 +0100
+@@ -839,7 +839,7 @@
+ }
+ // UGLY HACK - Chris CHeney
+ if (local && (!strcmp("config", type)))
+- candidates->append("/etc/kde3/");
++ candidates->append("/etc/trinity/");
+ //
+ local = false;
+ }
+@@ -1030,7 +1030,7 @@
+ if (!strcmp(type, "html-bundle"))
+ return "share/doc-bundle/HTML/";
+ if (!strcmp(type, "html"))
+- return "share/doc/kde/HTML/";
++ return "share/doc/HTML/";
+ if (!strcmp(type, "icon"))
+ return "share/icons/";
+ if (!strcmp(type, "config"))
+@@ -1336,7 +1336,7 @@
+ }
+ else
+ {
+- localKdeDir = TQDir::homeDirPath() + "/.kde3/";
++ localKdeDir = TQDir::homeDirPath() + "/.trinity/";
+ }
+
+ if (localKdeDir != QString("-/"))
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
index 30cb449a1..aafc9b34c 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
@@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.12
%endif
-%define release 9
+%define release 10
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -37,7 +37,14 @@ Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: kdelibs-%{version}.tar.gz
+
+# TDE 3.5.12 patches for RHEL/Fedora build
+## [kdelibs/kio/kio] Removes the maximum line length detection
Patch0: kdelibs-3.5.13-maxlinelength.patch
+## [kdecore] sets TDE 3.5.12 defaults directories
+Patch1: kdelibs-3.5.12-kstandarddirs_trinity.patch
+## [kdelibs/kdecore] fixed a conflict between fixx11h.h and Xdefs.h
+Patch2: kdelibs-3.5.12-fixx11h.patch
BuildRequires: libtool
BuildRequires: tqtinterface-devel
@@ -66,7 +73,7 @@ Requires: qt%{?_qt_suffix}
Requires: avahi-qt3
-Provides: kdelibs%{?_qt_suffix} = %{version}
+#Provides: kdelibs%{?_qt_suffix} = %{version}
%if "%{?_prefix}" == "/usr"
Obsoletes: kdelibs%{?_qt_suffix} <= 3.5.10
%endif
@@ -109,6 +116,8 @@ format for easy browsing
%prep
%setup -q -n kdelibs
%patch0 -p1
+%patch1 -p1
+%patch2 -p3
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
@@ -123,7 +132,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
# On older RHEL, libXrandr is too old so krandr cannot be compiled.
# Kspell2 does not compile either.
-%if 0%{?rhel} && 0%{?rhel} < 6
+%if 0%{?rhel} && 0%{?rhel} <= 5
export DO_NOT_COMPILE="krandr"
%endif
@@ -159,13 +168,12 @@ export DO_NOT_COMPILE="krandr"
%__rm -rf %{?buildroot}
%__make install DESTDIR=%{?buildroot}
-%__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d
-cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf
%if "%{?_prefix}" != "/usr"
+%__mkdir_p "%{?buildroot}%{_sysconfdir}/ld.so.conf.d"
+cat <<EOF >"%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf"
%{_libdir}
-%endif
-%{tde_libdir}
EOF
+%endif
# Moves the XDG configuration files to TDE directory
%if "%{_prefix}" != "/usr"
@@ -189,8 +197,7 @@ EOF
%files
%defattr(-,root,root,-)
-%doc README
-%doc COPYING.LIB
+%doc AUTHORS COPYING* README TODO
%{_bindir}/artsmessage
%{_bindir}/cupsdconf
%{_bindir}/cupsdoprint
@@ -288,7 +295,10 @@ EOF
%exclude %{_datadir}/locale/all_languages
%exclude %{tde_docdir}/HTML/en/common/*
%endif
+# ld.so.conf needed only if installed under '/opt/trinity'
+%if "%{?_prefix}" != "/usr"
%{_sysconfdir}/ld.so.conf.d/trinity.conf
+%endif
# Avoid conflict with 'redhat-menus' package
%if "%{_prefix}" == "/usr"
@@ -315,11 +325,16 @@ EOF
%changelog
-* Sun Nov 29 2911 Francois Andriot <francois.andriot@free.fr> - 3.5.12-9
+* Fri Dec 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-10
+- Fix conflict with
+- Fix HTML directory location
+- Change defaults TDE directory to '/etc/trinity' and '~/.trinity'
+- Removes 'ld.so.conf.d' when installed under '/usr'
+
+* Sun Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-9
- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE
- Disable 'max line length' detection
- Add missing BuildRequires
-- Disable 'max line length' detection
* Fri Sep 16 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-8
- Add support for RHEL 5.
@@ -350,4 +365,3 @@ EOF
* Wed Dec 14 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
- Initial version
-
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
index faea11948..827a2523d 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
@@ -66,7 +66,7 @@ Requires: qt%{?_qt_suffix}
Requires: avahi-qt3
-Provides: kdelibs%{?_qt_suffix} = %{version}
+#Provides: kdelibs%{?_qt_suffix} = %{version}
%if "%{?_prefix}" == "/usr"
Obsoletes: kdelibs%{?_qt_suffix} <= 3.5.10
%endif
@@ -111,6 +111,7 @@ format for easy browsing
%patch0 -p1
+
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}"
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 16:58:24 +0000