rpms/perltidy/devel perltidy.spec,1.5,1.6

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/perltidy/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv12041

Modified Files:
	perltidy.spec 
Log Message:
Sync with fedora-rpmdevtools' Perl spec template to fix x86_64 build.


Index: perltidy.spec
===================================================================
RCS file: /cvs/extras/rpms/perltidy/devel/perltidy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perltidy.spec	10 Dec 2004 22:03:09 -0000	1.5
+++ perltidy.spec	16 Dec 2004 19:37:16 -0000	1.6
@@ -1,6 +1,8 @@
+%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
+
 Name:           perltidy
-Version:        0.0
-Release:        3.20031021
+Version:        20041021
+Release:        1
 Epoch:          0
 Summary:        Tool for indenting and reformatting Perl scripts
 
@@ -11,7 +13,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl
+BuildRequires:  perl >= 1:5.6.1
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Perltidy is a Perl script which indents and reformats Perl scripts to
@@ -31,23 +34,23 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
-make test
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install \
-  PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \
-  INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib}
-find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+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 d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 rm -f docs/perltidy.1 # already in mandir
 
 
+%check || :
+make test
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -56,11 +59,16 @@
 %defattr(-,root,root,-)
 %doc BUGS CHANGES COPYING README TODO docs
 %{_bindir}/perltidy
-%{_libdir}/perl*/*
-%{_mandir}/man?/*
+%{perl_vendorlib}/Perl
+%{_mandir}/man1/perltidy.1*
+%{_mandir}/man3/Perl::Tidy.3*
 
 
 %changelog
+* Thu Dec 16 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:20041021-1
+- Sync with fedora-rpmdevtools' Perl spec template to fix x86_64 build.
+- Move version to the version field.
+
 * Wed Oct 22 2003 Ville Skyttä <ville.skytta at iki.fi> 0:0.0-0.fdr.3.20031021
 - Update to 20031021.