From 86bac0326df7932684c3f4f97986078fc5ebc5e5e865ce561d8a82015eee9698 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 29 Mar 2012 11:50:59 +0000 Subject: [PATCH] Accepting request 111820 from security Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/111820 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ext4magic?expand=0&rev=2 --- ext4magic.changes | 5 +++++ ext4magic.spec | 44 +++++++++++++++----------------------------- 2 files changed, 20 insertions(+), 29 deletions(-) diff --git a/ext4magic.changes b/ext4magic.changes index a2449da..977ccbb 100644 --- a/ext4magic.changes +++ b/ext4magic.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 19 23:32:23 UTC 2012 - Greg.Freemyer@gmail.com + +- clean up buildrequires logic - no end user impact + ------------------------------------------------------------------- Sat Mar 3 21:04:23 UTC 2012 - Greg.Freemyer@gmail.com diff --git a/ext4magic.spec b/ext4magic.spec index 97d349e..b081fef 100644 --- a/ext4magic.spec +++ b/ext4magic.spec @@ -19,41 +19,27 @@ Name: ext4magic Version: 0.3.0 Release: 0 License: GPL-2.0+ -Summary: can help to recover deleted files on ext3/4 filesystems +Summary: Can help to recover deleted files on ext3/4 filesystems Url: http://openfacts2.berlios.de/wikide/index.php/BerliosProject:Ext4magic Group: System/Filesystems Source: ext4magic-%{version}.tar.gz -%if 0%{?suse_version} -BuildRequires: libext2fs-devel -BuildRequires: libuuid-devel -BuildRequires: libblkid-devel -BuildRequires: file-devel -%endif - -%if 0%{?fedora_version} -BuildRequires: e2fsprogs-devel -BuildRequires: libuuid-devel -BuildRequires: libblkid-devel -BuildRequires: file-devel -%endif - -%if 0%{?rhel_version} -BuildRequires: e2fsprogs-devel -BuildRequires: libuuid-devel -BuildRequires: libblkid-devel -BuildRequires: file-devel -%endif - -%if 0%{?centos_version} -BuildRequires: e2fsprogs-devel -BuildRequires: uuid-devel -BuildRequires: libblkid-devel -BuildRequires: file-devel -%endif - BuildRequires: libbz2-devel BuildRequires: zlib-devel +BuildRequires: file-devel +BuildRequires: libblkid-devel + +%if 0%{suse_version} || 0%{?fedora_version} || 0%{?rhel_version} +BuildRequires: libuuid-devel +%else +BuildRequires: uuid-devel +%endif + +%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} +BuildRequires: e2fsprogs-devel +%else +BuildRequires: libext2fs-devel +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build