/[packages]/cauldron/pcre/current/SPECS/pcre.spec

Diff of /cauldron/pcre/current/SPECS/pcre.spec

Parent Directory | Revision Log | View Patch Patch

-revision 187740 by fwang,
Mon Dec 26 07:09:01 2011 UTC
+revision 668946 by diogenese,
Thu Aug 28 04:17:11 2014 UTC
 Line 1
- %define major 0
+ %define pcre_major 1
+ %define pcrecpp_major 0
  %define pcreposix_major 1
- %define libname_orig    lib%{name}
+ %define pcreposix_compat_major 0
- %define libname %mklibname pcre %{major}
+ %define libname_orig lib%{name}
+ %define libname16_orig lib%{name}16
+ %define libname32_orig lib%{name}32
+ %define libname %mklibname pcre %{pcre_major}
+ %define libname16 %mklibname pcre 16 %{pcrecpp_major}
+ %define libname32 %mklibname pcre 32 %{pcrecpp_major}
+ %define libnamecpp %mklibname pcrecpp %{pcrecpp_major}
+ %define libnameposix %mklibname pcreposix %{pcreposix_major}
+ %define libnameposix_compat %mklibname pcreposix %{pcreposix_compat_major}
  %define develname %mklibname -d pcre
+ %define develcpp %mklibname -d pcrecpp
+ %define develposix %mklibname -d pcreposix
+ %define olddevelname %mklibname %{name} 0 -d
  %define build_pcreposix_compat 1
  Summary:        Perl-compatible regular expression library
  Name:           pcre
- Version:        8.21
+ Version:        8.35
- Release:        %mkrel 1
+ Release:        %mkrel 2
  License:        BSD-Style
  Group:          File tools
  URL:            http://www.pcre.org/
- Source0:        http://downloads.sourceforge.net/pcre/%{name}-%{version}.tar.bz2
+ Source0:        ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2
- Source1:        http://downloads.sourceforge.net/pcre/%{name}-%{version}.tar.bz2.sig
+ Source1:        ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2.sig
  Requires:       %{libname} = %{version}-%{release}
  BuildRequires:  automake
- Patch1:         pcre-0.6.5-fix-detect-into-kdelibs.patch
+ Patch0:         pcre-0.6.5-fix-detect-into-kdelibs.patch
- Patch2:         pcre-linkage_fix.diff
+ Patch1:         pcre-8.33-linkage-fix.patch
- Patch3:         pcre-7.8-format_not_a_string_literal_and_no_format_arguments.diff
  # from debian:
  Patch4:         pcre-pcreposix-glibc-conflict.patch
+ # from fedora
+ # upstream bug #1463
+ Patch5:         pcre-8.35-Do-not-rely-on-wrapping-signed-integer-while-parsein.patch
+ # upstream bug #1492
+ Patch6:         pcre-8.35-Fix-bad-starting-data-when-char-with-more-than-one-o.patch
+ # upstream bug #1493
+ Patch7:         pcre-8.35-Fix-not-including-VT-in-starting-characters-for-s.patch
+ # upstream bug #1494
+ Patch8:         pcre-8.35-Fix-bad-compile-of-Qx-.-where-x-is-any-character.patch
+ # upstream bug #1500
+ Patch9:         pcre-8.35-Fix-empty-matching-possessive-zero-repeat-groups-bug.patch
+ # upstream bug #1502
+ Patch10:        pcre-8.35-Fixed-several-memory-leaks-in-pcregrep.patch
+ # upstream bug #1503
+ Patch11:        pcre-8.35-Fix-compiler-crash-misbehaviour-for-zero-repeated-gr.patch
+ # upstream bug #1515
+ Patch12:        pcre-8.35-Fix-compile-time-loop-for-recursive-reference-within.patch
  %description
  PCRE has its own native API, but a set of "wrapper" functions that are based on
-Line 33 
 This package contains a grep variant bas
+Line 62 
 This package contains a grep variant bas
  %package -n     %{libname}
  Group:          System/Libraries
  Summary:        Perl-compatible regular expression library
+ Requires(pre):  filesystem >= 2.1.9-18
  Provides:       %{libname_orig} = %{version}-%{release}
- Conflicts:      pcre <= 4.0
  %description -n %{libname}
