Author: glen Date: Thu May 15 10:11:21 2008 GMT Module: SPECS Tag: AC-branch ---- Log message: - update autofoo not to link with rpm at all if using hrmib export from rpm - verbose library list, ghost soname symlinks; rel 11
---- Files affected: SPECS: net-snmp.spec (1.104.2.11 -> 1.104.2.12) ---- Diffs: ================================================================ Index: SPECS/net-snmp.spec diff -u SPECS/net-snmp.spec:1.104.2.11 SPECS/net-snmp.spec:1.104.2.12 --- SPECS/net-snmp.spec:1.104.2.11 Fri May 2 19:22:39 2008 +++ SPECS/net-snmp.spec Thu May 15 12:11:16 2008 @@ -29,7 +29,7 @@ Summary(uk.UTF-8): Набір утиліт для протоколу SNMP від UC-Davis Name: net-snmp Version: 5.4.1 -Release: 10 +Release: 11 License: BSD-like Group: Networking/Daemons Source0: http://dl.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz @@ -54,8 +54,8 @@ Patch9: %{name}-python.patch Patch10: %{name}-lvalue.patch Patch11: %{name}-defaultconfig.patch -Patch12: %{name}-use-rpm-hrmib.patch -Patch13: %{name}-duplicate-ip.patch +Patch12: %{name}-duplicate-ip.patch +Patch13: %{name}-use-rpm-hrmib.patch URL: http://www.net-snmp.org/ BuildRequires: autoconf >= 2.61-3 BuildRequires: automake @@ -72,7 +72,7 @@ BuildRequires: python-setuptools %endif %if %{with rpm} -BuildRequires: rpm-devel >= 4.0 +BuildRequires: rpm BuildRequires: rpm-perlprov >= 3.0.3-16 %endif BuildRequires: rpmbuild(macros) >= 1.268 @@ -163,7 +163,6 @@ Requires: libwrap-devel %{?with_lm_sensors:Requires: lm_sensors-devel} Requires: openssl-devel >= 0.9.7c -%{?with_rpm:Requires: rpm-devel} Obsoletes: ucd-snmp-devel %description devel @@ -421,8 +420,8 @@ %patch9 -p1 %patch10 -p1 %patch11 -p1 -%patch12 -p1 -%patch13 -p3 +%patch12 -p3 +%patch13 -p1 %build %{__libtoolize} @@ -444,8 +443,8 @@ --with-logfile="%{logfile}" \ --with-zlib=%{_prefix} \ --with-bzip2=%{_prefix} \ - --with%{!?with_rpm:out}-perl-modules \ - --with%{!?with_rpm:out}-python-modules \ + --with%{!?with_perl:out}-perl-modules \ + --with%{!?with_python:out}-python-modules \ --with-mib-modules="host agentx smux mibII/mta_sendmail \ %ifarch %{ix86} %{x8664} %if %{with lm_sensors} @@ -530,6 +529,8 @@ ar d $a DynaLoader.a fi done +%else +rm -f $RPM_BUILD_ROOT%{_libdir}/libsnmp.a %endif %clean @@ -593,15 +594,32 @@ %files libs %defattr(644,root,root,755) %dir %{_sysconfdir}/snmp -%attr(755,root,root) %{_libdir}/libnet*.so.*.* +%attr(755,root,root) %{_libdir}/libnetsnmp.so.*.* +%attr(755,root,root) %{_libdir}/libnetsnmpagent.so.*.* +%attr(755,root,root) %{_libdir}/libnetsnmphelpers.so.*.* +%attr(755,root,root) %{_libdir}/libnetsnmpmibs.so.*.* +%attr(755,root,root) %{_libdir}/libnetsnmptrapd.so.*.* +%attr(755,root,root) %ghost %{_libdir}/libnetsnmp.so.15 +%attr(755,root,root) %ghost %{_libdir}/libnetsnmpagent.so.15 +%attr(755,root,root) %ghost %{_libdir}/libnetsnmphelpers.so.15 +%attr(755,root,root) %ghost %{_libdir}/libnetsnmpmibs.so.15 +%attr(755,root,root) %ghost %{_libdir}/libnetsnmptrapd.so.15 %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/mib2c %attr(755,root,root) %{_bindir}/mib2c-update %attr(755,root,root) %{_bindir}/net-snmp-config -%attr(755,root,root) %{_libdir}/libnet*[a-z].so -%{_libdir}/libnet*.la +%attr(755,root,root) %{_libdir}/libnetsnmp.so +%attr(755,root,root) %{_libdir}/libnetsnmpagent.so +%attr(755,root,root) %{_libdir}/libnetsnmphelpers.so +%attr(755,root,root) %{_libdir}/libnetsnmpmibs.so +%attr(755,root,root) %{_libdir}/libnetsnmptrapd.so +%{_libdir}/libnetsnmp.la +%{_libdir}/libnetsnmpagent.la +%{_libdir}/libnetsnmphelpers.la +%{_libdir}/libnetsnmpmibs.la +%{_libdir}/libnetsnmptrapd.la %{_includedir}/net-snmp %{_datadir}/snmp/mib2c* %{_mandir}/man1/mib2c.1* @@ -748,6 +766,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.104.2.12 2008-05-15 10:11:16 glen +- update autofoo not to link with rpm at all if using hrmib export from rpm +- verbose library list, ghost soname symlinks; rel 11 + Revision 1.104.2.11 2008-05-02 17:22:39 adamg - revised -duplicate-ip.patch (official fix); solves #147 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/net-snmp.spec?r1=1.104.2.11&r2=1.104.2.12&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
