From 698d577d1f59abbee831ddfac23d337b03222bb6 Mon Sep 17 00:00:00 2001 From: migo Date: Mon, 1 Dec 2003 17:22:14 +0000 Subject: [PATCH] - up to 0.52, cosmetics, new bcond style - disabled perl magic in %prep Changed files: perl-Class-ReturnValue.spec -> 1.15 --- perl-Class-ReturnValue.spec | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/perl-Class-ReturnValue.spec b/perl-Class-ReturnValue.spec index 4197643..2fbe8ec 100644 --- a/perl-Class-ReturnValue.spec +++ b/perl-Class-ReturnValue.spec @@ -1,7 +1,7 @@ # # Conditional build: -# _with_tests - perform "make test" -# +%bcond_with tests # perform "make test" + %include /usr/lib/rpm/macros.perl %define pdir Class %define pnam ReturnValue @@ -23,13 +23,13 @@ Summary(sv): %{pdir}::%{pnam} Perlmodul Summary(uk): íÏÄÕÌØ ÄÌÑ Perl %{pdir}::%{pnam} Summary(zh_CN): %{pdir}::%{pnam} Perl Ä£¿é Name: perl-Class-ReturnValue -Version: 0.51 -Release: 2 +Version: 0.52 +Release: 1 License: GPL/Artistic Group: Development/Languages/Perl Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz -# Source0-md5: 164dbd2a742a851ca78b13dad51d582a -BuildRequires: perl-devel >= 5 +# Source0-md5: d4836df29f817d839e2c87147d5efc9e +BuildRequires: perl-devel >= 5.8.0 BuildRequires: rpm-perlprov >= 4.1-13 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -46,18 +46,19 @@ lub listy (jakie warto %prep %setup -q -n %{pdir}-%{pnam}-%{version} -%{__perl} -pi -e 'BEGIN{undef $/};s/\{\s*package MY;.*$//s' Makefile.PL +#%{__perl} -pi -e 'BEGIN{undef $/};s/\{\s*package MY;.*$//s' Makefile.PL %build %{__perl} Makefile.PL \ INSTALLDIRS=vendor %{__make} # Warning: test script in this package IS broken (wrong name) -%{?_with_tests:%{__make} test} +%{?with_tests:%{__make} test} %install rm -rf $RPM_BUILD_ROOT -%{__make} install DESTDIR=$RPM_BUILD_ROOT +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT -- 2.44.0