rpms/kdebase-runtime/F-10 kdebase-runtime-4.2.0-kde#178479.patch, NONE, 1.1 .cvsignore, 1.24, 1.25 kdebase-runtime.spec, 1.80, 1.81 sources, 1.26, 1.27

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Added Files:
	kdebase-runtime-4.2.0-kde#178479.patch 
Log Message:
* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-3
- respun tarball


kdebase-runtime-4.2.0-kde#178479.patch:

--- NEW FILE kdebase-runtime-4.2.0-kde#178479.patch ---
--- branches/KDE/4.2/kdebase/runtime/kioslave/trash/trashimpl.cpp	2009/01/26 16:31:17	916986
+++ branches/KDE/4.2/kdebase/runtime/kioslave/trash/trashimpl.cpp	2009/01/26 16:41:07	916987
@@ -766,8 +766,10 @@
         return 0;
 
     KMountPoint::Ptr mp = KMountPoint::currentMountPoints().findByPath( origPath );
-    if (!mp)
+    if (!mp) {
+        kDebug() << "KMountPoint found no mount point for" << origPath;
         return 0;
+    }
     QString mountPoint = mp->mountPoint();
     const QString trashDir = trashForMountPoint( mountPoint, true );
     kDebug() << "mountPoint=" << mountPoint << " trashDir=" << trashDir;
@@ -861,7 +863,7 @@
         if ( (S_ISDIR(buff.st_mode)) // must be a dir
              && (!S_ISLNK(buff.st_mode)) // not a symlink
              && ((buff.st_mode & requiredBits) == requiredBits)
-             && (::access(rootTrashDir_c, W_OK))
+             && (::access(rootTrashDir_c, W_OK) == 0) // must be user-writable
             ) {
             const QString trashDir = rootTrashDir + '/' + QString::number( uid );
             const QByteArray trashDir_c = QFile::encodeName( trashDir );


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	23 Jan 2009 22:33:19 -0000	1.24
+++ .cvsignore	26 Jan 2009 21:51:15 -0000	1.25
@@ -1,2 +1 @@
-kdebase-runtime-4.1.96.tar.bz2
 kdebase-runtime-4.2.0.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- kdebase-runtime.spec	23 Jan 2009 22:33:19 -0000	1.80
+++ kdebase-runtime.spec	26 Jan 2009 21:51:16 -0000	1.81
@@ -3,24 +3,26 @@
 %define kde3_desktop 1
 %endif
 
-%define _with_samba --with-samba
-
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.2.0
-Release:       1%{?dist}
+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
 Source1:       khelpcenter.desktop
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Patch0:        kdebase-runtime-4.1.70-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
 Patch2:        kdebase-runtime-4.1.1-knetattach.patch
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
-# Upstream patches
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+## Upstream patches
+# http://bugs.kde.org/178479
+Patch100: kdebase-runtime-4.2.0-kde#178479.patch
 
 %ifarch noarch
 %define icons 1
@@ -41,7 +43,7 @@
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
-Requires: kdepimlibs >= %{version}
+Requires: kdepimlibs%{?_isa} >= %{version}
 %ifnarch s390 s390x
 Requires: eject
 %endif
@@ -51,7 +53,7 @@
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
-%{?_with_samba:BuildRequires: libsmbclient-devel}
+BuildRequires: libsmbclient-devel
 # needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
 BuildRequires: libxcb-devel
 BuildRequires: libXScrnSaver-devel
@@ -106,16 +108,17 @@
 %patch3 -p1 -b .iconthemes-inherit
 
 # upstream patches
+%patch100 -p5 -b .kde#178479
 
-%build
 
+%build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
 %if 0%{?rest}
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 %endif
 
 
@@ -336,6 +339,14 @@
 
 
 %changelog
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-3
+- respun tarball
+
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
+- Files not trashed to the correct location in Dolphin/Konqueror 
+  (#481598, kdebug#178479)
+- omit --with-samba crud
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 - +BR: pulseaudio-libs-devel xine-lib-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	23 Jan 2009 22:33:19 -0000	1.26
+++ sources	26 Jan 2009 21:51:16 -0000	1.27
@@ -1 +1 @@
-9e56281e9daa579d56cfda794f1bbc10  kdebase-runtime-4.2.0.tar.bz2
+8ef48aae16a6dddb3055d81d7e5c375f  kdebase-runtime-4.2.0.tar.bz2