Remove useless dependencies between UTF variants

This commit is contained in:
Petr Písař 2016-03-07 17:18:49 +01:00
parent 0cdcbba8ae
commit 3b66458946

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.}12%{?rcversion:.%rcversion}%{?dist} Release: %{?rcversion:0.}13%{?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
@ -110,7 +110,6 @@ encodings. Detailed change log is provided by %{name}-doc package.
%package utf16 %package utf16
Summary: UTF-16 variant of PCRE Summary: UTF-16 variant of PCRE
Group: Development/Libraries Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
Conflicts: %{name}%{?_isa} < 8.38-12 Conflicts: %{name}%{?_isa} < 8.38-12
%description utf16 %description utf16
@ -120,7 +119,6 @@ Detailed change log is provided by %{name}-doc package.
%package utf32 %package utf32
Summary: UTF-32 variant of PCRE Summary: UTF-32 variant of PCRE
Group: Development/Libraries Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
Conflicts: %{name}%{?_isa} < 8.38-12 Conflicts: %{name}%{?_isa} < 8.38-12
%description utf32 %description utf32
@ -274,6 +272,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-13
- Remove useless dependencies between UTF variants
* Mon Mar 07 2016 Petr Pisar <ppisar@redhat.com> - 8.38-12 * 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 - Move UTF-16 and UTF-32 libraries into pcre-ut16 and pcre-32 subpackages