Attachment 314228 Details for Bug 456566 – proposed patch

[patch] proposed patch

perl-remove-fullinc.patch (text/plain), 2.37 KB, created by Stepan Kasal on 2008-08-13 17:46:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stepan Kasal

Created: 2008-08-13 17:46:45 UTC

Size: 2.37 KB

patch

obsolete

>2008-08-13  Stepan Kasal  <skasal@redhat.com>
>
>Make sure that perl.rpm does not contain compatibility version directories.
>Drop perl-*-fullinc.patch so that perl removes non-existent dirs from @INC on
>startup.
>
>Index: perl.spec
>===================================================================
>RCS file: /cvs/dist/rpms/perl/RHEL-4/perl.spec,v
>retrieving revision 1.62
>diff -u -r1.62 perl.spec
>--- perl.spec	24 Jun 2008 07:07:09 -0000	1.62
>+++ perl.spec	13 Aug 2008 17:38:00 -0000
>@@ -61,7 +61,7 @@
> # Patch8: perl-5.8.0-errno.patch
> Patch9: perl-5.7.3-syslog.patch
> # Patch10: perl-5.8.0-notty.patch
>-Patch11: perl-5.8.3-fullinc.patch
>+#Patch11: perl-5.8.3-fullinc.patch
> Patch12: perl-5.8.5-incpush.patch
> Patch13: perl-5.8.3-perlbug-tag.patch
> Patch14: perl-5.8.5-dashI.patch
>@@ -243,7 +243,7 @@
> %setup -q -n perl-5.8.5
> %patch5 -p1
> # %%patch8 -p1 
>-%patch11 -p1
>+#%patch11 -p1
> %patch12 -p1
> %patch13 -p1
> %patch14 -p1
>@@ -378,20 +378,6 @@
> 
> make install -f Makefile
> 
>-pushd $RPM_BUILD_ROOT/%{_libdir}/perl5
>-for i in %{perlmodcompat}; do
>-    mkdir -pm 755 $i/%{_arch}-%{_os}%{thread_arch}/CORE
>-    mkdir -pm 755 $i/%{_arch}-%{_os}%{thread_arch}/auto
>-    pushd $i/%{_arch}-%{_os}%{thread_arch}/CORE
>-      ln -s ../../../%{perlver}/%{_arch}-%{_os}%{thread_arch}/CORE/libperl.so libperl.so
>-    popd
>-  done
>-popd
>-
>-%ifarch %{multilib_64_archs}
>-mkdir -p ${RPM_BUILD_ROOT}/usr/lib64/perl5/vendor_perl/%{perlver}/%{_arch}-%{_os}
>-%endif
>-
> mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
> install -m 755 utils/pl2pm ${RPM_BUILD_ROOT}%{_bindir}/pl2pm
> 
>@@ -446,21 +432,8 @@
> 
> %{new_perl} -p -i -e "s|$RPM_BUILD_ROOT||g;" %{new_arch_lib}/Config.pm
> 
>-for dir in $(%{new_perl} -le 'print join("\n", @INC)' | grep '^/usr/lib')
>-do
>-  mkdir -p $RPM_BUILD_ROOT/$dir
>-done
>-
>-for dir in $(%{new_perl} -le 'print join("\n", @INC)' | grep '^%{_libdir}')
>-do
>-  mkdir -p $RPM_BUILD_ROOT/$dir
>-done
>-
>-for i in %{perlver} %{perlmodcompat} ; do
>-  mkdir -pm 755 $RPM_BUILD_ROOT%{_libdir}/perl5/site_perl/$i/%{_arch}-%{_os}%{thread_arch}/auto
>-  mkdir -pm 755 $RPM_BUILD_ROOT%{_libdir}/perl5/vendor_perl/$i/%{_arch}-%{_os}%{thread_arch}/auto
>-done
>-
>+mkdir -pm 755 $RPM_BUILD_ROOT%{_libdir}/perl5/site_perl/$i/%{_arch}-%{_os}%{thread_arch}/auto
>+mkdir -pm 755 $RPM_BUILD_ROOT%{_libdir}/perl5/vendor_perl/$i/%{_arch}-%{_os}%{thread_arch}/auto
> 
> %ifarch %{multilib_64_archs}
> mkdir -pm 755 $RPM_BUILD_ROOT/usr/lib/perl5/site_perl/%{perlver}

Actions: View | Diff

Attachments on bug 456566: 314228