- sperl obsolete in perl-base not in main package; rel 3

[packages/perl.git] / perl.spec

diff --git a/perl.spec b/perl.spec
index bb3538c1472d05e523abac32255d50e7da04ae2c..87fe6c246e0e82d7053cd3c782612cc534041c7e 100644 (file)
--- a/perl.spec
+++ b/perl.spec
@@ -43,8 +43,8 @@
 %define                perl_modver()           %([ -f %{SOURCE3} ] && awk -vp=%1 '$1 == p{print $3}' %{SOURCE3} || echo ERROR)
 %define                perl_modversion()       %([ -f %{SOURCE3} ] && awk -vp=%1 '$1 == p{m=$1; gsub(/::/, "-", m); printf("perl-%s = %s\\n", m, $3)}END{if (!m) printf("# Error looking up [%s]\\n", p)}' %{SOURCE3} || echo ERROR)
 
-%define                ver     5.12.0
-%define                rel     0.1
+%define                ver     5.12.1
+%define                rel     3
 Summary:       Practical Extraction and Report Language (Perl)
 Summary(cs.UTF-8):     Programovací jazyk Perl
 Summary(da.UTF-8):     Programmeringssproget Perl
@@ -73,7 +73,7 @@ Epoch:                1
 License:       GPL v1+ or Artistic
 Group:         Development/Languages/Perl
 Source0:       http://www.cpan.org/modules/by-authors/id/J/JE/JESSE/%{name}-%{ver}.tar.bz2
-# Source0-md5: 3e15696f4160775a90f6b2fb3ccc98c2
+# Source0-md5: f7f2d7f5aaac15a75028381b159a560f
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: de47d7893f49ad7f41ba69c78511c0db
 Source2:       %{name}.prov
@@ -93,6 +93,7 @@ BuildRequires:        gcc >= 5:4.1
 %{?with_gdbm:BuildRequires:    gdbm-devel}
 # asm-generic, merged x86 asm dirs
 BuildRequires: linux-libc-headers >= 7:2.6.24
+%{?with_tests:BuildRequires:   procps}
 # required for proper Provides generation (older are not supported by spec)
 BuildRequires: rpm-build >= 4.3-0.20040107.4
 BuildRequires: rpmbuild(macros) >= 1.426
@@ -100,7 +101,6 @@ Requires:   %{name}-base = %{epoch}:%{ver}-%{release}
 Requires:      %{name}-modules = %{epoch}:%{ver}-%{release}
 Suggests:      %{name}-doc-reference = %{epoch}:%{ver}-%{release}
 Suggests:      perldoc
-Obsoletes:     sperl
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                __perl          %{_builddir}/perl-%{ver}/runperl
@@ -308,6 +308,7 @@ Provides:   %perl_modversion PerlIO::via::QuotedPrint
 Provides:      %perl_modversion Safe
 Provides:      %perl_modversion Socket
 Provides:      %perl_modversion Tie::File
+Obsoletes:     sperl
 Conflicts:     perl < 1:5.8.0
 
 %description base
@@ -952,6 +953,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{perl_archlib}/auto/Socket/*.so
 %{_mandir}/man3/Socket.*
 
+%if 0
 %files Encode
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/enc2xs
@@ -967,6 +969,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/piconv.*
 %{_mandir}/man3/Encode*
 %{_mandir}/man3/encoding.*
+%endif
 
 %if %{with gdbm}
 %files GDBM_File