- package libpcreposix.pc

- removed obsolete link patch

Changed files:
    pcre-link.patch -> 1.2
    pcre.spec -> 1.103

diff --git a/pcre-link.patch b/pcre-link.patch
deleted file mode 100644 (file)
index 1c57235..0000000
--- a/pcre-link.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- pcre-7.7/configure.ac.orig 2008-05-07 18:22:03.000000000 +0200
-+++ pcre-7.7/configure.ac      2008-06-17 19:40:42.879677506 +0200
-@@ -533,6 +533,8 @@
- AC_SUBST(EXTRA_LIBPCRE_LDFLAGS)
- AC_SUBST(EXTRA_LIBPCREPOSIX_LDFLAGS)
- AC_SUBST(EXTRA_LIBPCRECPP_LDFLAGS)
-+AC_SUBST(PCREGREP_LIBS)
-+AC_SUBST(PCRETEST_LIBS)
- 
- # When we run 'make distcheck', use these arguments.
- DISTCHECK_CONFIGURE_FLAGS="--enable-cpp --enable-unicode-properties"
-@@ -550,7 +552,7 @@
-     echo "** Cannot --enable-pcregrep-libz because libz was not found"
-     exit 1
-   fi
--  if test "$LIBS" = ""; then LIBS=-lz; else LIBS="$LIBS -lz"; fi
-+  if test "$PCREGREP_LIBS" = ""; then PCREGREP_LIBS=-lz; else PCREGREP_LIBS="$PCREGREP_LIBS -lz"; fi
- fi
- 
- if test "$enable_pcregrep_libbz2" = "yes"; then
-@@ -562,7 +564,7 @@
-     echo "** Cannot --enable-pcregrep-libbz2 because libbz2 was not found"
-     exit 1
-   fi
--  if test "$LIBS" = ""; then LIBS=-lbz2; else LIBS="$LIBS -lbz2"; fi
-+  if test "$PCREGREP_LIBS" = ""; then PCREGREP_LIBS=-lbz2; else PCREGREP_LIBS="$PCREGREP_LIBS -lbz2"; fi
- fi
- 
- # Similarly for --enable-pcretest-readline
-@@ -576,7 +578,7 @@
-     echo "** Cannot --enable-pcretest-readline because readline/history.h was not found."
-     exit 1
-   fi
--  if test "$LIBS" = ""; then LIBS=-lreadline; else LIBS="$LIBS -lreadline"; fi
-+  if test "$PCRETEST_LIBS" = ""; then PCRETEST_LIBS=-lreadline; else PCRETEST_LIBS="$PCRETEST_LIBS -lreadline"; fi
- fi
- 
- # Produce these files, in addition to config.h.
---- pcre-7.7/Makefile.am.orig  2008-01-23 18:58:28.000000000 +0100
-+++ pcre-7.7/Makefile.am       2008-06-17 19:43:11.376139837 +0200
-@@ -245,13 +245,13 @@
- EXTRA_DIST += RunTest.bat
- bin_PROGRAMS += pcretest
- pcretest_SOURCES = pcretest.c
--pcretest_LDADD = libpcreposix.la
-+pcretest_LDADD = libpcreposix.la $(PCRETEST_LIBS)
- 
- TESTS += RunGrepTest
- dist_noinst_SCRIPTS += RunGrepTest
- bin_PROGRAMS += pcregrep
- pcregrep_SOURCES = pcregrep.c
--pcregrep_LDADD = libpcreposix.la
-+pcregrep_LDADD = libpcreposix.la $(PCREGREP_LIBS)
- 
- EXTRA_DIST += \
-   testdata/grepinput \

diff --git a/pcre.spec b/pcre.spec
index da5772627be8ec4e15db5da79fa30390b8b3e12a..f776f992a302853becd02ccdbc51f9ea80e55e26 100644 (file)
--- a/pcre.spec
+++ b/pcre.spec
@@ -14,7 +14,6 @@ Group:                Libraries
 Source0:       ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2
 # Source0-md5: caf564aa69d68e965e9bf0ff2a094c65
 Patch0:                %{name}-pcreposix-glibc-conflict.patch
-Patch1:                %{name}-link.patch
 URL:           http://www.pcre.org/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake
@@ -178,7 +177,6 @@ Dokumentacja dla PCRE w formacie HTML.
 %prep
 %setup -q
 %patch0 -p1
-#%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -188,7 +186,7 @@ Dokumentacja dla PCRE w formacie HTML.
 %{__automake}
 %configure \
        CXXLDFLAGS="%{rpmldflags}" \
-       %{!?with_static_libs:--enable-static=no} \
+       %{!?with_static_libs:--disable-static} \
        --enable-utf8 \
        --enable-unicode-properties \
        --enable-pcregrep-libz \
@@ -247,6 +245,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/pcre.h
 %{_includedir}/pcreposix.h
 %{_pkgconfigdir}/libpcre.pc
+%{_pkgconfigdir}/libpcreposix.pc
 %{_mandir}/man1/pcre-config.1*
 %{_mandir}/man3/pcre*.3*
 %exclude %{_mandir}/man3/pcrecpp.3*