diff --git a/apache2.changes b/apache2.changes index c96a9e5..88494f8 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 30 04:48:07 UTC 2013 - crrodriguez@opensuse.org + +- Really use %requires_ge for libapr1 and libapr-util1 + mentioned but not implemented in the previous commit. + ------------------------------------------------------------------- Wed Aug 28 07:29:47 UTC 2013 - crrodriguez@opensuse.org diff --git a/apache2.spec b/apache2.spec index 227ede5..52e136c 100644 --- a/apache2.spec +++ b/apache2.spec @@ -171,11 +171,9 @@ Requires: %{pname}-MPM Requires: /etc/mime.types PreReq: %{name}-utils Requires: logrotate -# in the past, libapr1 >= 1.0 was sufficient. But since 2.2.16, a failure to -# create listen sockets can occur, unless newer libapr1 is used, with certain kernels. -# see https://bugzilla.redhat.com/show_bug.cgi?id=516331 -Requires: libapr1 < 2.0 -Requires: libapr1 >= 1.4.2 +#for some reason the parser barfs if not conditional +%{?requires_ge:%requires_ge libapr1} +%{?requires_ge:%requires_ge libapr-util1} %{?systemd_requires} PreReq: fileutils textutils grep sed %if %{?suse_version:1}0 @@ -382,7 +380,6 @@ to administrators of web servers in general. %patch110 %patch111 -p1 cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE - # install READMEs a=$(basename %{S:22}) cp %{S:22} ./${a##%{name}-}