commit 6be3cd2a1eda9668dde82d800d1b985d7c427d41 Author: Miro Hrončok <miro@xxxxxxxxxx> Date: Sat Oct 19 01:02:08 2013 +0200 Revert "Added some Perl 5.18 compatibility patches for F20+" This reverts commit d3fc7e9f5ea5e91e9fea3d0d8fbb262c27aa3c29. Conflicts: slic3r.spec slic3r-perl518.patch | 72 -------------------------------------------------- slic3r.spec | 7 ----- 2 files changed, 0 insertions(+), 79 deletions(-) --- diff --git a/slic3r.spec b/slic3r.spec index 0e46ab0..4b3d811 100644 --- a/slic3r.spec +++ b/slic3r.spec @@ -20,9 +20,6 @@ Patch1: %{name}-english-locale.patch # Fix crash when loading a config file Patch2: %{name}-load-config-fix.patch -# Perl 5.18 compatibility -Patch3: %{name}-perl518.patch - Source1: %{name}.desktop BuildArch: noarch BuildRequires: perl(Boost::Geometry::Utils) >= 0.12 @@ -70,9 +67,6 @@ for more information. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%if 0%{?fedora} > 19 -%patch3 -p1 -%endif %build SLIC3R_NO_AUTO=1 perl Build.PL installdirs=vendor optimize="$RPM_OPT_FLAGS" @@ -107,7 +101,6 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %changelog * Fri Oct 18 2013 Miro Hrončok <mhroncok@xxxxxxxxxx> - 0.9.10b-5 - For F20+, require Moo >= 1.003001 -- Added some Perl 5.18 compatibility patches for F20+ * Fri Oct 18 2013 Miro Hrončok <mhroncok@xxxxxxxxxx> - 0.9.10b-4 - Remove all filtering from provides, it is not needed anymore -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/perl-devel