kalev pushed to libhif (master). "Fix broken -devel package requires (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Sat Mar 28 22:35:18 UTC 2015


>From b5a3eea125cffb22c1ac2660c279cb61217a2cad Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember at gmail.com>
Date: Sat, 28 Mar 2015 21:27:00 +0100
Subject: Fix broken -devel package requires

Commit 47eb12c67d1d19bfdc12b347ee2176050c3f7126 added %{epoch} to the -devel
package requires. As epoch isn't actually defined for this package, this led to
rpm putting %{epoch} unexpanded in the requires.

ERROR with transaction check vs depsolve:
libhif(x86-64) = %{epoch}:0.1.8-6.fc23 is needed by libhif-devel-0.1.8-6.fc23.x86_64

diff --git a/libhif.spec b/libhif.spec
index 1d88461..f42d1a9 100644
--- a/libhif.spec
+++ b/libhif.spec
@@ -1,7 +1,7 @@
 Summary:   Simple package library built on top of hawkey and librepo
 Name:      libhif
 Version:   0.1.8
-Release:   6%{?dist}
+Release:   7%{?dist}
 License:   LGPLv2+
 URL:       https://github.com/hughsie/libhif
 Source0:   http://people.freedesktop.org/~hughsient/releases/libhif-%{version}.tar.xz
@@ -30,7 +30,7 @@ used by PackageKit and rpm-ostree.
 
 %package devel
 Summary: GLib Libraries and headers for libhif
-Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 GLib headers and libraries for libhif.
@@ -75,6 +75,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libhif*.la
 %{_datadir}/gir-1.0/*.gir
 
 %changelog
+* Sat Mar 28 2015 Kalev Lember <kalevlember at gmail.com> - 0.1.8-7
+- Fix broken -devel package requires
+
 * Mon Mar 16 2015 Than Ngo <than at redhat.com> - 0.1.8-6
 - bump release and rebuild so that koji-shadow can rebuild it
   against new gcc on secondary arch
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libhif.git/commit/?h=master&id=b5a3eea125cffb22c1ac2660c279cb61217a2cad


More information about the scm-commits mailing list