[zif: 2/3] Revert "- Backport 2 fixes from git master to fix"

Richard Hughes rhughes at fedoraproject.org
Mon Nov 1 11:05:05 UTC 2010


commit c20b15ed46d8bbfb3ddb938ea5ff0d8de58a0f7c
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Nov 1 11:03:49 2010 +0000

    Revert "- Backport 2 fixes from git master to fix"
    
    This reverts commit f45648e967408e32918a5d5f8678c29c04987d0d.

 backport-fixes.patch |  244 --------------------------------------------------
 zif.spec             |   11 +--
 2 files changed, 1 insertions(+), 254 deletions(-)
---
diff --git a/zif.spec b/zif.spec
index f0d34f5..1ac7e61 100644
--- a/zif.spec
+++ b/zif.spec
@@ -1,7 +1,7 @@
 Summary:   Simple wrapper for rpm
 Name:      zif
 Version:   0.1.1
-Release:   3%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+
 URL:       http://github.com/hughsie/zif
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
@@ -18,9 +18,6 @@ BuildRequires: gtk-doc
 BuildRequires: bzip2-devel
 BuildRequires: zlib-devel
 
-# already upstream
-Patch0:    backport-fixes.patch
-
 %description
 Zif is a simple yum-compatible library that only provides read-only
 access to the rpm database and the Fedora metadata for PackageKit.
@@ -30,15 +27,12 @@ Zif is not designed as a replacement to yum, nor to be used by end users.
 %package devel
 Summary: GLib Libraries and headers for zif
 Requires: %{name} = %{version}-%{release}
-Requires: bzip2-devel
-Requires: zlib-devel
 
 %description devel
 GLib headers and libraries for zif.
 
 %prep
 %setup -q
-%patch0 -p1 -b .backports
 
 %build
 %configure \
@@ -73,9 +67,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libzif*.la
 %{_datadir}/gtk-doc
 
 %changelog
-* Tue Oct 12 2010 Richard Hughes <richard at hughsie.com> 0.1.1-3
-- Backport 2 fixes from git master to fix 
-
 * Tue Oct 05 2010 Parag Nemade <paragn AT fedoraproject.org> 0.1.1-2
 - drop the ldconfig and pkgconfig as a Requires.
 


More information about the scm-commits mailing list