From eeb2466775ea59654036e8e7916e0b1df62ce1d7 Mon Sep 17 00:00:00 2001 From: ankry Date: Mon, 3 May 2004 00:55:43 +0000 Subject: [PATCH] - license fixes, cosmetics Changed files: perl-Tk.spec -> 1.50 --- perl-Tk.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/perl-Tk.spec b/perl-Tk.spec index 6d488e5..e0d977c 100644 --- a/perl-Tk.spec +++ b/perl-Tk.spec @@ -4,6 +4,10 @@ # - better summaries / descriptions # - do something with the demos (AAArgh!) # +# Conditional build: +%bcond_wit tests # do not perform "make test" + # require valid DISPLAY +# %include /usr/lib/rpm/macros.perl %define pdir Tk %define pnam Tk @@ -12,7 +16,8 @@ Summary(pl): Tk - toolkit graficznego interfejsu u Name: perl-Tk Version: 800.025 Release: 2 -License: GPL +# same as perl (except pTk dir - BSD-like) +License: GPL v1+ or Artistic, parts BSD-like Group: Development/Languages/Perl Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pnam}%{version}.tar.gz # Source0-md5: 9907e608addd2e3f004d45f13dfb181e @@ -46,19 +51,18 @@ wykorzystaniem GUI Tk. %{__perl} Makefile.PL \ INSTALLDIRS=vendor \ X11LIB=/usr/X11R6/%{_lib} - %{__perl} -pi -e 's//"default.h"/g' pTk/tixDef.h - %{__make} \ OPTIMIZE="%{rpmcflags}" +%{?with_tests:%{__make} test} + %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{perl_vendorlib}/Tk %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/{auto/Tk/.packlist,Tk/reindex.pl} \ $RPM_BUILD_ROOT%{_mandir}/man3/Tie::Watch.3pm \ $RPM_BUILD_ROOT%{perl_vendorarch}/Tk/*.pod -- 2.44.0