rpms/nkf/devel nkf.spec,1.24,1.25

[Akira Tagoh (tagoh)]

Author: tagoh

Update of /cvs/pkgs/rpms/nkf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3332

Modified Files:
	nkf.spec 
Log Message:
more clean up


Index: nkf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nkf/devel/nkf.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- nkf.spec	21 Sep 2007 03:52:12 -0000	1.24
+++ nkf.spec	21 Sep 2007 07:07:23 -0000	1.25
@@ -31,8 +31,8 @@
 %setup -q -n %{name}-%{nkfver}
 
 %build
-make nkf
-cp %{SOURCE3} .
+make CFLAGS="$RPM_OPT_FLAGS" nkf
+cp -p %{SOURCE3} .
 pushd NKF.mod
 CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=%{_prefix} INSTALLDIRS=vendor
 make
@@ -40,8 +40,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
-%{__mkdir_p} $RPM_BUILD_ROOT%{_mandir}/{man1,ja/man1}
+mkdir -p $RPM_BUILD_ROOT/%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/{man1,ja/man1}
 
 ./nkf -e nkf.1j > nkf.1jeuc
 iconv -f euc-jp -t utf-8 nkf.1jeuc > nkf.1utf8
@@ -49,31 +49,29 @@
 install -m 644 -p nkf.1 $RPM_BUILD_ROOT%{_mandir}/man1
 install -m 644 -p nkf.1utf8 $RPM_BUILD_ROOT%{_mandir}/ja/man1/nkf.1
 pushd NKF.mod
-eval `perl '-V:installarchlib'`
-eval `perl '-V:installvendorarch'`
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f	$RPM_BUILD_ROOT$installvendorarch/perllocal.pod		\
-	$RPM_BUILD_ROOT$installarchlib/perllocal.pod		\
-	$RPM_BUILD_ROOT$installvendorarch/auto/NKF/NKF.bs	\
-	$RPM_BUILD_ROOT$installvendorarch/auto/NKF/.packlist
+rm -f	$RPM_BUILD_ROOT%{perl_vendorarch}/perllocal.pod		\
+	$RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod		\
+	$RPM_BUILD_ROOT%{perl_vendorarch}/auto/NKF/NKF.bs	\
+	$RPM_BUILD_ROOT%{perl_vendorarch}/auto/NKF/.packlist
 popd
-chmod 0755 $RPM_BUILD_ROOT$installvendorarch/auto/NKF/NKF.so
+chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/NKF/NKF.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-, root, root, -)
 %doc nkf.doc nkf.copyright
 %{_bindir}/nkf
 %{_mandir}/man1/nkf.1*
 %{_mandir}/ja/man1/nkf.1*
 
 %files -n perl-NKF
-%defattr (-, root, root)
+%defattr (-, root, root, -)
 %doc nkf.doc nkf.copyright
-%{_libdir}/perl5/vendor_perl/*/*-linux-*/NKF.pm
-%{_libdir}/perl5/vendor_perl/*/*-linux-*/auto
+%{perl_vendorarch}/NKF.pm
+%{perl_vendorarch}/auto
 %{_mandir}/man3/NKF.3pm.gz
 
 %changelog