rpms/PackageKit/devel pk-yum-fix-devel-filtering.patch, NONE, 1.1 PackageKit.spec, 1.78, 1.79

Richard Hughes rhughes at fedoraproject.org
Tue Oct 28 12:36:31 UTC 2008


Author: rhughes

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

Modified Files:
	PackageKit.spec 
Added Files:
	pk-yum-fix-devel-filtering.patch 
Log Message:
* Tue Oct 28 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.9-2
- Apply a patch from upstream to fix development filtering.


pk-yum-fix-devel-filtering.patch:

--- NEW FILE pk-yum-fix-devel-filtering.patch ---
commit 99f995788473f4627acb7447aa467a61bc61893a
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Oct 28 12:31:29 2008 +0000

    yum: replace the regular expression with four simple comparisons

diff --git a/backends/yum/yumFilter.py b/backends/yum/yumFilter.py
index 9e1b563..855a51f 100644
--- a/backends/yum/yumFilter.py
+++ b/backends/yum/yumFilter.py
@@ -120,8 +120,15 @@ class YumFilter(PackagekitFilter):
         '''
         Return if the package is development.
         '''
-        regex = re.compile(r'(-devel)|(-debuginfo)|(-static)|(-libs)')
-        return regex.search(pkg.name)
+        if pkg.name.endswith('-devel'):
+            return True
+        if pkg.name.endswith('-debuginfo'):
+            return True
+        if pkg.name.endswith('-static'):
+            return True
+        if pkg.name.endswith('-libs'):
+            return True
+        return False
 
     def _pkg_is_gui(self, pkg):
         '''


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- PackageKit.spec	27 Oct 2008 11:50:33 -0000	1.78
+++ PackageKit.spec	28 Oct 2008 12:36:00 -0000	1.79
@@ -8,7 +8,7 @@
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
 Version:   0.3.9
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
@@ -19,6 +19,9 @@
 # Set Vendor.conf up for Fedora.
 Patch0:    PackageKit-0.3.8-Fedora-Vendor.conf.patch
 
+# upstream, 99f995788473f4627acb7447aa467a61bc61893a
+Patch1:    pk-yum-fix-devel-filtering.patch
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-glib = %{version}-%{release}
@@ -200,6 +203,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
@@ -372,6 +376,9 @@
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Tue Oct 28 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.9-2
+- Apply a patch from upstream to fix development filtering.
+
 * Mon Oct 27 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.9-1
 - New upstream version
 - Many new and updated translations.




More information about the scm-commits mailing list