[libvirt] [tck PATCH 01/12] rpm: use standard perl variables

Daniel P. Berrangé posted 12 patches 6 years, 11 months ago
There is a newer version of this series
[libvirt] [tck PATCH 01/12] rpm: use standard perl variables
Posted by Daniel P. Berrangé 6 years, 11 months ago
We don't need to manually build variables for perl install locations
as RPM includes that.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 perl-Sys-Virt-TCK.spec.PL | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL
index aac6cf6..4b1683f 100644
--- a/perl-Sys-Virt-TCK.spec.PL
+++ b/perl-Sys-Virt-TCK.spec.PL
@@ -24,13 +24,6 @@ close SPEC;
 __DATA__
 # Automatically generated by perl-Sys-Virt-TCK.spec.PL
 
-%define perlvendorarch %(perl -e 'use Config; print $Config{installvendorarch}')
-%define perlvendorlib %(perl -e 'use Config; print $Config{installvendorlib}')
-%define perlvendorprefix %(perl -e 'use Config; print $Config{vendorprefix}')
-%define perlvendorman1 %{perlvendorprefix}/share/man/man1
-%define perlvendorman3 %{perlvendorprefix}/share/man/man3
-%define perlversion %(perl -e 'use Config; print $Config{version}')
-
 %define appname Sys-Virt-TCK
 
 Summary: Sys::Virt::TCK - libvirt Technology Compatibility Kit
@@ -42,7 +35,7 @@ Group: Development/Tools
 Source: http://libvirt.org/sources/tck/%{appname}-v%{version}.tar.gz
 Url: http://libvirt.org/
 BuildRoot: %{_tmppath}/%{appname}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: perl >= %{perlversion}
+Requires: perl >= %{perl_version}
 Requires: libvirt >= 0.6.2
 BuildRequires: perl(accessors)
 BuildRequires: perl(App::Prove)
@@ -118,10 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/libvirt-tck
 %dir %{_datadir}/libvirt-tck
 %{_datadir}/libvirt-tck/*
-%{perlvendorman1}/*
-#%{perlvendorman3}/*
-%{perlvendorlib}/Sys/Virt/TCK.pm
-%{perlvendorlib}/Sys/Virt/TCK/
+%{_mandir}/man1/*
+%{perl_vendorlib}/Sys/Virt/TCK.pm
+%{perl_vendorlib}/Sys/Virt/TCK/
 %dir %{_localstatedir}/cache/libvirt-tck
 
 %changelog
-- 
2.17.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [tck PATCH 01/12] rpm: use standard perl variables
Posted by Laine Stump 6 years, 11 months ago
On 06/08/2018 09:45 AM, Daniel P. Berrangé wrote:
> We don't need to manually build variables for perl install locations
> as RPM includes that.
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

Reviewed-by: Laine Stump <laine@laine.org>

> ---
>  perl-Sys-Virt-TCK.spec.PL | 16 ++++------------
>  1 file changed, 4 insertions(+), 12 deletions(-)
>
> diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL
> index aac6cf6..4b1683f 100644
> --- a/perl-Sys-Virt-TCK.spec.PL
> +++ b/perl-Sys-Virt-TCK.spec.PL
> @@ -24,13 +24,6 @@ close SPEC;
>  __DATA__
>  # Automatically generated by perl-Sys-Virt-TCK.spec.PL
>  
> -%define perlvendorarch %(perl -e 'use Config; print $Config{installvendorarch}')
> -%define perlvendorlib %(perl -e 'use Config; print $Config{installvendorlib}')
> -%define perlvendorprefix %(perl -e 'use Config; print $Config{vendorprefix}')
> -%define perlvendorman1 %{perlvendorprefix}/share/man/man1
> -%define perlvendorman3 %{perlvendorprefix}/share/man/man3
> -%define perlversion %(perl -e 'use Config; print $Config{version}')
> -
>  %define appname Sys-Virt-TCK
>  
>  Summary: Sys::Virt::TCK - libvirt Technology Compatibility Kit
> @@ -42,7 +35,7 @@ Group: Development/Tools
>  Source: http://libvirt.org/sources/tck/%{appname}-v%{version}.tar.gz
>  Url: http://libvirt.org/
>  BuildRoot: %{_tmppath}/%{appname}-%{version}-%{release}-root-%(%{__id_u} -n)
> -Requires: perl >= %{perlversion}
> +Requires: perl >= %{perl_version}
>  Requires: libvirt >= 0.6.2
>  BuildRequires: perl(accessors)
>  BuildRequires: perl(App::Prove)
> @@ -118,10 +111,9 @@ rm -rf $RPM_BUILD_ROOT
>  %{_bindir}/libvirt-tck
>  %dir %{_datadir}/libvirt-tck
>  %{_datadir}/libvirt-tck/*
> -%{perlvendorman1}/*
> -#%{perlvendorman3}/*
> -%{perlvendorlib}/Sys/Virt/TCK.pm
> -%{perlvendorlib}/Sys/Virt/TCK/
> +%{_mandir}/man1/*
> +%{perl_vendorlib}/Sys/Virt/TCK.pm
> +%{perl_vendorlib}/Sys/Virt/TCK/
>  %dir %{_localstatedir}/cache/libvirt-tck
>  
>  %changelog


--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list