rpms/pcre/devel pcre-8.10-multilib.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 pcre.spec, 1.32, 1.33 sources, 1.12, 1.13 pcre-7.3-CVE-2008-0674.patch, 1.1, NONE pcre-7.3-CVE-2008-2371.patch, 1.1, NONE pcre-7.3-multilib.patch, 1.1, NONE

[Petr Pisar]

Author: ppisar

Update of /cvs/pkgs/rpms/pcre/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26952

Modified Files:
	.cvsignore pcre.spec sources 
Added Files:
	pcre-8.10-multilib.patch 
Removed Files:
	pcre-7.3-CVE-2008-0674.patch pcre-7.3-CVE-2008-2371.patch 
	pcre-7.3-multilib.patch 
Log Message:
Resolves: #612635 - 8.10 bump

pcre-8.10-multilib.patch:
 pcre-config.in |   16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

--- NEW FILE pcre-8.10-multilib.patch ---
diff -Naur pcre-8.10.orig/pcre-config.in pcre-8.10/pcre-config.in
--- pcre-8.10.orig/pcre-config.in	2010-03-02 12:08:45.000000000 +0100
+++ pcre-8.10/pcre-config.in	2010-07-12 14:15:30.666700210 +0200
@@ -15,16 +15,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]*=//'` ;;
@@ -58,14 +48,14 @@
       echo $includes @PCRE_STATIC_CFLAG@
       ;;
     --libs-posix)
-      echo -L at libdir@$libR -lpcreposix -lpcre
+      echo -lpcreposix -lpcre
       ;;
     --libs)
-      echo -L at libdir@$libR -lpcre
+      echo -lpcre
       ;;
     --libs-cpp)
       if test @enable_cpp@ = yes ; then
-        echo -L at libdir@$libR -lpcrecpp -lpcre
+        echo -lpcrecpp -lpcre
       else
         echo "${usage}" 1>&2
       fi


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pcre/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	1 Oct 2008 11:12:12 -0000	1.11
+++ .cvsignore	12 Jul 2010 14:39:12 -0000	1.12
@@ -1 +1 @@
-pcre-7.8.tar.bz2
+pcre-8.10.tar.bz2


Index: pcre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcre/devel/pcre.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- pcre.spec	8 Jul 2010 17:13:05 -0000	1.32
+++ pcre.spec	12 Jul 2010 14:39:14 -0000	1.33
@@ -1,13 +1,15 @@
 Name: pcre
-Version: 7.8
-Release: 4%{?dist}
+Version: 8.10
+Release: 1%{?dist}
 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
-Patch0: pcre-7.3-multilib.patch
+Patch0: pcre-8.10-multilib.patch
 License: BSD
 Group: System Environment/Libraries
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+# New libtool to get rid of rpath
+BuildRequires: autoconf, automake, libtool
 
 %description
 Perl-compatible regular expression library.
@@ -34,18 +36,18 @@ Library for static linking for %{name}.
 
 %prep
 %setup -q
+# Get rid of rpath
 %patch0 -p1 -b .multilib
+libtoolize --copy --force && autoreconf
+# One contributor's name is non-UTF-8
+for F in ChangeLog; do
+    iconv -f latin1 -t utf8 "$F" >"${F}.utf8"
+    touch --reference "$F" "${F}.utf8"
+    mv "${F}.utf8" "$F"
+done
 
 %build
 %configure --enable-utf8 --enable-unicode-properties
-sed -i -e 's|^\(hardcode_libdir_flag_spec=\).*|\1""|g' \
-    -e 's|^\(runpath_var=\)LD_RUN_PATH|\1DIE_RPATH_DIE|g' libtool
-
-# One contributor's name is non-utf8
-iconv -f latin1 -t utf8 ChangeLog >ChangeLog.utf8
-touch --reference ChangeLog ChangeLog.utf8
-mv ChangeLog.utf8 ChangeLog
-
 make %{?_smp_mflags}
 
 %install
@@ -97,9 +99,15 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(-,root,root)
 %{_libdir}/*.a
-%doc COPYING
+%doc COPYING LICENCE 
 
 %changelog
+* Mon Jul 12 2010 Petr Pisar <ppisar at redhat.com> - 8.10-1
+- 8.10 bump (bug #612635)
+- Add LICENCE to static subpackage because COPYING refers to it
+- Remove useless rpath by using new libtool (simple sed does not work anymore
+  because tests need to link against just-compiled library in %%check phase)
+
 * Thu Jul 08 2010 Petr Pisar <ppisar at redhat.com> - 7.8-4
 - Add COPYING to static subpackage
 - Remove useless rpath


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pcre/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	1 Oct 2008 11:12:12 -0000	1.12
+++ sources	12 Jul 2010 14:39:14 -0000	1.13
@@ -1 +1 @@
-141132d6af14dccc7b08fa797e4fd441  pcre-7.8.tar.bz2
+780867a700e9d4e4b9cb47aa5453e4b2  pcre-8.10.tar.bz2


--- pcre-7.3-CVE-2008-0674.patch DELETED ---


--- pcre-7.3-CVE-2008-2371.patch DELETED ---


--- pcre-7.3-multilib.patch DELETED ---