From 121c371dba07f934c39a8a1bdad27d8c701ee0e8 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@fedoraproject.org>
Date: Wed, 1 Oct 2008 11:12:12 +0000
Subject: [PATCH] - Update to 7.8, drop upstreamed patches - Fix destination of
 documentation (#427763) - Use buildroot macro consistently - Separate the
 static library, as per current Guidelines - Satisfy rpmlint

---
 .cvsignore |  7 +-----
 pcre.spec  | 62 ++++++++++++++++++++++++++++++++++--------------------
 sources    |  2 +-
 3 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index f3ad195..0d14331 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,6 +1 @@
-pcre-4.5.tar.bz2
-pcre-5.0.tar.bz2
-pcre-6.3.tar.bz2
-pcre-6.6.tar.bz2
-pcre-6.7.tar.bz2
-pcre-7.3.tar.bz2
+pcre-7.8.tar.bz2
diff --git a/pcre.spec b/pcre.spec
index 5458929..199932b 100644
--- a/pcre.spec
+++ b/pcre.spec
@@ -1,15 +1,13 @@
 Name: pcre
-Version: 7.3
-Release: 4%{?dist}
+Version: 7.8
+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
-Patch1: pcre-7.3-CVE-2008-0674.patch
-Patch2: pcre-7.3-CVE-2008-2371.patch
 License: BSD
 Group: System Environment/Libraries
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
 Perl-compatible regular expression library.
@@ -25,34 +23,45 @@ Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description devel
-Development files (Headers, libraries for static linking, etc) for %{name}.
+Development files (Headers, libraries for dynamic linking, etc) for %{name}.
+
+%package static
+Summary: Static library for %{name}
+Group: Development/Libraries
+
+%description static
+Library for static linking for %{name}.
 
 %prep
 %setup -q
 %patch0 -p1 -b .multilib
-# backport from the upstream 7.6
-%patch1 -p1 -b .CVE-2008-0674
-# not yet applied in upstream SVN (2008-07-04)
-%patch2 -p1 -b .CVE-2008-2371
 
 %build
 %configure --enable-utf8 --enable-unicode-properties
 
+# 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
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=%{buildroot}
+make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p %{buildroot}/%{_lib}
-mv %{buildroot}%{_libdir}/libpcre.so.* %{buildroot}/%{_lib}/
-pushd %{buildroot}%{_libdir}
+mkdir -p $RPM_BUILD_ROOT/%{_lib}
+mv $RPM_BUILD_ROOT%{_libdir}/libpcre.so.* $RPM_BUILD_ROOT/%{_lib}/
+pushd $RPM_BUILD_ROOT%{_libdir}
 ln -fs ../../%{_lib}/libpcre.so.0 libpcre.so
 popd
 
 # get rid of unneeded *.la files
-rm -f %{buildroot}%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+# These are handled by %%doc in %%files
+rm -rf $RPM_BUILD_ROOT%{_docdir}/pcre
 
 %check
 make check
@@ -62,7 +71,7 @@ make check
 %postun -p /sbin/ldconfig
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
@@ -71,23 +80,30 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 %{_bindir}/pcregrep
 %{_bindir}/pcretest
-%doc %{_docdir}/pcre/LICENCE
-%doc %{_docdir}/pcre/AUTHORS
+%doc AUTHORS COPYING LICENCE NEWS README ChangeLog
 
 %files devel
 %defattr(-,root,root)
 %{_libdir}/*.so
-%{_libdir}/*.a
 %{_libdir}/pkgconfig/*
 %{_includedir}/*.h
 %{_mandir}/man3/*
 %{_bindir}/pcre-config
-%doc %{_docdir}/pcre
-%exclude %{_docdir}/pcre/LICENCE
-%exclude %{_docdir}/pcre/AUTHORS
+%doc doc/*.txt doc/html
+%doc HACKING
 
+%files static
+%defattr(-,root,root)
+%{_libdir}/*.a
 
 %changelog
+* Wed Oct 1 2008 Lubomir Rintel <lkundrak@v3.sk> - 7.8-1
+- Update to 7.8, drop upstreamed patches
+- Fix destination of documentation (#427763)
+- Use buildroot macro consistently
+- Separate the static library, as per current Guidelines
+- Satisfy rpmlint
+
 * Fri Jul  4 2008 Tomas Hoger <thoger@redhat.com> - 7.3-4
 - Apply Tavis Ormandy's patch for CVE-2008-2371.
 
diff --git a/sources b/sources
index de15e3c..b14fd31 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-08b48bf97ff84a9dea07d6be518f0046  pcre-7.3.tar.bz2
+141132d6af14dccc7b08fa797e4fd441  pcre-7.8.tar.bz2