rpms/kdebase-runtime/F-7 khelpcenter.desktop, NONE, 1.1 .cvsignore, 1.5, 1.6 kdebase-runtime.spec, 1.4, 1.5 sources, 1.5, 1.6

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-runtime/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21966/F-7

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Added Files:
	khelpcenter.desktop 
Log Message:
Sync from devel:

* Fri Mar 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-3
- BR libxcb-devel everywhere (including F7)

* Fri Mar 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-2
- if building for a KDE 4 desktop, include the khelpcenter.desktop service
  description for KDE 3 here so help works in KDE 3 apps

* Fri Feb 29 2008 Than Ngo <than at redhat.com> 4.0.2-1
- 4.0.2

* Mon Feb 25 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.1-3
- %%files: don't own %%_kde4_libdir/kde4/plugins (thanks wolfy!)

* Sat Feb 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.1-2
- reenable kio_smb everywhere (including F9) now that we have a GPLv3 qt4
  (kio_smb itself is already GPLv2+)


--- NEW FILE khelpcenter.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=KHelpCenter
Name[af]=Khulpsentrum
Name[be]=Цэнтр дапамогі KDE
Name[bg]=Помощен център
Name[cs]=Centrum nápovědy
Name[csb]=Centróm Pòmòcë
Name[cy]=KCanolfanCymorth
Name[da]=KHjælpecenter
Name[de]=KDE-Hilfezentrum
Name[en_GB]=KHelpCentre
Name[eo]=KHelpCentro
Name[es]=KHelpcenter
Name[et]=KDE abikeskus
Name[fr]=Centre d'aide de KDE
Name[gl]=Centro de Axuda de KDE
Name[hi]=के-हेल्प-सेंटर
Name[is]=Hjálparkerfi KDE
Name[ja]=K ヘルプセンター
Name[lo]=ສູນຊ່ວຍເຫລືອ - K
Name[lv]=KPalīdzībasCentrs
Name[mn]=КДЭ-Тусламжийн төв
Name[nds]=KDE-Hülpzentrum
Name[ne]=केडीई मद्दत केन्द्र
Name[nso]=KBogare bja Thuso
Name[pa]=ਕੇਸਹਾਇਤਾਕੇਂਦਰ
Name[pl]=Centrum Pomocy
Name[pt_BR]=Centro de Ajuda
Name[ro]=Centrul de ajutor KDE
Name[ru]=Центр справки
Name[rw]=K-UmwanyaGufasha
Name[sv]=Hjälpcentralen
Name[ta]=Kஉதவிமையம்
Name[te]=కెసహాయ కేంద్రం
Name[tg]=Маркази роҳнамо
Name[th]=ศูนย์ช่วยเหลือ K
Name[tr]=KDE Yardım Merkezi
Name[uz]=Ёрдам маркази
Name[ven]=Senthara ya thuso ya K
Name[vi]=Trung tâm Trợ giúp KDE
Name[wa]=KCinteDAidance
Name[zh_CN]=KHelpcenter
Comment=The KDE Help Center
Comment[af]=Die Kde Hulp Sentrum
Comment[ar]=مركز KDE للمساعدة
Comment[az]=KDE Yardım Mərkəzi
Comment[be]=Цэнтр дапамогі KDE
Comment[bg]=Център за помощна информация
Comment[bn]=কে.ডি.ই. সাহায্য কেন্দ্র
Comment[br]=Kreizenn sikour KDE
Comment[bs]=KDE centar za pomoć
Comment[ca]=El centre d'ajuda KDE
Comment[cs]=Centrum nápovědy prostředí KDE
Comment[csb]=Centróm Pòmòcë KDE
Comment[cy]=Canolfan Cymorth KDE
Comment[da]=KDE's hjælpecenter
Comment[de]=Das KDE-Hilfezentrum
Comment[el]=Το κέντρο βοήθειας του KDE
Comment[en_GB]=The KDE Help Centre
Comment[eo]=La KDE-helpocentro
Comment[es]=El centro de ayuda de KDE
Comment[et]=KDE abikeskus
Comment[eu]=KDE laguntza gunea
Comment[fa]=مرکز کمک KDE
Comment[fi]=KDE:n Ohje
Comment[fr]=Le centre de documentation de KDE
Comment[fy]=It KDE-dokumintaasjesintrum
Comment[ga]=Lárionad Cabhrach KDE
Comment[gl]=O Centro de Axuda de KDE
Comment[he]=מרכז העזרה של KDE
Comment[hi]=केडीई मदद केंद्र
Comment[hr]=KDE pomoć
Comment[hu]=KDE Segítség
Comment[id]=Pusat Bantuan KDE
Comment[is]=Hjálparkerfi KDE
Comment[it]=La guida di KDE
Comment[ja]=KDE ヘルプセンター
Comment[kk]=KDE анықтама орталығы
Comment[km]=មជ្ឈមណ្ឌលជំនួយ​របស់ KDE
Comment[ko]=KDE 도움말 센터
Comment[lo]=ສູນຊ່ວຍເຫລືອຂອງ KDE
Comment[lt]=KDE pagalbos centras
Comment[lv]=KDE Palīdzības Centrs
Comment[mk]=KDE Центарот за Помош
Comment[mn]=КДЭ-Тусламжийн төв
Comment[ms]=Pusat Bantuan KDE
Comment[mt]=Ċentru tal-Għajnuna KDE
Comment[nb]=KDE Hjelpesenter
Comment[nds]=Dat KDE-Hülpzentrum
Comment[ne]=केडीई मद्दत केन्द्र
Comment[nl]=Het KDE-documentatiecentrum
Comment[nn]=KDE Hjelpesenter
Comment[nso]=Bogare bja Thuso ya KDE
Comment[oc]=Lo centre d'ajuda KDE
Comment[pa]=ਕੇਡੀਈ ਸਹਾਇਤਾ ਕੇਂਦਰ
Comment[pl]=Centrum Pomocy KDE
Comment[pt]=O Centro de Ajuda do KDE
Comment[pt_BR]=Centro de Ajuda do KDE
Comment[ro]=Centrul de ajutor al KDE
Comment[ru]=Центр справки KDE
Comment[rw]=KDE Ifashayobora Hagati
Comment[se]=KDE veahkkeguovddáš
Comment[sk]=KDE Centrum pomocník
Comment[sl]=Središče pomoči za KDE
Comment[sr]=KDE центар за помоћ
Comment[sr at Latn]=KDE centar za pomoć
Comment[sv]=KDE:s hjälpcentral
Comment[ta]=KDE உதவி மையம்
Comment[te]=కెడిఈ సహాయ కేంద్రం
Comment[tg]=Маркази роҳнамои KDE
Comment[th]=ศูนย์ช่วยเหลือของ KDE
Comment[tr]=KDE Yardım Merkezi
Comment[tt]=KDE Yärdäm Üzäge
Comment[uk]=Центр довідок KDE
Comment[uz]=KDE ёрдам маркази
Comment[ven]=Senthara ya thuso ya KDE
Comment[vi]=Trung tâm Trợ giúp KDE
Comment[wa]=Li Cinte d' aidance KDE
Comment[xh]=Umbindi woncedo lwe KDE
Comment[zh_CN]=KDE 帮助中心
Comment[zh_TW]=KDE 求助中心
Comment[zu]=Indawo Yosizi ye-KDE
Icon=khelpcenter
DocPath=khelpcenter/index.html
Type=Service
Terminal=false
Exec=khelpcenter %u
SwallowExec=
SwallowTitle=
X-KDE-StartupNotify=true


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Feb 2008 15:23:24 -0000	1.5
+++ .cvsignore	9 Mar 2008 01:43:12 -0000	1.6
@@ -1,2 +1,3 @@
 kdebase-runtime-4.0.0.tar.bz2
 kdebase-runtime-4.0.1.tar.bz2
