From dc80525941826db6e2a5797a0acb8783f75879a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 14 Feb 2017 11:26:18 +0100 Subject: [PATCH] Add Patch2 to fix detection of zlib --- R-3.3.2-fix-zlib-detection.patch | 571 +++++++++++++++++++++++++++++++ R.spec | 8 +- 2 files changed, 578 insertions(+), 1 deletion(-) create mode 100644 R-3.3.2-fix-zlib-detection.patch diff --git a/R-3.3.2-fix-zlib-detection.patch b/R-3.3.2-fix-zlib-detection.patch new file mode 100644 index 0000000..1da639e --- /dev/null +++ b/R-3.3.2-fix-zlib-detection.patch @@ -0,0 +1,571 @@ +From a0fe05ce9d0937ad2334bb370785cb22c71e592b Mon Sep 17 00:00:00 2001 +From: lawrence +Date: Wed, 4 Jan 2017 03:57:31 +0000 +Subject: [PATCH] R_ZLIB macro tests ZLIB_VERNUM to handle zlib 1.2.10 (6 + chars) + +Thanks to George Hartzell for the fix. + + +git-svn-id: https://svn.r-project.org/R/trunk@71889 00db46b3-68df-0310-9c12-caf00c1e9a41 +--- + m4/R.m4 | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +Index: R-3.3.2/m4/R.m4 +=================================================================== +--- R-3.3.2.orig/m4/R.m4 ++++ R-3.3.2/m4/R.m4 +@@ -3113,10 +3113,11 @@ AC_DEFUN([_R_HEADER_ZLIB], + #include + #include + int main() { +-#ifdef ZLIB_VERSION +-/* Work around Debian bug: it uses 1.2.3.4 even though there was no such +- version on the master site zlib.net */ +- exit(strncmp(ZLIB_VERSION, "1.2.5", 5) < 0); ++#ifdef ZLIB_VERNUM ++ if (ZLIB_VERNUM < 0x1250) { ++ exit(1); ++ } ++ exit(0); + #else + exit(1); + #endif +Index: R-3.3.2/configure +=================================================================== +--- R-3.3.2.orig/configure ++++ R-3.3.2/configure +@@ -1767,11 +1767,10 @@ Optional Features: + --enable-java enable Java [yes] + --enable-byte-compiled-packages + byte-compile base and recommended packages [yes] +- --enable-static[=PKGS] (libtool) build static libraries [default=no] +- --enable-shared[=PKGS] (libtool) build shared libraries [default=yes] ++ --enable-static[=PKGS] build static libraries [default=no] ++ --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-fast-install[=PKGS] +- (libtool) optimize for fast installation +- [default=yes] ++ optimize for fast installation [default=yes] + --disable-libtool-lock avoid locking (might break parallel builds) + --enable-long-double use long double type [yes] + --disable-openmp do not use OpenMP +@@ -1809,11 +1808,11 @@ Optional Packages: + --with-recommended-packages + use/install recommended R packages [yes] + --with-ICU use ICU library (if available) [yes] +- --with-pic[=PKGS] (libtool) try to use only PIC/non-PIC objects +- [default=use both] ++ --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use ++ both] + --with-aix-soname=aix|svr4|both +- (libtool( shared library versioning (aka "SONAME") +- variant to provide on AIX, [default=aix]. ++ shared library versioning (aka "SONAME") variant to ++ provide on AIX, [default=aix]. + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). +@@ -3525,6 +3524,7 @@ ac_configure="$SHELL $ac_aux_dir/configu + + + ++ + ### * Information on the package. + + PACKAGE=${PACKAGE_NAME} +@@ -15038,6 +15038,9 @@ fi + # before this can be enabled. + hardcode_into_libs=yes + ++ # Add ABI-specific directories to the system library path. ++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" ++ + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command +@@ -15046,7 +15049,7 @@ fi + # appending ld.so.conf contents (and includes) to the search path. + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -19000,6 +19003,9 @@ fi + # before this can be enabled. + hardcode_into_libs=yes + ++ # Add ABI-specific directories to the system library path. ++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" ++ + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command +@@ -19008,7 +19014,7 @@ fi + # appending ld.so.conf contents (and includes) to the search path. + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -21950,6 +21956,9 @@ fi + # before this can be enabled. + hardcode_into_libs=yes + ++ # Add ABI-specific directories to the system library path. ++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" ++ + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command +@@ -21958,7 +21967,7 @@ fi + # appending ld.so.conf contents (and includes) to the search path. + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -25065,7 +25074,7 @@ _ACEOF + # flags. + r_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $r_verb" +-(eval echo $as_me:25068: \"$ac_link\") >&5 ++(eval echo $as_me:25077: \"$ac_link\") >&5 + r_c_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'` + echo "$r_c_v_output" >&5 + CFLAGS=$r_save_CFLAGS +@@ -25140,7 +25149,7 @@ _ACEOF + # flags. + r_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $r_cv_prog_c_v" +-(eval echo $as_me:25143: \"$ac_link\") >&5 ++(eval echo $as_me:25152: \"$ac_link\") >&5 + r_c_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'` + echo "$r_c_v_output" >&5 + CFLAGS=$r_save_CFLAGS +@@ -35507,10 +35516,11 @@ else + #include + #include + int main() { +-#ifdef ZLIB_VERSION +-/* Work around Debian bug: it uses 1.2.3.4 even though there was no such +- version on the master site zlib.net */ +- exit(strncmp(ZLIB_VERSION, "1.2.5", 5) < 0); ++#ifdef ZLIB_VERNUM ++ if (ZLIB_VERNUM < 0x1250) { ++ exit(1); ++ } ++ exit(0); + #else + exit(1); + #endif +@@ -40840,6 +40850,9 @@ fi + # before this can be enabled. + hardcode_into_libs=yes + ++ # Add ABI-specific directories to the system library path. ++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" ++ + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command +@@ -40848,7 +40861,7 @@ fi + # appending ld.so.conf contents (and includes) to the search path. + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +Index: R-3.3.2/tools/missing +=================================================================== +--- R-3.3.2.orig/tools/missing ++++ /dev/null +@@ -1,367 +0,0 @@ +-#! /bin/sh +-# Common stub for a few missing GNU programs while installing. +- +-scriptversion=2006-05-10.23 +- +-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 +-# Free Software Foundation, Inc. +-# Originally by Fran,cois Pinard , 1996. +- +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +-# 02110-1301, USA. +- +-# As a special exception to the GNU General Public License, if you +-# distribute this file as part of a program that contains a +-# configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. +- +-if test $# -eq 0; then +- echo 1>&2 "Try \`$0 --help' for more information" +- exit 1 +-fi +- +-run=: +-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +-sed_minuso='s/.* -o \([^ ]*\).*/\1/p' +- +-# In the cases where this matters, `missing' is being run in the +-# srcdir already. +-if test -f configure.ac; then +- configure_ac=configure.ac +-else +- configure_ac=configure.in +-fi +- +-msg="missing on your system" +- +-case $1 in +---run) +- # Try to run requested program, and just exit if it succeeds. +- run= +- shift +- "$@" && exit 0 +- # Exit code 63 means version mismatch. This often happens +- # when the user try to use an ancient version of a tool on +- # a file that requires a minimum version. In this case we +- # we should proceed has if the program had been absent, or +- # if --run hadn't been passed. +- if test $? = 63; then +- run=: +- msg="probably too old" +- fi +- ;; +- +- -h|--h|--he|--hel|--help) +- echo "\ +-$0 [OPTION]... PROGRAM [ARGUMENT]... +- +-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +-error status if there is no known handling for PROGRAM. +- +-Options: +- -h, --help display this help and exit +- -v, --version output version information and exit +- --run try to run the given command, and emulate it if it fails +- +-Supported PROGRAM values: +- aclocal touch file \`aclocal.m4' +- autoconf touch file \`configure' +- autoheader touch file \`config.h.in' +- autom4te touch the output file, or create a stub one +- automake touch all \`Makefile.in' files +- bison create \`y.tab.[ch]', if possible, from existing .[ch] +- flex create \`lex.yy.c', if possible, from existing .c +- help2man touch the output file +- lex create \`lex.yy.c', if possible, from existing .c +- makeinfo touch the output file +- tar try tar, gnutar, gtar, then tar without non-portable flags +- yacc create \`y.tab.[ch]', if possible, from existing .[ch] +- +-Send bug reports to ." +- exit $? +- ;; +- +- -v|--v|--ve|--ver|--vers|--versi|--versio|--version) +- echo "missing $scriptversion (GNU Automake)" +- exit $? +- ;; +- +- -*) +- echo 1>&2 "$0: Unknown \`$1' option" +- echo 1>&2 "Try \`$0 --help' for more information" +- exit 1 +- ;; +- +-esac +- +-# Now exit if we have it, but it failed. Also exit now if we +-# don't have it and --version was passed (most likely to detect +-# the program). +-case $1 in +- lex|yacc) +- # Not GNU programs, they don't have --version. +- ;; +- +- tar) +- if test -n "$run"; then +- echo 1>&2 "ERROR: \`tar' requires --run" +- exit 1 +- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then +- exit 1 +- fi +- ;; +- +- *) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then +- # Could not run --version or --help. This is probably someone +- # running `$TOOL --version' or `$TOOL --help' to check whether +- # $TOOL exists and not knowing $TOOL uses missing. +- exit 1 +- fi +- ;; +-esac +- +-# If it does not exist, or fails to run (possibly an outdated version), +-# try to emulate it. +-case $1 in +- aclocal*) +- echo 1>&2 "\ +-WARNING: \`$1' is $msg. You should only need it if +- you modified \`acinclude.m4' or \`${configure_ac}'. You might want +- to install the \`Automake' and \`Perl' packages. Grab them from +- any GNU archive site." +- touch aclocal.m4 +- ;; +- +- autoconf) +- echo 1>&2 "\ +-WARNING: \`$1' is $msg. You should only need it if +- you modified \`${configure_ac}'. You might want to install the +- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU +- archive site." +- touch configure +- ;; +- +- autoheader) +- echo 1>&2 "\ +-WARNING: \`$1' is $msg. You should only need it if +- you modified \`acconfig.h' or \`${configure_ac}'. You might want +- to install the \`Autoconf' and \`GNU m4' packages. Grab them +- from any GNU archive site." +- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` +- test -z "$files" && files="config.h" +- touch_files= +- for f in $files; do +- case $f in +- *:*) touch_files="$touch_files "`echo "$f" | +- sed -e 's/^[^:]*://' -e 's/:.*//'`;; +- *) touch_files="$touch_files $f.in";; +- esac +- done +- touch $touch_files +- ;; +- +- automake*) +- echo 1>&2 "\ +-WARNING: \`$1' is $msg. You should only need it if +- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. +- You might want to install the \`Automake' and \`Perl' packages. +- Grab them from any GNU archive site." +- find . -type f -name Makefile.am -print | +- sed 's/\.am$/.in/' | +- while read f; do touch "$f"; done +- ;; +- +- autom4te) +- echo 1>&2 "\ +-WARNING: \`$1' is needed, but is $msg. +- You might have modified some files without having the +- proper tools for further handling them. +- You can get \`$1' as part of \`Autoconf' from any GNU +- archive site." +- +- file=`echo "$*" | sed -n "$sed_output"` +- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` +- if test -f "$file"; then +- touch $file +- else +- test -z "$file" || exec >$file +- echo "#! /bin/sh" +- echo "# Created by GNU Automake missing as a replacement of" +- echo "# $ $@" +- echo "exit 0" +- chmod +x $file +- exit 1 +- fi +- ;; +- +- bison|yacc) +- echo 1>&2 "\ +-WARNING: \`$1' $msg. You should only need it if +- you modified a \`.y' file. You may need the \`Bison' package +- in order for those modifications to take effect. You can get +- \`Bison' from any GNU archive site." +- rm -f y.tab.c y.tab.h +- if test $# -ne 1; then +- eval LASTARG="\${$#}" +- case $LASTARG in +- *.y) +- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` +- if test -f "$SRCFILE"; then +- cp "$SRCFILE" y.tab.c +- fi +- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` +- if test -f "$SRCFILE"; then +- cp "$SRCFILE" y.tab.h +- fi +- ;; +- esac +- fi +- if test ! -f y.tab.h; then +- echo >y.tab.h +- fi +- if test ! -f y.tab.c; then +- echo 'main() { return 0; }' >y.tab.c +- fi +- ;; +- +- lex|flex) +- echo 1>&2 "\ +-WARNING: \`$1' is $msg. You should only need it if +- you modified a \`.l' file. You may need the \`Flex' package +- in order for those modifications to take effect. You can get +- \`Flex' from any GNU archive site." +- rm -f lex.yy.c +- if test $# -ne 1; then +- eval LASTARG="\${$#}" +- case $LASTARG in +- *.l) +- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` +- if test -f "$SRCFILE"; then +- cp "$SRCFILE" lex.yy.c +- fi +- ;; +- esac +- fi +- if test ! -f lex.yy.c; then +- echo 'main() { return 0; }' >lex.yy.c +- fi +- ;; +- +- help2man) +- echo 1>&2 "\ +-WARNING: \`$1' is $msg. You should only need it if +- you modified a dependency of a manual page. You may need the +- \`Help2man' package in order for those modifications to take +- effect. You can get \`Help2man' from any GNU archive site." +- +- file=`echo "$*" | sed -n "$sed_output"` +- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` +- if test -f "$file"; then +- touch $file +- else +- test -z "$file" || exec >$file +- echo ".ab help2man is required to generate this page" +- exit 1 +- fi +- ;; +- +- makeinfo) +- echo 1>&2 "\ +-WARNING: \`$1' is $msg. You should only need it if +- you modified a \`.texi' or \`.texinfo' file, or any other file +- indirectly affecting the aspect of the manual. The spurious +- call might also be the consequence of using a buggy \`make' (AIX, +- DU, IRIX). You might want to install the \`Texinfo' package or +- the \`GNU make' package. Grab either from any GNU archive site." +- # The file to touch is that specified with -o ... +- file=`echo "$*" | sed -n "$sed_output"` +- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` +- if test -z "$file"; then +- # ... or it is the one specified with @setfilename ... +- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` +- file=`sed -n ' +- /^@setfilename/{ +- s/.* \([^ ]*\) *$/\1/ +- p +- q +- }' $infile` +- # ... or it is derived from the source name (dir/f.texi becomes f.info) +- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info +- fi +- # If the file does not exist, the user really needs makeinfo; +- # let's fail without touching anything. +- test -f $file || exit 1 +- touch $file +- ;; +- +- tar) +- shift +- +- # We have already tried tar in the generic part. +- # Look for gnutar/gtar before invocation to avoid ugly error +- # messages. +- if (gnutar --version > /dev/null 2>&1); then +- gnutar "$@" && exit 0 +- fi +- if (gtar --version > /dev/null 2>&1); then +- gtar "$@" && exit 0 +- fi +- firstarg="$1" +- if shift; then +- case $firstarg in +- *o*) +- firstarg=`echo "$firstarg" | sed s/o//` +- tar "$firstarg" "$@" && exit 0 +- ;; +- esac +- case $firstarg in +- *h*) +- firstarg=`echo "$firstarg" | sed s/h//` +- tar "$firstarg" "$@" && exit 0 +- ;; +- esac +- fi +- +- echo 1>&2 "\ +-WARNING: I can't seem to be able to run \`tar' with the given arguments. +- You may want to install GNU tar or Free paxutils, or check the +- command line arguments." +- exit 1 +- ;; +- +- *) +- echo 1>&2 "\ +-WARNING: \`$1' is needed, and is $msg. +- You might have modified some files without having the +- proper tools for further handling them. Check the \`README' file, +- it often tells you about the needed prerequisites for installing +- this package. You may also peek at any GNU archive site, in case +- some other package would contain this missing \`$1' program." +- exit 1 +- ;; +-esac +- +-exit 0 +- +-# Local variables: +-# eval: (add-hook 'write-file-hooks 'time-stamp) +-# time-stamp-start: "scriptversion=" +-# time-stamp-format: "%:y-%02m-%02d.%02H" +-# time-stamp-end: "$" +-# End: +Index: R-3.3.2/configure.ac +=================================================================== +--- R-3.3.2.orig/configure.ac ++++ R-3.3.2/configure.ac +@@ -33,6 +33,7 @@ m4_define([R_VERSION], + AC_INIT([R],[R_VERSION],[https://bugs.r-project.org],[R],[https://www.r-project.org]) + AC_CONFIG_SRCDIR([src/include/Defn.h]) + AC_CONFIG_AUX_DIR([tools]) ++AC_CONFIG_MACRO_DIRS([m4]) + + ### * Information on the package. + diff --git a/R.spec b/R.spec index 23110b8..a5678a2 100644 --- a/R.spec +++ b/R.spec @@ -96,7 +96,7 @@ Name: R Version: 3.3.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: ftp://cran.r-project.org/pub/R/src/base/R-3/R-%{version}.tar.gz @@ -147,6 +147,8 @@ BuildRequires: stunnel Patch0: 0001-Disable-backing-store-in-X11-window.patch # see https://bugzilla.redhat.com/show_bug.cgi?id=1324145 Patch1: R-3.3.0-fix-java_path-in-javareconf.patch +# see https://bugzilla.redhat.com/show_bug.cgi?id=1418471#c5 +Patch2: https://github.com/wch/r-source/commit/a0fe05ce9d0937ad2334bb370785cb22c71e592b.patch#/R-3.3.2-fix-zlib-detection.patch License: GPLv2+ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -439,6 +441,7 @@ from the R project. This package provides the static libRmath library. %endif %patch0 -p1 -b .disable-backing-store %patch1 -p1 -b .fixpath +%patch2 -p1 -b .zlib-detection # Filter false positive provides. cat < %{name}-prov @@ -1168,6 +1171,9 @@ R CMD javareconf \ %{_libdir}/libRmath.a %changelog +* Tue Feb 14 2017 Björn Esser - 3.3.2-7 +- Add Patch2 to fix detection of zlib + * Fri Feb 10 2017 Fedora Release Engineering - 3.3.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild