rpms/kdebase/F-10 .cvsignore, 1.84, 1.85 kdebase.spec, 1.370, 1.371 sources, 1.112, 1.113 kdebase-4.3.2-konsolemenus.patch, 1.1, NONE

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/kdebase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31039/F-10

Modified Files:
	.cvsignore kdebase.spec sources 
Removed Files:
	kdebase-4.3.2-konsolemenus.patch 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/.cvsignore,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- .cvsignore	1 Sep 2009 12:55:11 -0000	1.84
+++ .cvsignore	6 Oct 2009 12:49:18 -0000	1.85
@@ -1 +1 @@
-kdebase-4.3.1.tar.bz2
+kdebase-4.3.2.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/kdebase.spec,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -p -r1.370 -r1.371
--- kdebase.spec	2 Sep 2009 11:46:18 -0000	1.370
+++ kdebase.spec	6 Oct 2009 12:49:18 -0000	1.371
@@ -1,7 +1,7 @@
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.3.1
-Release: 2%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 Epoch: 6
 
 License: GPLv2
@@ -14,7 +14,6 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 Patch0:   kdebase-4.1.80-nsplugins-paths.patch
 Patch1:   kdebase-4.1.70-konsole-session.patch
 Patch2:   kdebase-4.2.1-home-icon.patch
-Patch3:   kdebase-4.3.2-konsolemenus.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -22,6 +21,7 @@ Requires: eject
 
 Provides:  dolphin = 1.0.2-1
 Provides:  kdebase4 = %{version}-%{release}
+%{?_isa:Provides: kdebase4%{?_isa} = %{version}-%{release}}
 Obsoletes: dolphin < 1.0.2-1
 Obsoletes: d3lphin
 Obsoletes: kdebase4 < %{version}-%{release}
@@ -58,8 +58,11 @@ BuildRequires: pkgconfig
 BuildRequires: qimageblitz-devel
 # samba support
 BuildRequires: libsmbclient-devel
-BuildRequires: soprano-devel >= 2.0.97
-BuildRequires: strigi-devel >= 0.5.7
+BuildRequires: soprano-devel 
+BuildRequires: strigi-devel 
+%if 0%{?fedora}
+BuildRequires: webkitpart-devel
+%endif
 # needed?
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
@@ -103,7 +106,6 @@ Requires: kdelibs4-devel kdepimlibs4-dev
 %patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
-%patch3 -p0 -b .konsolemenus
 
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
@@ -142,6 +144,18 @@ popd
 # konquerorsu only show in KDE
 echo 'OnlyShowIn=KDE;' >> %{buildroot}%{_kde4_datadir}/applications/kde4/konquerorsu.desktop
 
+# create/own some dirs 
+mkdir -p %{buildroot}%{_kde4_appsdir}/konqueror/{kpartplugins,icons,opensearch}
+
+HTML_DIR=$(kde4-config --expandvars --install html)
+if [ -d %{buildroot}${HTML_DIR} ]; then
+for lang_dir in %{buildroot}${HTML_DIR}/* ; do
+  if [ -d ${lang_dir} ]; then
+    lang=$(basename ${lang_dir})
+    echo "%lang(${lang}) ${HTML_DIR}/${lang}/*/" >> %{name}.lang
+  fi
+done
+fi
 
 
 %clean
@@ -172,7 +186,7 @@ fi
 %postun libs -p /sbin/ldconfig
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_kde4_bindir}/*
 %{_kde4_datadir}/applications/kde4/*.desktop
@@ -186,7 +200,6 @@ fi
 %{_kde4_datadir}/kde4/services/kded/*.desktop
 %{_kde4_datadir}/kde4/services/useragentstrings/
 %{_kde4_datadir}/kde4/servicetypes/*.desktop
-%{_kde4_docdir}/HTML/en/*
 %{_kde4_libdir}/kde4/*.so
 %exclude %{_kde4_libdir}/kde4/devel/
 %{_mandir}/man1/*
@@ -215,6 +228,18 @@ fi
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
+* Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-4
+- BR: webkitpart-devel
+- fix Provides: kdebase4%%{?_isa} (not kdelibs)
+
+* Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
+- own %%_kde4_appsdir/konqueror/{kpartplugins,icons,opensearch}
+- %%lang'ify HTML docs
+- Provides: kdelibs4%%{?_isa} 
+
 * Wed Sep  2 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.1-2
 - fix context menus in Konsole (kdebug:186745)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/sources,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- sources	1 Sep 2009 12:55:11 -0000	1.112
+++ sources	6 Oct 2009 12:49:19 -0000	1.113
@@ -1 +1 @@
-10dae53739f1e8bd6f5f615443649e4f  kdebase-4.3.1.tar.bz2
+7d6b968d8d8dd3730522389dabbb23e2  kdebase-4.3.2.tar.bz2


--- kdebase-4.3.2-konsolemenus.patch DELETED ---