[mod_form/epel7] EPEL7: drop the if statement for the correct apxs path, RHEL 7 is shipping the apxs binary on the sa

averi averi at fedoraproject.org
Fri Jan 24 00:36:00 UTC 2014


commit cb565e9fa6a64027081734f4741d89db5034e60d
Author: Andrea Veri <av at gnome.org>
Date:   Fri Jan 24 01:36:16 2014 +0100

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

 mod_form.spec |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/mod_form.spec b/mod_form.spec
index 724e926..d73d30c 100644
--- a/mod_form.spec
+++ b/mod_form.spec
@@ -1,9 +1,4 @@
-%if 0%{?rhel}
-%global apxs /usr/sbin/apxs
-%endif
-%if 0%{?fedora}
 %global apxs /usr/bin/apxs
-%endif
 %global apache apache
 %global apache_libexecdir %(%{apxs} -q LIBEXECDIR)
 %global apache_sysconfdir %(%{apxs} -q SYSCONFDIR)
@@ -14,7 +9,7 @@
 
 Name:           mod_form
 Version:        0.1
-Release:        1.20131204svn145%{?dist}
+Release:        2.20131204svn145%{?dist}
 # The tarball's contents were downloaded from:
 # http://apache.webthing.com/svn/apache/forms/mod_form.c
 # http://apache.webthing.com/svn/apache/forms/mod_form.h
@@ -70,6 +65,10 @@ cp -p mod_form.h %{buildroot}/%{apache_includedir}
 %{apache_libexecdir}/mod_form.so
 
 %changelog
+* Fri Jan 24 2014 Andrea Veri <averi at fedoraproject.org> 0.1-2.20131204svn145
+- EPEL7: drop the if statement for the correct apxs path, RHEL 7 is shipping
+  the apxs binary in the same path as Fedora.
+
 * Wed Dec 04 2013 Andrea Veri <averi at fedoraproject.org> 0.1-1.20131204svn145
 - Adjusted the versioning.
 - Fixed the license to be GPLv2+.


More information about the scm-commits mailing list