From 38e83c5257b784437f6786d488b3ec7dd18a25a5eeb1b06107eeda57c15ea312 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 5 Jun 2009 20:56:59 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grep?expand=0&rev=12 --- grep.changes | 5 +++++ grep.spec | 13 +++++++------ pcre-static.patch | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/grep.changes b/grep.changes index 32e5cde..52c00ae 100644 --- a/grep.changes +++ b/grep.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 4 17:41:19 CEST 2009 - crrodriguez@suse.de + +- link pcre library dynamically + ------------------------------------------------------------------- Wed Feb 11 14:09:00 CET 2009 - schwab@suse.de diff --git a/grep.spec b/grep.spec index ac09469..97faa2c 100644 --- a/grep.spec +++ b/grep.spec @@ -26,7 +26,7 @@ Provides: base:/usr/bin/grep AutoReqProv: on PreReq: %{install_info_prereq} Version: 2.5.4 -Release: 1 +Release: 2 Summary: Print lines matching a pattern Source: grep-%{version}.tar.bz2 Patch: grep-%{version}.diff @@ -63,11 +63,10 @@ rm -f m4/header.m4 m4/install.m4 m4/isc-posix.m4 m4/largefile.m4 m4/missing.m4 m %build AUTOPOINT=true autoreconf --force --install -./configure CFLAGS="$RPM_OPT_FLAGS" \ - --prefix=/usr --mandir=%{_mandir} --infodir=%{_infodir} \ - --bindir=/bin --build=%{_target_cpu}-suse-linux \ - --without-included-regex -make +%configure --bindir=/bin --without-included-regex +%{__make} %{?jobs:-j%jobs} + +%check make check VERBOSE=1 %install @@ -93,6 +92,8 @@ ln -sf ../../bin/grep $RPM_BUILD_ROOT/usr/bin/grep %doc %{_infodir}/*.gz %changelog +* Thu Jun 04 2009 crrodriguez@suse.de +- link pcre library dynamically * Wed Feb 11 2009 schwab@suse.de - Update to grep 2.5.4. * This is a bugfix release. No new features. diff --git a/pcre-static.patch b/pcre-static.patch index a6b5d21..e5c5e2e 100644 --- a/pcre-static.patch +++ b/pcre-static.patch @@ -5,7 +5,7 @@ if pcre-config --cflags >/dev/null 2>&1; then CPPFLAGS="$CPPFLAGS `pcre-config --cflags`" - LIBS="$LIBS `pcre-config --libs`" -+ LIBS="$LIBS -Wl,-Bstatic `pcre-config --libs` -Wl,-Bdynamic" ++ LIBS="$LIBS `pcre-config --libs`" fi - AC_CHECK_LIB(pcre, pcre_exec) + AC_SEARCH_LIBS(pcre_exec, pcre, [AC_DEFINE(HAVE_LIBPCRE, 1, [Define to 1 if you have the `pcre' library (-lpcre).])])