rpms/kdebase/F-10 .cvsignore, 1.80, 1.81 kdebase.spec, 1.350, 1.351 sources, 1.105, 1.106

Sat Jan 24 17:23:01 UTC 2009

Author: rdieter

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

Modified Files:
	.cvsignore kdebase.spec sources 
Log Message:
* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
- 4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-10/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81

--- .cvsignore	8 Jan 2009 17:24:52 -0000	1.80
+++ .cvsignore	24 Jan 2009 17:22:30 -0000	1.81
@@ -1 +1,5 @@
-kdebase-4.1.4.tar.bz2
+kdebase-4.1.2.tar.bz2
+kdebase-4.1.80.tar.bz2
+kdebase-4.1.85.tar.bz2
+kdebase-4.1.96.tar.bz2
+kdebase-4.2.0.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-10/kdebase.spec,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -r1.350 -r1.351
--- kdebase.spec	13 Jan 2009 11:54:23 -0000	1.350
+++ kdebase.spec	24 Jan 2009 17:22:31 -0000	1.351
@@ -1,7 +1,6 @@
-
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.1.4
-Release: 2%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -26,20 +25,12 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # fedora specific nsplugins paths
-Patch1:   kdebase-nsplugins-paths.patch
-Patch2:   kdebase-4.1.2-konsole-session.patch
-Patch3:   kdebase-4.1.2-konsole-session-1.patch
+Patch0:   kdebase-4.1.80-nsplugins-paths.patch
+# Konsole patches
+Patch1:   kdebase-4.1.70-konsole-session.patch
 
 ## upstream patches
-# http://bugs.kde.org/show_bug.cgi?id=156636 (backported from 4.2)
-# Add keyboard actions for switching to the 1st-10th tab in Konsole
-# PLEASE DON'T DROP THIS BEFORE 4.2!
-Patch100: kdebase-4.1.2-konsole-kde#156636.patch
-
-BuildRequires: kde-filesystem >= 4
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
+
 %ifnarch s390 s390x
 Requires: eject
 %endif
@@ -61,17 +52,18 @@
 # FIXME: remove BRs which are only needed for stuff now in -runtime
 BuildRequires: alsa-lib-devel
 BuildRequires: bzip2-devel
-BuildRequires: cmake
+BuildRequires: cmake >= 2.6.2
 BuildRequires: cyrus-sasl-devel
 BuildRequires: doxygen
 BuildRequires: fontconfig-devel
 BuildRequires: gettext
 BuildRequires: giflib-devel
 BuildRequires: hal-devel
+BuildRequires: pcre-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 %if "%{name}" == "kdebase"
-BuildRequires: kdebase-workspace-devel >= %{version}
+BuildRequires: plasma-devel >= %{version}
 %endif
 %ifnarch s390 s390x
 BuildRequires: libraw1394-devel
@@ -108,7 +100,7 @@
 
 %if 0%{?libs}
 %package libs
-Summary: Runtime libraries for %{name} 
+Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: kdelibs4 >= %{version}, kdepimlibs >= %{version}
 %description libs
@@ -117,7 +109,7 @@
 
 %package devel
 Group:    Development/Libraries
-Summary:  Development files for %{name} 
+Summary:  Development files for %{name}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 %if "%{name}" != "kdebase4"
 Obsoletes: kdebase4-devel < %{version}-%{release}
@@ -130,16 +122,14 @@
 
 %prep
 %setup -q -n kdebase-%{version}
-%patch1 -p0 -b .nsplugins-paths
-%patch2 -p1 -b .konsole-session
-%patch3 -p1 -b .konsole-session-1
-%patch100 -p0 -b .kde#156636
+%patch0 -p1 -b .nsplugins-paths
+%patch1 -p1 -b .konsole-session
 
 # 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
 
 %build
-mkdir -p %{_target_platform} 
+mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
@@ -149,7 +139,7 @@
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %if "%{name}" != "kdebase"
 # remove files which conflict with KDE 3
@@ -291,7 +281,7 @@
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_libdir}/kde4/*
 %exclude %{_kde4_libdir}/kde4/devel/
-
+%{_mandir}/man1/*
 %if "%{name}" == "kdebase"
 %{_kde4_datadir}/autostart/*
 %{_kde4_configdir}/*
@@ -314,11 +304,31 @@
 
 
 %changelog
-* Tue Jan 13 2009 Than Ngo <than at redhat.com> - 4.1.4-2
-- respin
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Thu Dec 11 2008 Than Ngo <than at redhat.com> -  4.1.85-1
+- 4.2beta2
 
-* Thu Jan  8 2009 LukÃ¡Å¡ Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Thu Nov 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:4.1.80-4
+- BR plasma-devel instead of kdebase-workspace-devel
+
+* Sun Nov 23 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.80-3
+- rebase nsplugins-path patch
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com>  4.1.80-2
+- merged
+
+* Wed Nov 19 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.80-1
+- 4.1.80
+- patch100 was backported from 4.2 (4.1.6x), removed from patch list
+- ported 4.1.2 konsole patches
+- drop the second konsole patch (upstreamed)
+- using make install/fast
+- BR cmake >= 2.6.2
 
 * Wed Nov 12 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-2
 - readd kde#156636 patch (Konsole keyboard actions backport)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-10/sources,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- sources	13 Jan 2009 11:54:23 -0000	1.105
+++ sources	24 Jan 2009 17:22:31 -0000	1.106
@@ -1 +1 @@
-9a76438f5453a3ba4f773db6847825f7  kdebase-4.1.4.tar.bz2
+da86a8ad624e86eda3a7509f39272060  kdebase-4.2.0.tar.bz2


