packages: perl-dirs/perl-dirs.spec - %{perl_vendorarch}/auto/HTML as well -...

glen glen at pld-linux.org
Sun Feb 13 13:24:47 CET 2011


Author: glen                         Date: Sun Feb 13 12:24:47 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- %{perl_vendorarch}/auto/HTML as well
- cleanup macros to make them sense again

---- Files affected:
packages/perl-dirs:
   perl-dirs.spec (1.72 -> 1.73) 

---- Diffs:

================================================================
Index: packages/perl-dirs/perl-dirs.spec
diff -u packages/perl-dirs/perl-dirs.spec:1.72 packages/perl-dirs/perl-dirs.spec:1.73
--- packages/perl-dirs/perl-dirs.spec:1.72	Sun Feb 13 13:16:37 2011
+++ packages/perl-dirs/perl-dirs.spec	Sun Feb 13 13:24:42 2011
@@ -2,24 +2,18 @@
 #
 # Conditional build:
 %bcond_without	threads		# build without support for threads in Perl
-# NOTE: increase version if this bcond is enabled
-%bcond_without	perl512		# build for perl 5.12
 
-%if %{with perl512}
-%define		abi	5.12.0
-%else
 %if "%{pld_release}" == "th" || "%{pld_release}" == "ti"
-%define		abi	5.10.0
+%define		abi	5.12.0
 %else
 %define		abi	5.8.0
 %endif
-%endif
 
 %define		perlthread		%{?with_threads:-thread-multi}
 %define		perl_vendorarch	%{_libdir}/perl5/vendor_perl/%{abi}/%{_target_platform}%{perlthread}
 %define		perl_vendorlib	%{_datadir}/perl5/vendor_perl
 
-%define		rel		2
+%define		rel		3
 Summary:	Common dirs for Perl modules
 Summary(pl.UTF-8):	Katalogi wspólne dla modułów Perla
 Name:		perl-dirs
@@ -27,7 +21,7 @@
 Release:	%{rel}@%{abi}
 License:	Public Domain
 Group:		Development/Languages/Perl
-%{!?with_bootstrap:BuildRequires:	perl-base}
+BuildRequires:	perl-base
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.442
 Provides:	%{name}(%{_target_cpu}) = %{version}-%{release}
@@ -128,6 +122,7 @@
 %{perl_vendorarch}/auto/Encode
 %{perl_vendorarch}/auto/Event
 %{perl_vendorarch}/auto/File
+%{perl_vendorarch}/auto/HTML
 %{perl_vendorarch}/auto/IO
 %{perl_vendorarch}/auto/IPC
 %{perl_vendorarch}/auto/IPTables
@@ -367,6 +362,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.73  2011/02/13 12:24:42  glen
+- %{perl_vendorarch}/auto/HTML as well
+- cleanup macros to make them sense again
+
 Revision 1.72  2011/02/13 12:16:37  glen
 - add %{perl_vendorarch}/HTML, sort asciibethically (LC_ALL=C sort filter in vim)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl-dirs/perl-dirs.spec?r1=1.72&r2=1.73&f=u



More information about the pld-cvs-commit mailing list