!1 Remove unnecessary patches

Merge pull request !1 from EulerOSWander/wonder_test
This commit is contained in:
openeuler-ci-bot 2020-01-08 11:38:05 +08:00 committed by Gitee
commit 50a756dfc8
2 changed files with 4 additions and 40 deletions

View File

@ -1,37 +0,0 @@
diff -up a/nspr/config/nspr-config.in.flags b/nspr/config/nspr-config.in
--- a/nspr/config/nspr-config.in.flags 2013-05-29 13:46:34.147971410 -0700
+++ b/nspr/config/nspr-config.in 2013-05-29 14:17:10.990838914 -0700
@@ -102,7 +102,7 @@ if test -z "$includedir"; then
includedir=@includedir@
fi
if test -z "$libdir"; then
- libdir=@libdir@
+ libdir=`pkg-config --variable=libdir nspr`
fi
if test "$echo_prefix" = "yes"; then
@@ -136,12 +136,12 @@ if test "$echo_libs" = "yes"; then
if test -n "$lib_nspr"; then
libdirs="$libdirs -lnspr${major_version}"
fi
- os_ldflags="@LDFLAGS@"
+ os_ldflags=`pkg-config --variable=ldflags nspr`
for i in $os_ldflags ; do
if echo $i | grep \^-L >/dev/null; then
libdirs="$libdirs $i"
fi
done
- echo $libdirs @OS_LIBS@
+ echo $libdirs `pkg-config --variable=os_libs nspr`
fi
diff -up a/nspr/config/nspr.pc.in.flags b/nspr/config/nspr.pc.in
--- a/nspr/config/nspr.pc.in.flags 2013-05-29 13:48:15.026643570 -0700
+++ b/nspr/config/nspr.pc.in 2013-05-29 13:49:47.795202949 -0700
@@ -6,5 +6,5 @@ includedir=@includedir@
Name: NSPR
Description: The Netscape Portable Runtime
Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@
-Libs: -L@libdir@ -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@
+Libs: -L@libdir@ -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ @OS_LIBS@
Cflags: -I@includedir@

View File

@ -1,7 +1,7 @@
%global nspr_version 4.20
Name: nspr
Version: 4.20.0
Release: 3
Release: 4
Summary: Netscape Portable Runtime
License: MPLv2.0
URL: http://www.mozilla.org/projects/nspr
@ -9,8 +9,6 @@ BuildRequires: gcc git
Source0: %{name}-%{nspr_version}.tar.gz
Source1: nspr-config.xml
Patch1: nspr-config-pc.patch
Patch6000: 6000-Bug-1525173-prbith-should-use-builtin-function-on-aarch64.patch
%description
@ -85,6 +83,9 @@ install -c -m 644 nspr-config.1 $RPM_BUILD_ROOT%{_mandir}/man1/nspr-config.1
%{_mandir}/man*/*
%changelog
* Wed Jan 8 2020 hewenliang <hewenliang4@huawei.com> - 4.20.0-4
- Remove unecessary patches.
* Fri Dec 20 2019 openEuler Buildteam <buildteam@openeuler.org> - 4.20.0-3
- Fix ldconfig scriptlets