Pārlūkot izejas kodu

- use installvendorarch instead of installvendorlib
- fix conflicts


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6839 ec354946-7b23-47d6-9f5a-488ba84defc7

daisuke 11 gadi atpakaļ
vecāks
revīzija
ce67a32010
1 mainītis faili ar 7 papildinājumiem un 5 dzēšanām
  1. 7 5
      n/net-snmp/net-snmp-vl.spec

+ 7 - 5
n/net-snmp/net-snmp-vl.spec

@@ -5,7 +5,7 @@ Summary: A collection of SNMP protocol tools and libraries.
 Summary(ja): SNMP プロトコルツールとライブラリのコレクション
 Name: net-snmp
 Version: 5.7.1
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 License: BSDish
 Group: System Environment/Daemons
 URL: http://net-snmp.sourceforge.net/
@@ -250,13 +250,13 @@ cp local/mib2c.*.conf ${RPM_BUILD_ROOT}%{_datadir}/snmp
 
 pushd perl
 make PREFIX=${RPM_BUILD_ROOT}/%{_prefix} install_vendor
-eval $(perl '-V:installvendorlib')
+eval $(perl '-V:installvendorarch')
 
 find $RPM_BUILD_ROOT%{_libdir} -name Makefile.subs.pl | xargs rm -f
 find $RPM_BUILD_ROOT%{_libdir} -name perllocal.pod | xargs rm -f
 find $RPM_BUILD_ROOT%{_libdir} -name .packlist | xargs rm -f
 
-find $RPM_BUILD_ROOT/$installvendorlib -type f -print \
+find $RPM_BUILD_ROOT/$installvendorarch -type f -print \
         -o -type d -a \
         -name NetSNMP -printf '%%%%dir %%p\n' \
         -o -name SNMP -printf '%%%%dir %%p\n' | \
@@ -343,8 +343,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(0644,root,root,0755)
 %{_libdir}/lib*.so
 %{_libdir}/lib*.a
-%{_libdir}/lib*.so.*
-#%{_libdir}/lib*.la
 %{_includedir}/*
 #/usr/include/ucd-snmp
 %attr(0644,root,root)	%{_mandir}/man3/*.3.*
@@ -362,6 +360,10 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Wed Sep 19 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 5.7.1-3
+- use installvendorarch instead of installvendorlib
+  to pick perl modules
+
 * Mon Sep 17 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 5.7.1-2
 - rebuild with rpm-4.10.0