From db2a4cdfd1c9ef0c488d02fc3cb654aa0d21d54a9fff871ad73f349dd086d5f7 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 9 Aug 2007 18:48:36 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pcre?expand=0&rev=9 --- pcre.changes | 7 ++++++ pcre.spec | 67 +++++++++++++++++++++++++++++----------------------- 2 files changed, 44 insertions(+), 30 deletions(-) diff --git a/pcre.changes b/pcre.changes index 6c1c37e..905365c 100644 --- a/pcre.changes +++ b/pcre.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 8 12:46:16 CEST 2007 - ms@suse.de + +- added fix to run ldconfig for libpcre*, Thanks to + Cristian Rodriguez who provided + the patch (#298291) + ------------------------------------------------------------------- Mon Jul 23 15:22:40 CEST 2007 - ms@suse.de diff --git a/pcre.spec b/pcre.spec index f34c85a..1e1ca30 100644 --- a/pcre.spec +++ b/pcre.spec @@ -13,7 +13,7 @@ Name: pcre BuildRequires: gcc-c++ Version: 7.2 -Release: 1 +Release: 5 Summary: A library for Perl-compatible regular expressions License: BSD 3-Clause, Other uncritical OpenSource License, PCRE LICENCE Group: System/Libraries @@ -22,11 +22,6 @@ URL: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ Source: %name-%version.tar.bz2 Patch0: %name-%version.assert_fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%package devel -Summary: A library for Perl-compatible regular expressions -Autoreqprov: on -Group: System/Libraries -Requires: pcre libstdc++-devel %description The PCRE library is a set of functions that implement regular @@ -40,6 +35,10 @@ Authors: -------- Philip Hazel +%package devel +Summary: A library for Perl-compatible regular expressions +Group: System/Libraries +Requires: pcre = %{version} libstdc++-devel %description devel The PCRE library is a set of functions that implement regular @@ -58,17 +57,22 @@ Authors: %patch0 -p1 %build -export CFLAGS="$RPM_OPT_FLAGS -fstack-protector" -export CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector" -./configure --mandir=%_mandir \ - --prefix=%_prefix \ - --libdir=%_libdir \ +export CFLAGS="$RPM_OPT_FLAGS" +export CXXFLAGS="$RPM_OPT_FLAGS" +%configure \ --with-link-size=2 \ --with-match-limit=10000000 \ --enable-newline-is-lf \ --enable-utf8 \ --enable-unicode-properties -make +%{__make} %{?jobs:-j%jobs} + +%install +%{__make} DESTDIR=%{buildroot} install +%{__mkdir_p} %{buildroot}/%{_defaultdocdir} +mv %{buildroot}/usr/share/doc/pcre %{buildroot}/%{_defaultdocdir}/pcre + +%check export LANG=POSIX %ifarch %arm make test || echo make test failed @@ -76,35 +80,38 @@ make test || echo make test failed make test %endif -%install -make DESTDIR=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir} -mv $RPM_BUILD_ROOT/usr/share/doc/pcre $RPM_BUILD_ROOT/%{_defaultdocdir}/pcre - %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog INSTALL LICENCE NEWS NON-UNIX-USE README %doc doc/html doc/*.txt -%_libdir/*.so.* -/usr/bin/pcregrep -/usr/bin/pcretest -%_mandir/man1/*.gz +%{_libdir}/*.so.* +%{_bindir}/pcregrep +%{_bindir}/pcretest +%doc %{_mandir}/man1/*.gz %files devel %defattr(-,root,root) -/usr/bin/pcre-config -/usr/include/* -%_libdir/*.so -%_libdir/*.a -%_libdir/*.la -%_libdir/pkgconfig/libpcre.pc -%_libdir/pkgconfig/libpcrecpp.pc -%_mandir/man3/*.gz +%{_bindir}/pcre-config +%{_includedir}/* +%{_libdir}/*.so +%{_libdir}/*.a +%{_libdir}/*.la +%{_libdir}/pkgconfig/libpcre.pc +%{_libdir}/pkgconfig/libpcrecpp.pc +%doc %{_mandir}/man3/*.gz %changelog +* Wed Aug 08 2007 - ms@suse.de +- added fix to run ldconfig for libpcre*, Thanks to + Cristian Rodriguez who provided + the patch (#298291) * Mon Jul 23 2007 - ms@suse.de - update to version 7.2, fixes bug: (#293752) - Changes from 7.1 to 7.2