- PCRE has its own native API, but a set of "wrapper" functions that are based on
+ This package contains the shared library libpcre.
- the POSIX API are also supplied in the library libpcreposix. Note that this
- just provides a POSIX calling interface to PCRE: the regular expressions
+ %package -n %{libname16}
- themselves still follow Perl syntax and semantics. The header file
+ Group:          System/Libraries
- for the POSIX-style functions is called pcreposix.h. The official POSIX name is
+ Summary:        Perl-compatible regular expression library
- regex.h, but I didn't want to risk possible problems with existing files of
+ Requires(pre):  filesystem >= 2.1.9-18
- that name by distributing it that way. To use it with an existing program that
+ Provides:       %{libname16_orig} = %{version}-%{release}
- uses the POSIX API, it will have to be renamed or pointed at by a link.
+ Obsoletes:      %{_lib}pcre16_1 < %{version}-%{release}
+ %description -n %{libname16}
+ This package contains the shared library libpcre.
+ %package -n %{libname32}
+ Group:          System/Libraries
+ Summary:        Perl-compatible regular expression library
+ Requires(pre):  filesystem >= 2.1.9-18
+ Provides:       %{libname32_orig} = %{version}-%{release}
+ Obsoletes:      %{_lib}pcre32_1 < %{version}-%{release}
+ %description -n %{libname32}
+ This package contains the shared library libpcre.
+ %package -n     %{libnamecpp}
+ Group:          System/Libraries
+ Summary:        Perl-compatible regular expression library
+ Conflicts:      %{_lib}pcre0 < 8.21-3
+ %description -n %{libnamecpp}
+ This package contains the shared library libpcrecpp.
+ %package -n     %{libnameposix}
+ Group:          System/Libraries
+ Summary:        Perl-compatible regular expression library
+ Conflicts:      %{_lib}pcre0 < 8.21-3
+ %description -n %{libnameposix}
+ This package contains the shared library libpcreposix.
+ %package -n     %{libnameposix_compat}
+ Group:          System/Libraries
+ Summary:        Perl-compatible regular expression library
+ Conflicts:      %{_lib}pcre0 < 8.21-3
+ %description -n %{libnameposix_compat}
+ This package contains the shared library libpcreposix compat.
  %package -n     %{develname}
  Group:          Development/C
  Summary:        Headers and static lib for pcre development
  Requires:       %{libname} = %{version}-%{release}
+ Requires:       %{libname16} = %{version}-%{release}
+ Requires:       %{libname32} = %{version}-%{release}
  Provides:       %{libname_orig}-devel = %{version}-%{release}
  Provides:       %{name}-devel = %{version}-%{release}
- Obsoletes:      %mklibname pcre 0 -d
+ Obsoletes:      %{olddevelname} < 8.21-3
- Conflicts:      pcre <= 4.0
  %description -n %{develname}
  Install this package if you want do compile applications using the pcre
  library.
- %prep
+ %package -n %{develcpp}
+ Group:          Development/C++
+ Summary:        Headers and static lib for pcrecpp development
+ Provides:       pcrecpp-devel = %{version}-%{release}
+ Requires:       %{libnamecpp} = %{version}-%{release}
+ Requires:       %{develname} = %{version}-%{release}
+ Conflicts:      pcre-devel < 8.32-4
- %setup -q
+ %description -n %{develcpp}
- %patch1 -p1 -b .detect_into_kdelibs
+ Install this package if you want do compile applications using the pcrecpp
- %patch2 -p0
+ library.
+ %package -n %{develposix}
+ Group:          Development/C
+ Summary:        Headers and static lib for pcreposix development
+ Provides:       pcreposix-devel = %{version}-%{release}
+ Requires:       %{libnameposix} = %{version}-%{release}
+ Requires:       %{develname} = %{version}-%{release}
+ Conflicts:      pcre-devel < 8.32-4
+ %description -n %{develposix}
+ Install this package if you want do compile applications using the pcre
+ library.
+ The header file for the POSIX-style functions is called pcreposix.h. The
+ official POSIX name is regex.h, but I didn't want to risk possible problems
+ with existing files of that name by distributing it that way. To use it with an
+ existing program that uses the POSIX API, it will have to be renamed or pointed
+ at by a link.
+ %prep
+ %setup -q
+ %patch0 -p1 -b .detect-into-kdelibs
+ %patch1 -p1 -b .linkage-fix
+ %patch5 -p1 -b .do-not-rely
+ %patch6 -p1 -b .bad-start
+ %patch7 -p1 -b .vt-not-included
+ %patch8 -p1 -b .bad-Qx-compile
+ %patch9 -p1 -b .empty-matching
+ %patch10 -p1 -b .memory-leaks
+ %patch11 -p1 -b .zero-grs
+ %patch12 -p1 -b .recurse-within
  %if %{build_pcreposix_compat}
    # pcre-pcreposix-glibc-conflict patch below breaks compatibility,
-Line 83 
 for i in $dirs; do
+Line 189 
 for i in $dirs; do
    cd $i
    mkdir -p m4
    autoreconf -fi
-   %configure2_5x --enable-utf8 --enable-unicode-properties
+   %configure2_5x \
+         --disable-static \
+         --enable-utf \
+         --enable-unicode-properties \
+         --enable-pcre8 \
+         --enable-pcre16 \
+         --enable-pcre32 \
+         --enable-jit
    %make
    cd -
  done
  %check
  export LC_ALL=C
- # Tests, patch out actual pcre_study_size in expected results
- #echo 'int main() { printf("%d", sizeof(pcre_study_data)); return 0; }' | \
- #%{__cc} -xc - -include "pcre_internal.h" -I. -o study_size
- #STUDY_SIZE=`./study_size`
- #perl -pi -e "s,(Study size\s+=\s+)\d+,\${1}$STUDY_SIZE," testdata/testoutput*
  make check
  %install
