Accepting request 624289 from home:pluskalm:branches:devel:libraries:c_c++

- Drop conditions for old distributions
- Do profile guided build

OBS-URL: https://build.opensuse.org/request/show/624289
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/pcre2?expand=0&rev=26

pcre2.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul 20 14:05:01 UTC 2018 - mpluskal@suse.com
+
+- Drop conditions for old distributions
+- Do profile guided build
+
 -------------------------------------------------------------------
 Sun Feb 18 05:15:03 UTC 2018 - avindra@opensuse.org
 

pcre2.spec

@@ -16,14 +16,13 @@
 #
 
 
-%define with_libedit 0%{?suse_version} > 1110
 Name:           pcre2
 Version:        10.31
 Release:        0
 Summary:        A library for Perl-compatible regular expressions
 License:        BSD-3-Clause
 Group:          Development/Libraries/C and C++
-Url:            https://www.pcre.org/
+URL:            https://www.pcre.org/
 #SVN-Clone:	svn://vcs.exim.org/pcre/code/trunk
 Source:         https://ftp.pcre.org/pub/pcre/%{name}-%{version}.tar.bz2
 Source2:        https://ftp.pcre.org/pub/pcre/%{name}-%{version}.tar.bz2.sig
@@ -35,12 +34,10 @@ BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc-c++
 BuildRequires:  libbz2-devel
+BuildRequires:  libedit-devel
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  zlib-devel
-%if %{with_libedit}
-BuildRequires:  libedit-devel
-%endif
 
 %description
 The PCRE2 library is a set of functions that implement regular
@@ -142,9 +139,7 @@ pcre2-posix provides a POSIX-compatible API to the PCRE2 engine.
 %package doc
 Summary:        A library for Perl-compatible regular expressions
 Group:          Documentation/HTML
-%if 0%{?suse_version} >= 1120
 BuildArch:      noarch
-%endif
 
 %description doc
 The PCRE2 library is a set of functions that implement regular
@@ -176,7 +171,7 @@ API.
 autoreconf -fiv
 export LDFLAGS="-Wl,-z,relro,-z,now"
 %configure \
-%ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le mips sparc
+%ifarch %{ix86} x86_64 %{arm} ppc ppc64 ppc64le mips sparc
 	    --enable-jit \
 %endif
 	    --enable-static \
@@ -187,11 +182,18 @@ export LDFLAGS="-Wl,-z,relro,-z,now"
 	    --enable-pcre2-32 \
 	    --enable-pcre2grep-libz \
 	    --enable-pcre2grep-libbz2 \
-%if %{with_libedit}
 	    --enable-pcre2test-libedit \
-%endif
 	    --enable-unicode
-make %{?_smp_mflags} V=1
+
+%if 0%{?do_profiling}
+  make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}" V=1
+  export LANG=POSIX
+  make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}" check
+  make %{?_smp_mflags} clean
+  make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_feedback}" V=1
+%else
+  make %{?_smp_mflags} CFLAGS="%{optflags}"
+%endif
 
 %install
 %make_install
@@ -214,7 +216,8 @@ make check -j1
 %postun -n libpcre2-posix2 -p /sbin/ldconfig
 
 %files -n libpcre2-8-0
-%doc AUTHORS COPYING ChangeLog LICENCE NEWS README
+%license COPYING
+%doc AUTHORS ChangeLog LICENCE NEWS README
 %{_libdir}/libpcre2-8.so.*
 
 %files -n libpcre2-16-0
@@ -233,11 +236,12 @@ make check -j1
 %doc LICENCE
 %{_bindir}/pcre2grep
 %{_bindir}/pcre2test
-%{_mandir}/man1/pcre2grep.1%{ext_man}
+%{_mandir}/man1/pcre2grep.1%{?ext_man}
-%{_mandir}/man1/pcre2test.1%{ext_man}
+%{_mandir}/man1/pcre2test.1%{?ext_man}
 
 %files doc
-%doc AUTHORS COPYING ChangeLog LICENCE NEWS README
+%license COPYING
+%doc AUTHORS ChangeLog LICENCE NEWS README
 %doc doc/html doc/*.txt
 %doc %{_defaultdocdir}/pcre2-doc
 
@@ -250,7 +254,7 @@ make check -j1
 %{_libdir}/pkgconfig/libpcre2-16.pc
 %{_libdir}/pkgconfig/libpcre2-32.pc
 %{_libdir}/pkgconfig/libpcre2-posix.pc
-%{_mandir}/man1/pcre2-config.1%{ext_man}
+%{_mandir}/man1/pcre2-config.1%{?ext_man}
 %{_mandir}/man3/*%{ext_man}
 
 %files devel-static