rpms/kpackagekit/F-12 KpKIcons.patch, NONE, 1.1 KpKStrings.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 kpackagekit.spec, 1.48, 1.49 sources, 1.25, 1.26 kpackagekit-InitialPreference.patch, 1.2, NONE

[Steven M. Parrish]

Author: tuxbrewr

Update of /cvs/pkgs/rpms/kpackagekit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16809

Modified Files:
	.cvsignore kpackagekit.spec sources 
Added Files:
	KpKIcons.patch KpKStrings.patch 
Removed Files:
	kpackagekit-InitialPreference.patch 
Log Message:
New upstream release fixes #531447, #533755, #536930

KpKIcons.patch:
 KpkIcons.cpp |    4 !!!!
 1 file changed, 4 modifications(!)

--- NEW FILE KpKIcons.patch ---
*** kpackagekit-0.5.1/libkpackagekit/KpkIcons.cpp	2009-11-17 11:45:00.000000000 -0500
--- kpackagekit-0.5.1-Fedora/libkpackagekit/KpkIcons.cpp	2009-11-17 14:52:14.890236405 -0500
***************
*** 78,85 ****
      case Transaction::StatusScanProcessList      : return KpkIcons::getIcon("package-info");
      case Transaction::StatusCheckExecutableFiles : return KpkIcons::getIcon("package-info");
      case Transaction::StatusCheckLibraries       : return KpkIcons::getIcon("package-info");
!     case Transaction::StatusCopyFiles            : return KpkIcons::getIcon("package-info");
!     }
      kDebug() << "status icon unrecognised: " << status;
      return KpkIcons::getIcon("help-browser");
  }
--- 78,85 ----
      case Transaction::StatusScanProcessList      : return KpkIcons::getIcon("package-info");
      case Transaction::StatusCheckExecutableFiles : return KpkIcons::getIcon("package-info");
      case Transaction::StatusCheckLibraries       : return KpkIcons::getIcon("package-info");
! /*    case Transaction::StatusCopyFiles            : return KpkIcons::getIcon("package-info");
! */    }
      kDebug() << "status icon unrecognised: " << status;
      return KpkIcons::getIcon("help-browser");
  }

KpKStrings.patch:
 KpkStrings.cpp |    4 +!!!
 1 file changed, 1 insertion(+), 3 modifications(!)

--- NEW FILE KpKStrings.patch ---
*** kpackagekit-0.5.1/libkpackagekit/KpkStrings.cpp	2009-11-17 11:45:00.000000000 -0500
--- kpackagekit-0.5.1-Fedora/libkpackagekit/KpkStrings.cpp	2009-11-17 14:40:40.289477639 -0500
***************
*** 135,143 ****
      case Transaction::StatusCheckLibraries :
          return i18nc("we are checking for libraries in use",
                       "Checking for libraries currently in use");
!     case Transaction::StatusCopyFiles :
          return i18nc("we are copying package files to prepare to install",
                       "Copying files");
      }
      kWarning() << "status unrecognised: " << status;
      return QString();
--- 135,145 ----
      case Transaction::StatusCheckLibraries :
          return i18nc("we are checking for libraries in use",
                       "Checking for libraries currently in use");
! /*
! case Transaction::StatusCopyFiles :
          return i18nc("we are copying package files to prepare to install",
                       "Copying files");
+ */
      }
      kWarning() << "status unrecognised: " << status;
      return QString();


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-12/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	31 Oct 2009 22:39:45 -0000	1.17
+++ .cvsignore	17 Nov 2009 21:03:00 -0000	1.18
@@ -1 +1 @@
-kpackagekit-0.5.0.3.tar.bz2
+kpackagekit-0.5.1.1.tar.bz2


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-12/kpackagekit.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- kpackagekit.spec	31 Oct 2009 22:39:46 -0000	1.48
+++ kpackagekit.spec	17 Nov 2009 21:03:00 -0000	1.49
@@ -2,19 +2,21 @@
 %define pk_version 0.5.3
 
 Name:	  	kpackagekit
-Version:	0.5.0.3
+Version:	0.5.1.1
 Release:	1%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
 Group:		Applications/System
 #Source0:	http://www.kde-apps.org/CONTENT/content-files/84745-kpackagekit-%{version}.tar.bz2
-Source0:	kpackagekit-0.5.0.3.tar.bz2
+Source0:	kpackagekit-0.5.1.1.tar.bz2
 URL:		http://www.kde-apps.org/content/show.php/KPackageKit?content=84745
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #Hacks to smash kpackagekit: daily/none default (#469375)
-Patch50: kpackagekit-0.5.0-defaults_hacks.patch
+Patch50: kpackagekit-0.5.1-defaults_hacks.patch
+Patch51: KpKStrings.patch
+Patch52: KpKIcons.patch
 
 BuildRequires:	cmake
 BuildRequires:  desktop-file-utils
@@ -34,6 +36,8 @@ KDE interface for PackageKit.
 %setup -q -n %{name}-%{version}
 
 %patch50  -p1 -b .defaults_hacks
+%patch51 -p1 -b .strings
+%patch52 -p1 -b .icons
 
 
 %build
@@ -77,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Nov 17 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.1.1-1
+- New upstream release fixes #531447, #533755, #536930
+
 * Sat Oct 31 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0.3-1
 - Official 0.5.0.3 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-12/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	31 Oct 2009 22:39:46 -0000	1.25
+++ sources	17 Nov 2009 21:03:00 -0000	1.26
@@ -1 +1 @@
-c12baa39e970443b9b80b5a41efd2310  kpackagekit-0.5.0.3.tar.bz2
+a370aeeac0fee51b43ea11b74e8f59b8  kpackagekit-0.5.1.1.tar.bz2


--- kpackagekit-InitialPreference.patch DELETED ---