rpms/pcre/devel pcre-7.3-multilib.patch, NONE, 1.1 pcre.spec, 1.24, 1.25

[Than Ngo (than)]

Author: than

Update of /cvs/extras/rpms/pcre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30305

Modified Files:
	pcre.spec 
Added Files:
	pcre-7.3-multilib.patch 
Log Message:
update to 7.3


pcre-7.3-multilib.patch:

--- NEW FILE pcre-7.3-multilib.patch ---
--- 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 at libdir@"
-  ;;
-  *BSD*)
-  libR=" -Wl,-R at 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 at libdir@$libR -lpcreposix -lpcre
+      echo -lpcreposix -lpcre
       ;;
     --libs)
-      echo -L at libdir@$libR -lpcre
+      echo -lpcre
       ;;
     *)
       echo "${usage}" 1>&2


Index: pcre.spec
===================================================================
RCS file: /cvs/extras/rpms/pcre/devel/pcre.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- pcre.spec	17 Sep 2007 13:37:55 -0000	1.24
+++ pcre.spec	17 Sep 2007 14:04:55 -0000	1.25
@@ -4,6 +4,7 @@
 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 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .multilib
+%patch -p1 -b .multilib
 
 %build
 %configure --enable-utf8 --enable-unicode-properties
@@ -68,7 +69,8 @@
 %{_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 @@
 %{_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 <than at redhat.com> - 7.3-1