diff --git a/pcre-7.3-multilib.patch b/pcre-7.3-multilib.patch new file mode 100644 index 0000000..203dd1f --- /dev/null +++ b/pcre-7.3-multilib.patch @@ -0,0 +1,32 @@ +--- pcre-7.3/pcre-config.in.orig 2007-09-17 15:58:11.000000000 +0200 ++++ pcre-7.3/pcre-config.in 2007-09-17 16:02:50.000000000 +0200 +@@ -12,16 +12,6 @@ + exit 1 + fi + +-libR= +-case `uname -s` in +- *SunOS*) +- libR=" -R@libdir@" +- ;; +- *BSD*) +- libR=" -Wl,-R@libdir@" +- ;; +-esac +- + while test $# -gt 0; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; +@@ -55,10 +45,10 @@ + echo $includes + ;; + --libs-posix) +- echo -L@libdir@$libR -lpcreposix -lpcre ++ echo -lpcreposix -lpcre + ;; + --libs) +- echo -L@libdir@$libR -lpcre ++ echo -lpcre + ;; + *) + echo "${usage}" 1>&2 diff --git a/pcre.spec b/pcre.spec index c785c59..17cf928 100644 --- a/pcre.spec +++ b/pcre.spec @@ -4,6 +4,7 @@ Release: 1 Summary: Perl-compatible regular expression library URL: http://www.pcre.org/ Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2 +Patch: pcre-7.3-multilib.patch License: BSD Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -28,7 +29,7 @@ Development files (Headers, libraries for static linking, etc) for %{name}. %prep %setup -q -%patch1 -p1 -b .multilib +%patch -p1 -b .multilib %build %configure --enable-utf8 --enable-unicode-properties @@ -68,7 +69,8 @@ rm -rf %{buildroot} %{_mandir}/man1/* %{_bindir}/pcregrep %{_bindir}/pcretest -%doc LICENCE AUTHORS +%doc %{_docdir}/pcre/LICENCE +%doc %{_docdir}/pcre/AUTHORS %files devel %defattr(-,root,root) @@ -78,6 +80,10 @@ rm -rf %{buildroot} %{_includedir}/*.h %{_mandir}/man3/* %{_bindir}/pcre-config +%doc %{_docdir}/pcre +%exclude %{_docdir}/pcre/LICENCE +%exclude %{_docdir}/pcre/AUTHORS + %changelog * Mon Sep 17 2007 Than Ngo - 7.3-1