Discard previous changes

This commit is contained in:
Josef Ridky 2017-07-12 14:13:01 +02:00
parent 48804d810d
commit 425cd5d366
2 changed files with 1 additions and 35 deletions

View File

@ -1,28 +0,0 @@
diff -urNp old/configure new/configure
--- old/configure 2017-07-11 15:24:33.579767286 +0200
+++ new/configure 2017-07-12 08:50:28.375913913 +0200
@@ -23743,8 +23743,8 @@ $as_echo "#define HAVE_BROKEN_LIBMYSQLCL
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- CPPFLAGS="${_cppflags}"
- LIBS="${_libs}"
+# CPPFLAGS="${_cppflags}"
+# LIBS="${_libs}"
cat >> configure-summary << EOF
MYSQL Trap Logging: enabled
diff -urNp old/configure.d/config_os_libs2 new/configure.d/config_os_libs2
--- old/configure.d/config_os_libs2 2017-07-11 15:24:14.268853962 +0200
+++ new/configure.d/config_os_libs2 2017-07-12 08:47:11.270052282 +0200
@@ -485,8 +485,8 @@ if test "x$with_mysql" = "xyes" ; then
[AC_MSG_RESULT(no)
AC_DEFINE([HAVE_BROKEN_LIBMYSQLCLIENT], 1,
[Define if using MY_INIT() causes a linker error])])
- CPPFLAGS="${_cppflags}"
- LIBS="${_libs}"
+# CPPFLAGS="${_cppflags}"
+# LIBS="${_libs}"
AC_MSG_CACHE_ADD(MYSQL Trap Logging: enabled)
else
AC_MSG_CACHE_ADD(MYSQL Trap Logging: unavailable)

View File

@ -11,7 +11,7 @@
Summary: A collection of SNMP protocol tools and libraries
Name: net-snmp
Version: 5.7.3
Release: 17%{?dist}
Release: 16%{?dist}
Epoch: 1
License: BSD
@ -51,8 +51,6 @@ Patch14: net-snmp-5.7.3-Remove-U64-typedef.patch
Patch15: net-snmp-5.7.3-Fix-Makefile-PL.patch
# Use strtok_r for strtok to avoid a race condition
Patch16: net-snmp-5.7.3-strtok-r.patch
# Fix missing linking to libmysqlclient library
Patch17: net-snmp-5.7.3-mysqllib.patch
# This patch fix issue with new OpenSLL library in rawhide (f26+)
# !!!WARNING!!! DO NOT USE IT FOR OLDER FEDORA RELEASES (>f26)
@ -230,7 +228,6 @@ cp %{SOURCE12} .
%patch14 -p1 -b .U64
%patch15 -p1 -b .make
%patch16 -p1 -b .strtok-r
%patch17 -p1 -b .mysqllib
%patch100 -p1 -b .openssl
%ifarch sparc64 s390 s390x
@ -539,9 +536,6 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
* Wed Jul 12 2017 Josef Ridky <jridky@redhat.com> - 1:5.7.3-17
- Fix missing linking to libmysqlclient library (#1470004)
* Sun Jun 04 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1:5.7.3-16
- Perl 5.26 rebuild