All pastes #544215 Raw Edit

pilot-link perl fix

public text v1 · immutable
·published 2007-06-06 10:51 UTC
rendered paste body
diff -r1.56 pilot-link.spec
1,2c1,3
< %define support_perl 0
< %define perl_version 5.8.0
---
> %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
> 
> %define support_perl 1
16c17
< #Patch2: pilot-link-0.11.0-perlpollute.patch  # May be still applied
---
> #Patch2: pilot-link-0.11.0-perlpollute.patch # May be still applied
24c25,26
< BuildRequireseq: perl
---
> Requires:      perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
> BuildRequires: perl(ExtUtils::MakeMaker)
81c83
<   --with-perl=yes \
---
>     --with-perl=yes \
83c85
<   --with-perl=no \
---
>     --with-perl=no \
89,92d90
< 
< %install
< rm -rf %{buildroot}
< 
95,99c93,97
<    cd bindings/Perl
<    perl -pi -e 's|^\$libdir =.*|\$libdir = "%{buildroot}%{_libdir}";|g' Makefile.PL
<    CFLAGS="%{optflags}" perl Makefile.PL PREFIX=%{buildroot}%{_prefix} INSTALLDIRS=vendor
<    make
<    cd ../..
---
>       pushd bindings/Perl
>       %{__perl} Makefile.PL INSTALLDIRS=vendor optimize="$RPM_OPT_FLAGS"
>       make -B || :
>       make
>       popd
102a101,103
> %install
> rm -rf %{buildroot}
> 
107,109c108,117
<   make install -C bindings/Perl
<   rm -f %{buildroot}%{_libdir}/perl5/vendor_perl/%{perl_version}/*/auto/PDA/Pilot/Pilot.bs \
<         %{buildroot}%{_libdir}/perl5/site_perl/*/*/*/PDA/Pilot/.packlist
---
>   pushd bindings/Perl
>   make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
> 
>   find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
>   find $RPM_BUILD_ROOT -type f -name "perllocal.pod" -exec rm -f {} \;
>   find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
>   find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
> 
>   %{_fixperms} $RPM_BUILD_ROOT/*
>   popd
132,133c140,142
< %{_libdir}/perl5/vendor_perl/*/*/*/PDA
< %{_libdir}/perl5/vendor_perl/*/*/PDA
---
> %{perl_vendorarch}/PDA/*.pm
> %{perl_vendorarch}/PDA/*.pl
> %{perl_vendorarch}/auto/PDA/Pilot/*