+kdebase-runtime-4.0.2.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-7/kdebase-runtime.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kdebase-runtime.spec	7 Feb 2008 15:23:25 -0000	1.4
+++ kdebase-runtime.spec	9 Mar 2008 01:43:12 -0000	1.5
@@ -2,18 +2,21 @@
 %if 0%{?fedora} < 9
 # # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
 %define kde3_desktop 1
-%define _with_samba --with-samba
 %endif
 
+%define _with_samba --with-samba
+
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
-Version:       4.0.1
-Release:       1%{?dist}
+Version:       4.0.2
+Release:       3%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
 Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
+# KDE 3 version of this service description
+Source1:       khelpcenter.desktop
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: kdebase4-runtime < %{version}-%{release}
@@ -49,9 +52,7 @@
 BuildRequires: strigi-devel >= 0.5.7
 BuildRequires: xine-lib-devel
 # needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
-%if 0%{?fedora} > 7 
-BuildRequires:  libxcb-devel
-%endif
+BuildRequires: libxcb-devel
 # needed?
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
@@ -163,6 +164,11 @@
 # remove country flags because some people/countries forbid some other
 # people/countries' flags :-(
 rm -f %{buildroot}%{_kde4_datadir}/locale/l10n/*/flag.png
+# install this service for KDE 3 applications
+# NOTE: This is not a standard .desktop file, but an "almost standard" one
+#       installed into a KDE-3-specific directory, as usual for KDE 3 services,
+#       so we can't use desktop-file-install for it.
+install -p -D %{SOURCE1} %{buildroot}%{_datadir}/services/khelpcenter.desktop
 %endif
 
 
@@ -197,7 +203,9 @@
 %{_kde4_datadir}/sounds/*
 %{_kde4_docdir}/HTML/en/
 %{_kde4_libdir}/libkdeinit4_*.so
-%{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/kde4/*.so
+%{_kde4_libdir}/kde4/libexec/*
+%{_kde4_libdir}/kde4/plugins/styles/
 %{_libdir}/strigi/*
 %{_mandir}/man1/*
 
@@ -211,10 +219,28 @@
 %{_kde4_datadir}/locale/en_US/entry.desktop
 %{_kde4_datadir}/locale/l10n/*.desktop
 %{_kde4_datadir}/locale/l10n/*/entry.desktop
+%{_datadir}/services/khelpcenter.desktop
 %endif
 
 
 %changelog
+* Fri Mar 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-3
+- BR libxcb-devel everywhere (including F7)
+
+* Fri Mar 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-2
+- if building for a KDE 4 desktop, include the khelpcenter.desktop service
+  description for KDE 3 here so help works in KDE 3 apps
+
+* Fri Feb 29 2008 Than Ngo <than at redhat.com> 4.0.2-1
+- 4.0.2
+
+* Mon Feb 25 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.1-3
+- %%files: don't own %%_kde4_libdir/kde4/plugins (thanks wolfy!)
+
+* Sat Feb 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.1-2
+- reenable kio_smb everywhere (including F9) now that we have a GPLv3 qt4
+  (kio_smb itself is already GPLv2+)
+
 * Wed Jan 30 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.1-1
 - 4.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Feb 2008 15:23:25 -0000	1.5
+++ sources	9 Mar 2008 01:43:12 -0000	1.6
@@ -1 +1 @@
-f6dbc7f6580d971ce2748c2773999a6a  kdebase-runtime-4.0.1.tar.bz2
+28d979899554d731e20d4b88b44092ae  kdebase-runtime-4.0.2.tar.bz2