rpms/kpackagekit/devel kpackagekit-0.4.1-i18n.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 kpackagekit.spec, 1.32, 1.33 sources, 1.13, 1.14

[Steven M. Parrish]

Author: tuxbrewr

Update of /cvs/pkgs/rpms/kpackagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1979

Modified Files:
	.cvsignore kpackagekit.spec sources 
Added Files:
	kpackagekit-0.4.1-i18n.patch 
Log Message:
New upstream release - Fixes compatibility issue with PackageKit-0.4.8

kpackagekit-0.4.1-i18n.patch:

--- NEW FILE kpackagekit-0.4.1-i18n.patch ---
diff -crB KPackageKit/AddRm/KcmKpkAddRm.cpp KPackageKit-i18n/AddRm/KcmKpkAddRm.cpp
*** KPackageKit/AddRm/KcmKpkAddRm.cpp	2009-06-04 22:29:41.000000000 -0400
--- KPackageKit-i18n/AddRm/KcmKpkAddRm.cpp	2009-06-05 11:55:03.000000000 -0400
***************
*** 39,44 ****
--- 39,45 ----
                                 ki18n("KDE interface for managing software"),
                                 KAboutData::License_GPL,
                                 ki18n("(C) 2008-2009 Daniel Nicoletti"));
+     KGlobal::locale()->insertCatalog("kpackagekit");
      setAboutData(aboutData);
      setButtons(Apply);
      m_grid = new QGridLayout(this);
diff -crB KPackageKit/Settings/KcmKpkSettings.cpp KPackageKit-i18n/Settings/KcmKpkSettings.cpp
*** KPackageKit/Settings/KcmKpkSettings.cpp	2009-06-04 22:29:39.000000000 -0400
--- KPackageKit-i18n/Settings/KcmKpkSettings.cpp	2009-06-05 11:52:21.000000000 -0400
***************
*** 47,50 ****
--- 47,51 ----
      connect(this, SIGNAL(s_defaults()), view, SLOT(defaults()));
      connect(view, SIGNAL(changed(bool)), this, SIGNAL(changed(bool)));
      m_grid->addWidget(view);
+     KGlobal::locale()->insertCatalog("kpackagekit");
  }
diff -crB KPackageKit/Updater/KcmKpkUpdate.cpp KPackageKit-i18n/Updater/KcmKpkUpdate.cpp
*** KPackageKit/Updater/KcmKpkUpdate.cpp	2009-06-04 22:29:40.000000000 -0400
--- KPackageKit-i18n/Updater/KcmKpkUpdate.cpp	2009-06-05 11:53:34.000000000 -0400
***************
*** 45,50 ****
--- 45,51 ----
      view = new KpkUpdate(this);
      m_grid->addWidget(view);
      connect(view, SIGNAL(changed(bool)), this, SIGNAL(changed(bool)));
+     KGlobal::locale()->insertCatalog("kpackagekit");
  }
  
  void KcmKpkUpdate::load()


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	17 Mar 2009 16:50:36 -0000	1.10
+++ .cvsignore	5 Jun 2009 17:27:30 -0000	1.11
@@ -1 +1 @@
-kpackagekit-0.4.0.tar.bz2
+84745-kpackagekit-0.4.1.tar.bz2


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- kpackagekit.spec	23 May 2009 17:45:23 -0000	1.32
+++ kpackagekit.spec	5 Jun 2009 17:27:30 -0000	1.33
@@ -1,20 +1,18 @@
 Name:	  	kpackagekit
-Version:	0.4.0
-Release:	7%{?dist}
+Version:	0.4.1
+Release:	0%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
 Group:		Applications/System
-Source0: 	http://ktown.kde.org/~lukas/%{name}/%{name}-%{version}.tar.bz2
-#Source0:	kpackagekit-01282009svn.tar.gz
+Source0:	http://www.kde-apps.org/CONTENT/content-files/84745-kpackagekit-%{version}.tar.bz2
 URL:		http://www.kde-apps.org/content/show.php/KPackageKit?content=84745
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # upstream me, says the patch
 Patch100: kpackagekit-InitialPreference.patch
-# upstreamed
-Patch101: kpackagekit-0.4.0-knotify_persistent.patch
-Patch102: kpackagekit-0.4.0-i18n.patch
+#Patch101: kpackagekit-0.4.0-knotify_persistent.patch
+#Patch102: kpackagekit-0.4.1-i18n.patch
 
 BuildRequires:	cmake
 BuildRequires:  desktop-file-utils
@@ -22,22 +20,23 @@ BuildRequires:	kde-filesystem
 BuildRequires:	kdelibs4-devel
 BuildRequires:	PackageKit-qt-devel >= 0.4.2
 BuildRequires:  gettext
+BuildRequires:  dbus-qt-devel
 
 %description
 KDE interface for PackageKit.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n KPackageKit
 
 %patch100 -p0 -b .InitialPreference
-%patch101 -p1 -b .knotify_persistent
-%patch102 -p0 -b .i18n
+#patch101 -p1 -b .knotify_persistent
+#patch102 -p1 -b .i18n
 
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kde4} ..  
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -55,25 +54,30 @@ desktop-file-install \
   --add-category="X-SoftwareManagement" \
   $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4/kpackagekit.desktop
 
-%find_lang kpackagekit
+#find_lang kpackagekit
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f kpackagekit.lang
+#files -f kpackagekit.lang
+%files
 %defattr(-,root,root,-)
 %{_libdir}/libkpackagekitlib.so
 %{_bindir}/kpackagekit
-%{_bindir}/kpackagekit-smart-icon
+/usr/libexec/kde4/kpackagekitsmarticon
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_datadir}/applications/kde4/kpackagekit.desktop
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/services/kded/*.desktop
 %{_kde4_appsdir}/kpackagekit/*
-%{_kde4_appsdir}/kpackagekit-smart-icon/kpackagekit-smart-icon.notifyrc
+%{_kde4_appsdir}/KPackageKitSmartIcon/KPackageKitSmartIcon.notifyrc
+%{_datadir}/dbus-1/services/org.kde.KPackageKitSmartIcon.service
 
 
 %changelog
+* Fri Jun 05 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> - 0.4.1-0
+- New upstream release.  Fixes compatibility with Packagekit 0.4.8 (#503989)
+
 * Tue Apr 28 2009 Lukáš Tinkl <ltinkl at redhat.com> - 0.4.0-7
 - upstream patch to fix catalog loading (#493061)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	28 Apr 2009 14:12:41 -0000	1.13
+++ sources	5 Jun 2009 17:27:30 -0000	1.14
@@ -1 +1 @@
-1f09f3da94f4a2a2d854a8b36a2c9a07  kpackagekit-0.4.0.tar.bz2
+e59e3ae61923dfce8d7c7ca6d7766b26  84745-kpackagekit-0.4.1.tar.bz2