!1 Delete useless files.

Merge pull request !1 from Sdrkun/eutest
This commit is contained in:
openeuler-ci-bot 2020-01-13 21:49:01 +08:00 committed by Gitee
commit 9cdb98cbce
3 changed files with 4 additions and 39 deletions

View File

@ -1,25 +0,0 @@
--- apr-util-1.2.7/Makefile.in.pkgconf
+++ apr-util-1.2.7/Makefile.in
@@ -51,7 +51,7 @@
# Create apu-config script suitable for the install tree
apu-config.out: $(APU_CONFIG)
- sed 's,^\(location=\).*$$,\1installed,' < $(APU_CONFIG) > $@
+ sed 's,^\(location=\).*$$,\1installed,;s,^\(APR_.*_DIR\)=.*,\1="$${libdir}/build",' < $(APU_CONFIG) > $@
install: $(TARGETS) install-modules
$(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
--- apr-util-1.2.7/apu-config.in.pkgconf
+++ apr-util-1.2.7/apu-config.in
@@ -24,9 +24,10 @@
prefix="@prefix@"
exec_prefix="@exec_prefix@"
bindir="@bindir@"
-libdir="@libdir@"
includedir="@includedir@"
+libdir=`pkg-config --variable=libdir apr-util-@APRUTIL_MAJOR_VERSION@`
+
LIBS="@APRUTIL_EXPORT_LIBS@"
INCLUDES="@APRUTIL_INCLUDES@"
LDFLAGS="@APRUTIL_LDFLAGS@"

View File

@ -1,10 +0,0 @@
--- apr-util-1.4.1/apr-util.pc.in~ 2008-05-23 16:27:37.000000000 -0500
+++ apr-util-1.4.1/apr-util.pc.in 2013-02-07 08:55:09.717312176 -0600
@@ -9,5 +9,6 @@
Version: @APRUTIL_DOTTED_VERSION@
# assume that apr-util requires libapr of same major version
Requires: apr-@APRUTIL_MAJOR_VERSION@
-Libs: -L${libdir} -l@APRUTIL_LIBNAME@ @LDADD_ldap@ @APRUTIL_EXPORT_LIBS@
+Libs: -L${libdir} -l@APRUTIL_LIBNAME@ @LDADD_ldap@
+Libs.private: @APRUTIL_EXPORT_LIBS@
Cflags: -I${includedir}

View File

@ -2,15 +2,12 @@
Name: apr-util
Version: 1.6.1
Release: 10
Release: 11
Summary: apr-util provides a number of helpful abstractions on top of APR.
License: ASL 2.0
URL: http://apr.apache.org
Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
Patch0: apr-util-1.2.7-pkgconf.patch
Patch1: apr-util-1.4.1-private.patch
Patch6000: Updated-patch-to-compile-apr-util-against-mariadb-10.patch
Patch6001: Merge-r1822315-from-trunk.patch
Patch6002: Fix-error-handling-in-gdbm.patch
@ -126,6 +123,9 @@ make test
%{_libdir}/%{name}-%{apuver}/apr_dbd_odbc*
%changelog
* Mon Jan 13 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.6.1-11
- Delete useless files.
* Tue Oct 22 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.6.1-10
- optimize spec file.