From 3d13585d5e3529b208138ab22e6fc1bd00de581b Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Feb 02 2014 03:40:18 +0000
Subject: rebase chfn patch, +Requires: util-linux (#609039)


---

diff --git a/kde-baseapps-4.12.2-bz#609039.patch b/kde-baseapps-4.12.2-bz#609039.patch
new file mode 100644
index 0000000..d658ce2
--- /dev/null
+++ b/kde-baseapps-4.12.2-bz#609039.patch
@@ -0,0 +1,28 @@
+diff -up kde-baseapps-4.12.2/kdepasswd/kcm/chfnprocess.cpp.bz#609039 kde-baseapps-4.12.2/kdepasswd/kcm/chfnprocess.cpp
+--- kde-baseapps-4.12.2/kdepasswd/kcm/chfnprocess.cpp.bz#609039	2014-01-30 15:10:31.000000000 -0600
++++ kde-baseapps-4.12.2/kdepasswd/kcm/chfnprocess.cpp	2014-02-01 21:33:15.140447271 -0600
+@@ -63,19 +63,16 @@ int ChfnProcess::ConverseChfn(const char
+       break;
+     }
+ 
+-    if ( line.contains( "Password: " )/*isPrompt( line, "password" )*/ )
++    if ( line.contains( "Changing finger info" ) )
++    {
++      // do nothing
++    }
++    else if ( line.contains( "Password: " )/*isPrompt( line, "password" )*/ )
+     {
+       WaitSlave();
+       write(fd(), pass, strlen(pass));
+       write(fd(), "\n", 1);
+     }
+-
+-    line = readLine(); // Let's see what the outcome was
+-
+-    if ( line.contains( "Changing finger info" ) )
+-    {
+-      // do nothing
+-    }
+     else if ( line.contains( "information changed" ) )
+     {
+       status=0;
diff --git a/kde-baseapps.spec b/kde-baseapps.spec
index 20bdd72..3b52fd2 100644
--- a/kde-baseapps.spec
+++ b/kde-baseapps.spec
@@ -5,7 +5,7 @@
 Name:    kde-baseapps
 Summary: KDE Core Applications 
 Version: 4.12.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2 and GFDL
 URL:     https://projects.kde.org/projects/kde/kde-baseapps 
@@ -27,21 +27,27 @@ Patch2: kdebase-4.2.1-home-icon.patch
 # fix disabling automatic spell checking in the Konqueror UI (kde#228593)
 Patch3: kdebase-4.4.0-konqueror-kde#228593.patch
 
+# Password & User account becomes non responding
+Patch4: kde-baseapps-4.12.2-bz#609039.patch
+
 # add x-scheme-handler/http for konqueror so it can be set
 # as default browser in GNOME
 Patch5: kde-baseapps-4.9.2-konqueror-mimetyp.patch
 
+## upstream patches
+
 # optional runtime dep for kcm_useraccount, see https://git.reviewboard.kde.org/r/110875/
 %if 0%{?fedora} || 0%{?rhel} > 6
 Requires: accountsservice
 %endif
 
-## upstream patches
-
 %ifnarch s390 s390x
 Requires: eject
 %endif
 
+# kdepasswd uses chfn
+Requires: util-linux
+
 Obsoletes: kdebase < 6:4.7.97-10
 Provides:  kdebase = 6:%{version}-%{release}
 
@@ -229,6 +235,7 @@ Requires: libkonq%{?_isa} = %{version}-%{release}
 %patch0 -p2 -b .nsplugins-paths
 %patch2 -p2 -b .home-icon
 %patch3 -p2 -b .kde#228593
+%patch4 -p1 -b .bz#609039
 %patch5 -p1 -b .mimetyp.patch
 
 
@@ -573,6 +580,9 @@ fi
 
 
 %changelog
+* Sat Feb 01 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.12.2-2
+- rebase chfn patch, +Requires: util-linux (#609039)
+
 * Fri Jan 31 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.12.2-1
 - 4.12.2