rpms/kdebase-runtime/F-7 .cvsignore, 1.3, 1.4 kdebase-runtime.spec, 1.2, 1.3 sources, 1.3, 1.4

[Kevin Kofler (kkofler)]

Author: kkofler

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

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

* Tue Jan 08 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 4.0.0-2
- respun tarball

* Mon Jan 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.0-1
- update to 4.0.0
- update file list, don't remove renamed khotnewstuff.knsrc for KDE 3 desktop

* Wed Dec 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-1
- kde-3.97.0

* Tue Dec 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.2-4 
- disable kioslave/smb (f9+, samba-3.2.x/gplv3 ickiness)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Dec 2007 03:52:25 -0000	1.3
+++ .cvsignore	10 Jan 2008 23:43:50 -0000	1.4
@@ -1 +1 @@
-kdebase-runtime-3.96.2.tar.bz2
+kdebase-runtime-4.0.0.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-7/kdebase-runtime.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdebase-runtime.spec	4 Dec 2007 03:52:25 -0000	1.2
+++ kdebase-runtime.spec	10 Jan 2008 23:43:50 -0000	1.3
@@ -1,18 +1,19 @@
 
-# kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
-%if 0%{?fedora} <= 8
+%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
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
-Version:       3.96.2
-Release:       3%{?dist}
+Version:       4.0.0
+Release:       2%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
-Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
+Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: kdebase4-runtime < %{version}-%{release}
@@ -37,7 +38,7 @@
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: libsmbclient-devel
+%{?_with_samba:BuildRequires: libsmbclient-devel}
 BuildRequires: libXScrnSaver-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
@@ -48,7 +49,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} >= 8
+%if 0%{?fedora} > 7 
 BuildRequires:  libxcb-devel
 %endif
 # needed?
@@ -80,7 +81,7 @@
 
 %install
 rm -rf %{buildroot}
-mkdir %{buildroot}
+mkdir -p %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 # omit gigantic oxygen scalable/svg icons, for now -- Rex
@@ -98,7 +99,7 @@
 rm -rf %{buildroot}%{_kde4_sysconfdir}/xdg/menus
 rm -rf %{buildroot}%{_kde4_datadir}/desktop-directories
 rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/k*
-rm -rf %{buildroot}%{_kde4_datadir}/config
+rm -f %{buildroot}%{_kde4_configdir}/kshorturifilterrc
 rm -f %{buildroot}%{_kde4_datadir}/config.kcfg/k*.kcfg %{buildroot}%{_kde4_datadir}/config.kcfg/mediamanagersettings.kcfg
 rm -f %{buildroot}%{_kde4_datadir}/sounds/KDE_*.ogg
 # binaries: conflict with kdebase
@@ -186,6 +187,7 @@
 %defattr(-,root,root,-)
 %{_kde4_bindir}/*
 %{_kde4_appsdir}/*
+%{_kde4_configdir}/khotnewstuff.knsrc
 %{_kde4_datadir}/config.kcfg/
 %{_datadir}/dbus-1/interfaces/*
 %{_datadir}/dbus-1/services/*
@@ -203,7 +205,6 @@
 %{_kde4_sysconfdir}/xdg/menus/kde-information.menu
 %{_kde4_datadir}/applications/kde4/Help.desktop
 %{_kde4_datadir}/applications/kde4/knetattach.desktop
-%{_kde4_configdir}/khotnewstuffrc
 %{_kde4_configdir}/kshorturifilterrc
 %{_kde4_datadir}/desktop-directories/kde-information.directory
 %{_kde4_datadir}/emoticons/kde4/
@@ -214,6 +215,19 @@
 
 
 %changelog
+* Tue Jan 08 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 4.0.0-2
+- respun tarball
+
+* Mon Jan 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.0-1
+- update to 4.0.0
+- update file list, don't remove renamed khotnewstuff.knsrc for KDE 3 desktop
+
+* Wed Dec 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-1
+- kde-3.97.0
+
+* Tue Dec 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.2-4 
+- disable kioslave/smb (f9+, samba-3.2.x/gplv3 ickiness)
+
 * Sun Dec 02 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.2-3
 - build without libxcb in F7 as we STILL don't have it (see #373361)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Dec 2007 03:52:25 -0000	1.3
+++ sources	10 Jan 2008 23:43:50 -0000	1.4
@@ -1 +1 @@
-e959ea15a5ad6b8de396e8dc83cacdc7  kdebase-runtime-3.96.2.tar.bz2
+da93f59497ff90ad01bd4ab9b458f6cb  kdebase-runtime-4.0.0.tar.bz2