apr: Update to 1.7.2

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/apr-util/apr-util.nm b/apr-util/apr-util.nm
index ebd24b2870da8b2369e845fdb7c8f8c3846b5e41..62e95450a1f19181ba621caa834decd48cf79b91 100644 (file)
--- a/apr-util/apr-util.nm
+++ b/apr-util/apr-util.nm
@@ -5,7 +5,7 @@
 
 name       = apr-util
 version    = 1.6.1
-release    = 1
+release    = 2
 
 groups     = System/Libraries
 url        = https://apr.apache.org/
@@ -22,10 +22,10 @@ source_dl  = https://www.apache.org/dist/apr/
 
 build
        requires
+               apr-devel
                autoconf
                libdb-devel
                expat-devel
-               libapr-devel
                libuuid-devel
                openssl-devel
        end

diff --git a/libapr/libapr.nm b/apr/apr.nm
similarity index 71%
rename from libapr/libapr.nm
rename to apr/apr.nm
index 5554b2f7938b98d14b4d88d4e555ea327f290bbb..a2709ac35c28c1f96731e39c91639b68c48cd0bf 100644 (file)
--- a/libapr/libapr.nm
+++ b/apr/apr.nm
@@ -3,15 +3,14 @@
 # Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
 ###############################################################################
 
-name       = libapr
-version    = 1.5.2
+name       = apr
+version    = 1.7.2
 release    = 1
-thisapp    = apr-%{version}
 
 groups     = System/Libraries
-url        = ttp://apr.apache.org/
+url        = https://apr.apache.org/
 license    = ASL 2.0
-summary    = Apache Portable Runtime library.
+summary    = Apache Portable Runtime library
 
 description
        The mission of the Apache Portable Runtime (APR) is to provide a
@@ -19,7 +18,7 @@ description
        portability layer to as many operating systems as possible.
 end
 
-source_dl  = http://www.apache.org/dist/apr/
+source_dl  = https://www.apache.org/dist/apr/
 
 build
        requires
@@ -28,11 +27,6 @@ build
 
        configure_options += \
                --with-devrandom=/dev/urandom
-
-       install_cmds
-               # Remove unneded file.
-               rm -rvf %{BUILDROOT}/usr/lib/apr.exp
-       end
 end
 
 packages
@@ -40,9 +34,9 @@ packages
 
        package %{name}-devel
                template DEVEL
+       end
 
-               files += \
-                       /usr/bin \
-                       /usr/share
+       package %{name}-debuginfo
+               template DEBUGINFO
        end
 end