-Line 105 
 make check
+Line 213 
 make check
  %multiarch_binaries %{buildroot}%{_bindir}/pcre-config
- mkdir -p %{buildroot}/%_lib
- mv %{buildroot}/%_libdir/lib%{name}.so.%{major}.* $RPM_BUILD_ROOT/%_lib
- cd %{buildroot}/%_libdir
- ln -s ../../%_lib/lib%{name}.so.%{major}.* .
  # Remove unwanted files
- rm -f %{buildroot}/%_docdir/pcre/{AUTHORS,ChangeLog,COPYING,LICENCE,NEWS}
+ rm -f %{buildroot}%{_docdir}/pcre/{AUTHORS,ChangeLog,COPYING,LICENCE,NEWS}
- rm -f %{buildroot}/%_docdir/pcre/{pcre-config.txt,pcre.txt,pcregrep.txt}
+ rm -f %{buildroot}%{_docdir}/pcre/{pcre-config.txt,pcre.txt,pcregrep.txt}
- rm -f %{buildroot}/%_docdir/pcre/{pcretest.txt,README}
+ rm -f %{buildroot}%{_docdir}/pcre/{pcretest.txt,README}
- rm -rf %{buildroot}/%_docdir/pcre/html
+ rm -rf %{buildroot}%{_docdir}/pcre/html
- rm -f %{buildroot}%{_libdir}/*.la %{buildroot}%{_libdir}/*.a
+ rm -f %{buildroot}%{_libdir}/*.la
  %files
- %_mandir/man1/pcregrep.1*
+ %doc AUTHORS COPYING LICENCE NEWS README
- %_mandir/man1/pcretest.1*
+ %{_mandir}/man1/pcregrep.1*
- %_bindir/pcregrep
+ %{_mandir}/man1/pcretest.1*
- %_bindir/pcretest
+ %{_bindir}/pcregrep
+ %{_bindir}/pcretest
  %files -n %{libname}
- %doc AUTHORS COPYING LICENCE NEWS README
+ %{_libdir}/libpcre.so.%{pcre_major}*
- /%_lib/lib*.so.%{major}*
- %_libdir/lib*.so.%{major}*
+ %files -n %{libname16}
- %_libdir/libpcreposix.so.%{pcreposix_major}*
+ %{_libdir}/libpcre16.so.%{pcrecpp_major}*
+ %files -n %{libname32}
+ %{_libdir}/libpcre32.so.%{pcrecpp_major}*
+ %files -n %{libnamecpp}
+ %{_libdir}/libpcrecpp.so.%{pcrecpp_major}*
+ %if %{build_pcreposix_compat}
+ %files -n %{libnameposix_compat}
+ %{_libdir}/libpcreposix.so.%{pcreposix_compat_major}*
+ %endif
+ %files -n %{libnameposix}
+ %{_libdir}/libpcreposix.so.%{pcreposix_major}*
  %files -n %{develname}
  %doc doc/html
  %doc ChangeLog
- %_libdir/lib*.so
+ %{_libdir}/libpcre.so
- %_includedir/*.h
+ %{_libdir}/libpcre16.so
- %_libdir/pkgconfig/libpcre.pc
+ %{_libdir}/libpcre32.so
- %_libdir/pkgconfig/libpcrecpp.pc
+ %{_includedir}/pcre.h
- %_libdir/pkgconfig/libpcreposix.pc
+ %{_includedir}/pcre_*.h
- %_bindir/pcre-config
+ %{_libdir}/pkgconfig/libpcre.pc
+ %{_libdir}/pkgconfig/libpcre16.pc
+ %{_libdir}/pkgconfig/libpcre32.pc
+ %{_bindir}/pcre-config
  %multiarch %{multiarch_bindir}/pcre-config
- %_mandir/man1/pcre-config.1*
+ %{_mandir}/man1/pcre-config.1*
- %_mandir/man3/*.3*
+ %{_mandir}/man3/*.3*
+ %exclude %{_libdir}/libpcreposix.so
+ %exclude %{_mandir}/man3/pcreposix.3*
+ %files -n %{develcpp}
+ %{_includedir}/pcrecpp*.h
+ %{_libdir}/libpcrecpp.so
+ %{_libdir}/pkgconfig/libpcrecpp.pc
+ %{_mandir}/man3/pcrecpp.3*
+ %files -n %{develposix}
+ %{_includedir}/pcreposix.h
+ %{_libdir}/libpcreposix.so
+ %{_libdir}/pkgconfig/libpcreposix.pc
+ %{_mandir}/man3/pcreposix.3*

 Legend:



Removed from v.187740
 


changed lines


 
Added in v.668946
 Legend:



Removed from v.187740
 


changed lines


 
Added in v.668946
-Removed from v.187740
+Added in v.668946

	ViewVC Help
Powered by ViewVC 1.1.30