From c9e618f8adde606d12e9913b6b41afaf0547ec76 Mon Sep 17 00:00:00 2001 From: OBS User jankara <null@suse.de> Date: Tue, 26 Feb 2013 18:05:10 +0000 Subject: [PATCH] Rev filesystems/46 Md5 eaf9cd5e0b12c7b36888b97156c93ce4 2013-02-26 18:05:10 jankara 156459 --- e2fsprogs.changes | 5 +++++ e2fsprogs.spec | 13 +++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/e2fsprogs.changes b/e2fsprogs.changes index a6e5607..3116e12 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 26 18:02:26 UTC 2013 - jack@suse.cz + +- Fix compilation for Fedora targets in Build Service + ------------------------------------------------------------------- Mon Feb 25 16:01:07 UTC 2013 - jack@suse.cz diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 5ee3e16..c557708 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -17,15 +17,24 @@ Name: e2fsprogs +%if 0%{?suse_version} >= 1010 +# Hint for ZYPP Supplements: filesystem(ext2) filesystem(ext3) filesystem(ext4) +%endif BuildRequires: autoconf BuildRequires: libblkid-devel BuildRequires: libuuid-devel BuildRequires: pkg-config -%if 0%{suse_version} > 1220 +%if 0%{?suse_version} > 1220 BuildRequires: makeinfo %endif -PreReq: %install_info_prereq +# Define info macros if missing (for Fedora builds) +%if 0%{!?%install_info_prereq:1} +%define install_info_prereq info +%define install_info sbin/install-info +%define install_info_delete sbin/install-info --delete +%endif +Requires: %install_info_prereq # bug437293 %ifarch ppc64 Obsoletes: e2fsprogs-64bit