[mirrorbrain/epel7] EPEL7: drop the if statement for the correct apxs path, RHEL 7 is shipping apxs on the same path as

averi averi at fedoraproject.org
Fri Jan 24 12:45:52 UTC 2014


commit 75af037362fd031dd83fd53685ee82eb0140c572
Author: Andrea Veri <av at gnome.org>
Date:   Fri Jan 24 13:46:09 2014 +0100

    EPEL7: drop the if statement for the correct apxs path, RHEL 7 is shipping apxs on the same path as Fedora

 mirrorbrain.spec |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/mirrorbrain.spec b/mirrorbrain.spec
index fc86b9d..7c07364 100644
--- a/mirrorbrain.spec
+++ b/mirrorbrain.spec
@@ -1,9 +1,4 @@
-%if 0%{?rhel}
-%global apxs /usr/sbin/apxs
-%endif
-%if 0%{?fedora}
 %global apxs /usr/bin/apxs
-%endif
 %global mirrorbrain_user mirrorbrain
 %global mirrorbrain_group mirrorbrain
 %global apache apache
@@ -17,7 +12,7 @@ Name:		mirrorbrain
 Summary:	A download redirector and metalink generator
 Url:		http://mirrorbrain.org/
 Version:	2.17.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 # ASL licensed files are: mod_autoindex_mb.c, mod_mirrorbrain.c, null-rsync
 # Other files are licensed under the GPLv2
 License:	ASL 2.0 and GPLv2
@@ -243,6 +238,10 @@ exit 0
 %{_bindir}/scanner
 
 %changelog 
+* Fri Jan 24 2014 Andrea Veri <averi at fedoraproject.org> 2.17.0-4
+- EPEL7: drop the if statement for the correct apxs path, RHEL 7 is shipping
+  the apxs binary in the same path as Fedora.
+
 * Thu Dec 05 2013 Andrea Veri <averi at fedoraproject.org> 2.17.0-3
 - Added a note about what files are licensed under the ASL 2.0.
 - Moved shadow-utils as a Require(pre)


More information about the scm-commits mailing list