rpms/kdeutils/devel .cvsignore, 1.54, 1.55 kdeutils.spec, 1.146, 1.147 sources, 1.56, 1.57

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24209

Modified Files:
	.cvsignore kdeutils.spec sources 
Log Message:
4.2 beta1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	27 Sep 2008 02:29:27 -0000	1.54
+++ .cvsignore	20 Nov 2008 17:05:43 -0000	1.55
@@ -1 +1,2 @@
 kdeutils-4.1.2.tar.bz2
+kdeutils-4.1.80.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- kdeutils.spec	29 Sep 2008 16:37:14 -0000	1.146
+++ kdeutils.spec	20 Nov 2008 17:05:43 -0000	1.147
@@ -1,4 +1,3 @@
-
 %if 0%{?fedora} > 9
 # include new PyKDE4 printer applet
 %define printer_applet 1
@@ -11,15 +10,15 @@
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.1.2
-Release:        3%{?dist}
+Version:        4.1.80
+Release:        2%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
 # FIXME/TODO: Check license
 License:        GPLv2
 URL:            http://www.kde.org
-Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
 %if 0%{?include_kjots}
 Source1:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepim-%{version}.tar.bz2
 Patch0:         kdeutils-4.0.99-kjots-without-kdepim.patch
@@ -27,10 +26,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # FIXME/TODO: Tpctl is needed for klaptopdaemon
-BuildRequires:  cmake
-BuildRequires:  kde-filesystem >= 4
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
 BuildRequires:  kdebase-workspace-devel >= %{version}
 BuildRequires:  gmp-devel
@@ -44,7 +39,7 @@
 Requires(postun): /sbin/ldconfig xdg-utils
 Requires: kdelibs4 >= %{version}
 %if 0%{?printer_applet}
-# (new) printer applet 
+# (new) printer applet
 BuildRequires:  PyKDE4-devel
 BuildRequires:  system-config-printer
 Requires: PyKDE4
@@ -88,9 +83,9 @@
 
 %package devel
 Group:    Development/Libraries
-Summary:  Development files for %{name} 
+Summary:  Development files for %{name}
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: kdelibs4-devel kdepimlibs4-devel kdebase-workspace-devel
+Requires: kdepimlibs4-devel kdebase-workspace-devel
 %description devel
 %{summary}.
 
@@ -123,7 +118,7 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # nothing should build against these
 rm -f %{buildroot}%{_kde4_libdir}/liboktetacore.so %{buildroot}%{_kde4_libdir}/liboktetagui.so
@@ -171,17 +166,7 @@
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/applications/kde4/*
-%{_kde4_docdir}/HTML/en/ark/
-%{_kde4_docdir}/HTML/en/kcalc/
-%{_kde4_docdir}/HTML/en/kcharselect/
-%{_kde4_docdir}/HTML/en/kcontrol/
-%{_kde4_docdir}/HTML/en/kdf/
-%{_kde4_docdir}/HTML/en/kfloppy/
-%{_kde4_docdir}/HTML/en/kgpg/
-%{_kde4_docdir}/HTML/en/ktimer/
-%{_kde4_docdir}/HTML/en/kwallet/
-%{_kde4_docdir}/HTML/en/okteta/
-%{_kde4_docdir}/HTML/en/superkaramba/
+%{_kde4_docdir}/HTML/en/*
 %{_kde4_iconsdir}/hicolor/*/apps/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_datadir}/dbus-1/interfaces/*
@@ -211,6 +196,17 @@
 
 
 %changelog
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.80-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
+
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
+- 4.1.3
+
 * Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-3
 - make VERBOSE=1
 - respin against new(er) kde-filesystem
@@ -252,7 +248,7 @@
 - 4.0.84
 
 * Sat Jun 21 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.83-2
-- add explicit dep on rhpl to work around missing dep in 
+- add explicit dep on rhpl to work around missing dep in
   system-config-printer (#452575)
 
 * Thu Jun 19 2008 Than Ngo <than at redhat.com> 4.0.83-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	27 Sep 2008 02:29:27 -0000	1.56
+++ sources	20 Nov 2008 17:05:43 -0000	1.57
@@ -1 +1 @@
-cab195ea3a60d136706d00d66b504aa8  kdeutils-4.1.2.tar.bz2
+72663bbe1261ad6a2930a15031093b3e  kdeutils-4.1.80.tar.bz2