Hello community,
here is the log from the commit of package pcre for openSUSE:Factory checked in
at 2012-02-10 17:18:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pcre (Old)
and /work/SRC/openSUSE:Factory/.pcre.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcre", Maintainer is "co...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pcre/pcre.changes 2011-11-16
17:21:11.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pcre.new/pcre.changes 2012-02-10
17:18:38.000000000 +0100
@@ -1,0 +2,17 @@
+Tue Feb 7 15:10:59 UTC 2012 - crrodrig...@opensuse.org
+
+- fix baselibs
+
+-------------------------------------------------------------------
+Tue Feb 7 04:40:59 UTC 2012 - crrodrig...@opensuse.org
+
+- Update to PCRE 8.30, upstream SONAME bump, libpcre1
+- Drop no longer needed ppc patch.
+- move library back to %{_libdir}
+
+-------------------------------------------------------------------
+Wed Feb 1 10:44:38 UTC 2012 - dval...@suse.com
+
+- Fix cache-flush on PPC
+
+-------------------------------------------------------------------
Old:
----
pcre-8.20.tar.bz2
New:
----
pcre-8.30.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pcre.spec ++++++
--- /var/tmp/diff_new_pack.WGhZc8/_old 2012-02-10 17:18:39.000000000 +0100
+++ /var/tmp/diff_new_pack.WGhZc8/_new 2012-02-10 17:18:39.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package pcre
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,15 +15,15 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: pcre
-BuildRequires: gcc-c++ libtool pkg-config
-Version: 8.20
-Release: 1
+BuildRequires: gcc-c++
+BuildRequires: libtool
+BuildRequires: pkg-config
+Version: 8.30
+Release: 0
Summary: A library for Perl-compatible regular expressions
-License: BSD3c(or similar) ; Other uncritical OpenSource License
+License: BSD-3-Clause
Group: System/Libraries
# bug437293
%ifarch ppc64
@@ -43,11 +43,10 @@
as Perl 5.
%package devel
-License: BSD3c(or similar) ; Other uncritical OpenSource License
Summary: A library for Perl-compatible regular expressions
Group: System/Libraries
Requires: libstdc++-devel
-Requires: libpcre0 = %{version}
+Requires: libpcre1 = %{version}
Requires: libpcreposix0 = %{version}
Requires: libpcrecpp0 = %{version}
# bug437293
@@ -61,20 +60,18 @@
expression pattern matching using the same syntax and semantics
as Perl 5.
-%package -n libpcre0
-License: BSD3c(or similar) ; Other uncritical OpenSource License
+%package -n libpcre1
Summary: A library for Perl-compatible regular expressions
Group: System/Libraries
Provides: %{name} = %{version}
Obsoletes: %{name} < %{version}
-%description -n libpcre0
+%description -n libpcre1
The PCRE library is a set of functions that implement regular
expression pattern matching using the same syntax and semantics
as Perl 5.
%package -n libpcreposix0
-License: BSD3c(or similar) ; Other uncritical OpenSource License
Summary: A library for Perl-compatible regular expressions
Group: System/Libraries
@@ -84,7 +81,6 @@
as Perl 5.
%package -n libpcrecpp0
-License: BSD3c(or similar) ; Other uncritical OpenSource License
Summary: A library for Perl-compatible regular expressions
Group: System/Libraries
@@ -94,7 +90,6 @@
as Perl 5.
%package doc
-License: BSD3c(or similar) ; Other uncritical OpenSource License
Summary: A library for Perl-compatible regular expressions
Group: System/Libraries
%if 0%{?suse_version} >= 1120
@@ -107,7 +102,6 @@
as Perl 5.
%package tools
-License: BSD3c(or similar) ; Other uncritical OpenSource License
Summary: A library for Perl-compatible regular expressions
Group: System/Libraries
Recommends: %{name}-doc
@@ -137,14 +131,15 @@
mv %{buildroot}/usr/share/doc/pcre %{buildroot}/%{_defaultdocdir}/pcre-doc
#empty dependecy_libs
%{__rm} -f %{buildroot}%{_libdir}/*.la
-#move pcre and pcreposix library into /lib
-%{__mkdir_p} %{buildroot}/%{_lib}
-for l in libpcre libpcreposix; do
- ldest=$(readlink %{buildroot}/%{_libdir}/$l.so)
- mv %{buildroot}%{_libdir}/$l.so.* %{buildroot}/%{_lib}
- #update the symlinks for linking.
- %{__ln_s} -vf /%{_lib}/$ldest %{buildroot}%{_libdir}/$l.so
-done
+
+#ove pcre and pcreposix library into /lib
+#%{__mkdir_p} %{buildroot}/%{_lib}
+#for l in libpcre libpcreposix; do
+# ldest=$(readlink %{buildroot}/%{_libdir}/$l.so)
+# mv %{buildroot}%{_libdir}/$l.so.* %{buildroot}/%{_lib}
+# #update the symlinks for linking.
+# %{__ln_s} -vf /%{_lib}/$ldest %{buildroot}%{_libdir}/$l.so
+#done
%check
export LANG=POSIX
@@ -157,9 +152,9 @@
%clean
%{__rm} -rf %{buildroot}
-%post -n libpcre0 -p /sbin/ldconfig
+%post -n libpcre1 -p /sbin/ldconfig
-%postun -n libpcre0 -p /sbin/ldconfig
+%postun -n libpcre1 -p /sbin/ldconfig
%post -n libpcrecpp0 -p /sbin/ldconfig
@@ -169,10 +164,10 @@
%postun -n libpcreposix0 -p /sbin/ldconfig
-%files -n libpcre0
+%files -n libpcre1
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog LICENCE NEWS README
-/%{_lib}/libpcre.so.*
+%{_libdir}/libpcre.so.*
%files -n libpcrecpp0
%defattr(-,root,root)
@@ -180,7 +175,7 @@
%files -n libpcreposix0
%defattr(-,root,root)
-/%{_lib}/libpcreposix.so.*
+%{_libdir}/libpcreposix.so.*
%files tools
%defattr(-,root,root)
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.WGhZc8/_old 2012-02-10 17:18:39.000000000 +0100
+++ /var/tmp/diff_new_pack.WGhZc8/_new 2012-02-10 17:18:39.000000000 +0100
@@ -1,4 +1,4 @@
-libpcre0
+libpcre1
libpcreposix0
libpcrecpp0
provides "pcre-<targettype> = <version>"
++++++ pcre-8.20.tar.bz2 -> pcre-8.30.tar.bz2 ++++++
++++ 111399 lines of diff (skipped)
++++++ pcre-visibility.patch ++++++
--- /var/tmp/diff_new_pack.WGhZc8/_old 2012-02-10 17:18:40.000000000 +0100
+++ /var/tmp/diff_new_pack.WGhZc8/_new 2012-02-10 17:18:40.000000000 +0100
@@ -1,19 +1,31 @@
-Index: configure.ac
-===================================================================
---- configure.ac (revisión: 741)
-+++ configure.ac (copia de trabajo)
-@@ -42,6 +42,7 @@
-
- AC_PROG_CC
+--- configure.ac.orig
++++ configure.ac
+@@ -45,8 +45,12 @@ AC_CONFIG_MACRO_DIR([m4])
+ remember_set_CFLAGS="$CFLAGS"
+ remember_set_CXXFLAGS="$CXXFLAGS"
+
+-AC_PROG_CC
++AC_PROG_CC_STDC
++AC_USE_SYSTEM_EXTENSIONS
++AC_SYS_LARGEFILE
++AM_PROG_CC_C_O
AC_PROG_CXX
+PCRE_VISIBILITY
if test "x$remember_set_CFLAGS" = "x"
then
-Index: m4/visibility.m4
-===================================================================
---- m4/visibility.m4 (revisión: 0)
-+++ m4/visibility.m4 (revisión: 0)
+@@ -80,8 +84,7 @@ AC_LANG_POP
+ AC_TYPE_INT64_T
+
+ AC_PROG_INSTALL
+-AC_LIBTOOL_WIN32_DLL
+-LT_INIT
++LT_INIT([win32-dll pic-only disable-static])
+ AC_PROG_LN_S
+
+ PCRE_MAJOR="pcre_major"
+--- /dev/null
++++ m4/visibility.m4
@@ -0,0 +1,89 @@
+# visibility.m4 serial 4 (gettext-0.18.2)
+dnl Copyright (C) 2005, 2008, 2010-2011 Free Software Foundation, Inc.
@@ -104,32 +116,42 @@
+ AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY],
+ [Define to 1 or 0, depending whether the compiler supports simple
visibility declarations.])
+])
-Index: Makefile.am
-===================================================================
---- Makefile.am (revisión: 741)
-+++ Makefile.am (copia de trabajo)
-@@ -171,6 +171,9 @@
-
- ## The main pcre library
+--- Makefile.am.orig
++++ Makefile.am
+@@ -178,6 +178,9 @@ BUILT_SOURCES = pcre_chartables.c
+ # Build the 8 bit library if it is enabled.
+ if WITH_PCRE8
lib_LTLIBRARIES += libpcre.la
+
+libpcre_la_CFLAGS = $(CFLAG_VISIBILITY)
+
libpcre_la_SOURCES = \
+ pcre_byte_order.c \
pcre_compile.c \
- pcre_config.c \
-@@ -224,7 +227,7 @@
- sljit/sljitNativeX86_common.c \
+@@ -211,6 +214,7 @@ endif # WITH_PCRE8
+ # Build the 16 bit library if it is enabled.
+ if WITH_PCRE16
+ lib_LTLIBRARIES += libpcre16.la
++libpcre16_la_CFLAGS = $(CFLAG_VISIBILITY)
+ libpcre16_la_SOURCES = \
+ pcre16_byte_order.c \
+ pcre16_chartables.c \
+@@ -266,10 +270,10 @@ EXTRA_DIST += \
sljit/sljitUtils.c
+ if WITH_PCRE8
-libpcre_la_LDFLAGS = $(EXTRA_LIBPCRE_LDFLAGS)
+libpcre_la_LDFLAGS = -no-undefined $(EXTRA_LIBPCRE_LDFLAGS)
+ endif # WITH_PCRE8
+ if WITH_PCRE16
+-libpcre16_la_LDFLAGS = $(EXTRA_LIBPCRE16_LDFLAGS)
++libpcre16_la_LDFLAGS = -no-undefined $(EXTRA_LIBPCRE16_LDFLAGS)
+ endif # WITH_PCRE16
CLEANFILES += pcre_chartables.c
-
-@@ -238,21 +241,23 @@
-
+@@ -291,9 +295,10 @@ endif # WITH_JIT
## A version of the main pcre library that has a posix re API.
+ if WITH_PCRE8
lib_LTLIBRARIES += libpcreposix.la
+libpcreposix_la_CFLAGS = $(CFLAG_VISIBILITY)
libpcreposix_la_SOURCES = \
@@ -137,12 +159,13 @@
-libpcreposix_la_LDFLAGS = $(EXTRA_LIBPCREPOSIX_LDFLAGS)
+libpcreposix_la_LDFLAGS = -no-undefined $(EXTRA_LIBPCREPOSIX_LDFLAGS)
libpcreposix_la_LIBADD = libpcre.la
+ endif # WITH_PCRE8
- ## There's a C++ library as well.
+@@ -301,12 +306,13 @@ endif # WITH_PCRE8
if WITH_PCRE_CPP
lib_LTLIBRARIES += libpcrecpp.la
-+libpcrecpp_la_CXXFLAGS = $(CFLAG_VISIBILITY) $(CXXFLAG_INLINES_HIDDEN)
++libpcrecpp_la_CXXFLAGS = $(CFLAG_VISIBILITY)
libpcrecpp_la_SOURCES = \
pcrecpp_internal.h \
pcrecpp.cc \
@@ -153,12 +176,11 @@
libpcrecpp_la_LIBADD = libpcre.la
TESTS += pcrecpp_unittest
-@@ -288,7 +293,7 @@
+@@ -350,6 +356,7 @@ if WITH_PCRE8
+ TESTS += RunGrepTest
dist_noinst_SCRIPTS += RunGrepTest
bin_PROGRAMS += pcregrep
++pcregrep_CFLAGS = -fwhole-program
pcregrep_SOURCES = pcregrep.c
--pcregrep_LDADD = libpcreposix.la $(LIBZ) $(LIBBZ2)
-+pcregrep_LDADD = libpcreposix.la libpcre.la $(LIBZ) $(LIBBZ2)
-
- EXTRA_DIST += \
- testdata/grepinput \
+ pcregrep_LDADD = $(LIBZ) $(LIBBZ2)
+ pcregrep_LDADD += libpcreposix.la
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
