Move UTF-16 and UTF-32 libraries into pcre-ut16 and pcre-32 subpackages

This commit is contained in:
Petr Písař 2016-03-07 16:18:45 +01:00
parent eccef620dd
commit 0cdcbba8ae
2 changed files with 50 additions and 5 deletions

2
.rpmlint Normal file
View File

@ -0,0 +1,2 @@
from Config import *
addFilter("spelling-error .* encodings");

View File

@ -2,7 +2,7 @@
#%%global rcversion RC1 #%%global rcversion RC1
Name: pcre Name: pcre
Version: 8.38 Version: 8.38
Release: %{?rcversion:0.}11%{?rcversion:.%rcversion}%{?dist} Release: %{?rcversion:0.}12%{?rcversion:.%rcversion}%{?dist}
%global myversion %{version}%{?rcversion:-%rcversion} %global myversion %{version}%{?rcversion:-%rcversion}
Summary: Perl-compatible regular expression library Summary: Perl-compatible regular expression library
Group: System Environment/Libraries Group: System Environment/Libraries
@ -104,13 +104,34 @@ PCRE, Perl-compatible regular expression, library has its own native API, but
a set of wrapper functions that are based on the POSIX API are also supplied a set of wrapper functions that are based on the POSIX API are also supplied
in the libpcreposix library. Note that this just provides a POSIX calling in the libpcreposix library. Note that this just provides a POSIX calling
interface to PCRE: the regular expressions themselves still follow Perl syntax interface to PCRE: the regular expressions themselves still follow Perl syntax
and semantics. Detailed change log is provided by %{name}-doc package. and semantics. This package provides support for strings in 8-bit and UTF-8
encodings. Detailed change log is provided by %{name}-doc package.
%package utf16
Summary: UTF-16 variant of PCRE
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
Conflicts: %{name}%{?_isa} < 8.38-12
%description utf16
This is Perl-compatible regular expression library working on UTF-16 strings.
Detailed change log is provided by %{name}-doc package.
%package utf32
Summary: UTF-32 variant of PCRE
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
Conflicts: %{name}%{?_isa} < 8.38-12
%description utf32
This is Perl-compatible regular expression library working on UTF-32 strings.
Detailed change log is provided by %{name}-doc package.
%package doc %package doc
Summary: Change log for %{name} Summary: Change log for %{name}
Group: Documentation Group: Documentation
BuildArch: noarch BuildArch: noarch
Requires: %{name} = %{version}-%{release} Requires: (%{name} = %{version}-%{release} or %{name}-utf16 = %{version}-%{release} or %{name}-32 = %{version}-%{release})
%description doc %description doc
These are large documentation files about PCRE. These are large documentation files about PCRE.
@ -119,6 +140,8 @@ These are large documentation files about PCRE.
Summary: Development files for %{name} Summary: Development files for %{name}
Group: Development/Libraries Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-utf16%{?_isa} = %{version}-%{release}
Requires: %{name}-utf32%{?_isa} = %{version}-%{release}
%description devel %description devel
Development files (Headers, libraries for dynamic linking, etc) for %{name}. Development files (Headers, libraries for dynamic linking, etc) for %{name}.
@ -200,15 +223,32 @@ ulimit -s 10240
make %{?_smp_mflags} check VERBOSE=yes make %{?_smp_mflags} check VERBOSE=yes
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%post utf16 -p /sbin/ldconfig
%postun utf16 -p /sbin/ldconfig
%post utf32 -p /sbin/ldconfig
%postun utf32 -p /sbin/ldconfig
%files %files
%{_libdir}/*.so.* %{_libdir}/libpcre.so.*
%{_libdir}/libpcrecpp.so.*
%{_libdir}/libpcreposix.so.*
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
%license COPYING LICENCE %license COPYING LICENCE
%doc AUTHORS NEWS %doc AUTHORS NEWS
%files utf16
%{_libdir}/libpcre16.so.*
%license COPYING LICENCE
%doc AUTHORS NEWS
%files utf32
%{_libdir}/libpcre32.so.*
%license COPYING LICENCE
%doc AUTHORS NEWS
%files doc %files doc
%doc ChangeLog %doc ChangeLog
@ -234,6 +274,9 @@ make %{?_smp_mflags} check VERBOSE=yes
%{_mandir}/man1/pcretest.* %{_mandir}/man1/pcretest.*
%changelog %changelog
* Mon Mar 07 2016 Petr Pisar <ppisar@redhat.com> - 8.38-12
- Move UTF-16 and UTF-32 libraries into pcre-ut16 and pcre-32 subpackages
* Mon Mar 07 2016 Petr Pisar <ppisar@redhat.com> - 8.38-11 * Mon Mar 07 2016 Petr Pisar <ppisar@redhat.com> - 8.38-11
- Ship ChangeLog in pcre-doc package - Ship ChangeLog in pcre-doc package