[jetty] Add generic macro for custom builds

Mikolaj Izdebski mizdebsk at fedoraproject.org
Wed Apr 25 15:13:58 UTC 2012


commit 884e94c0545cae0eafc02531f835435a4720a162
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Wed Apr 25 17:11:08 2012 +0200

    Add generic macro for custom builds

 jetty.spec |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 090b3cd..e27f8f9 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -64,7 +64,10 @@ Patch5:         0005-Modify-dependencies.patch
 Patch6:         0006-Remove-pmd-plugin.patch
 Patch8:         0007-disable-jetty-osgi.patch
 
+%if 0%{?rhel} <= 0
 BuildRequires:  fedora-usermgmt-devel
+%{?FE_USERADD_REQ}
+%endif
 BuildRequires:  geronimo-jaspic-spec
 BuildRequires:  java-devel >= 1:1.7.0
 BuildRequires:  jpackage-utils
@@ -132,7 +135,6 @@ Requires:       jetty-xml              = %{epoch}:%{version}-%{release}
 %if 0%{?rhel} <= 0
 Requires:       jetty-osgi             = %{epoch}:%{version}-%{release}
 %endif
-%{?FE_USERADD_REQ}
 
 Requires(post):   systemd-units, systemd-sysv
 Requires(preun):  systemd-units


More information about the scm-commits mailing list