rpms/perl-Text-Iconv/devel perl-Text-Iconv.spec,1.5,1.6

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/perl-Text-Iconv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3400

Modified Files:
	perl-Text-Iconv.spec 
Log Message:
* Thu Jan 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4-3
- Specfile cleanup.



Index: perl-Text-Iconv.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Iconv/devel/perl-Text-Iconv.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Text-Iconv.spec	6 Apr 2005 22:13:08 -0000	1.5
+++ perl-Text-Iconv.spec	19 Jan 2006 19:18:54 -0000	1.6
@@ -1,15 +1,12 @@
-%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
-
 Name:           perl-Text-Iconv
 Version:        1.4
-Release:        2
-
+Release:        3%{?dist}
 Summary:        Perl interface to iconv() codeset conversion function
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Text-Iconv/
-Source0:       http://www.cpan.org/authors/id/M/MP/MPIOTR/Text-Iconv-1.4.tar.gz
+Source0:        http://www.cpan.org/authors/id/M/MP/MPIOTR/Text-Iconv-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 1:5.6.1
@@ -30,21 +27,20 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -a \( -name .packlist \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -55,13 +51,16 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes README
-%{perl_vendorarch}/auto/Text
-%{perl_vendorarch}/Text
+%{perl_vendorarch}/auto/Text/
+%{perl_vendorarch}/Text/
 %{_mandir}/man3/Text::Iconv.3*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Thu Jan 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4-3
+- Specfile cleanup.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.4-2
 - rebuilt
 
 * Sun Jul 18 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.4-0.fdr.1