Browse code
Fixed the perf packages with install time conflict.
Change-Id: I2c62e4032acbe11d1cd3389ae1ccc341fbb264d9
Reviewed-on: http://photon-jenkins.eng.vmware.com/251
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: Sharath George
harishspqr authored on 2015/12/10 09:45:44Showing 4 changed files
- SPECS/linux/linux-tools.spec
- SPECS/lldpad/lldpad.spec
- SPECS/net-snmp/net-snmp.spec
- SPECS/sysdig/sysdig.spec
| ... | ... |
@@ -45,10 +45,10 @@ ln -sfv ../../../../lib/systemd/system/lldpad.socket \ |
| 45 | 45 |
/sbin/ldconfig |
| 46 | 46 |
|
| 47 | 47 |
%files |
| 48 |
+%defattr(-,root,root) |
|
| 48 | 49 |
%{_sbindir}/*
|
| 49 | 50 |
%{_libdir}/liblldp_clif.so.*
|
| 50 |
-%dir %{_sysconfdir}/bash_completion.d/
|
|
| 51 |
-%{_sysconfdir}/bash_completion.d/*
|
|
| 51 |
+/etc/bash_completion.d/* |
|
| 52 | 52 |
%{_mandir}/man3/*
|
| 53 | 53 |
%{_mandir}/man8/*
|
| 54 | 54 |
%{_includedir}/*
|
| ... | ... |
@@ -1,3 +1,4 @@ |
| 1 |
+%global __requires_exclude perl\\(.*\\) |
|
| 1 | 2 |
Summary: Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6. |
| 2 | 3 |
Name: net-snmp |
| 3 | 4 |
Version: 5.7.3 |
| ... | ... |
@@ -9,8 +10,8 @@ Vendor: VMware, Inc. |
| 9 | 9 |
Distribution: Photon |
| 10 | 10 |
Source0: http://sourceforge.net/projects/%{name}/files/%{name}/%{version}/%{name}-%{version}.tar.gz
|
| 11 | 11 |
%define sha1 net-snmp=97dc25077257680815de44e34128d365c76bd839 |
| 12 |
-#BuildRequires: python2 python2-libs |
|
| 13 |
-BuildRequires: openssl-devel |
|
| 12 |
+BuildRequires: openssl-devel perl |
|
| 13 |
+Requires: perl |
|
| 14 | 14 |
%description |
| 15 | 15 |
Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6. |
| 16 | 16 |
|
| ... | ... |
@@ -38,6 +39,7 @@ The net-snmp-devel package contains headers and libraries for building SNMP appl |
| 38 | 38 |
--with-sys-contact="root@localhost" \ |
| 39 | 39 |
--with-defaults \ |
| 40 | 40 |
--disable-static \ |
| 41 |
+ --with-x=no \ |
|
| 41 | 42 |
--enable-as-needed |
| 42 | 43 |
make %{?_smp_mflags}
|
| 43 | 44 |
|
| ... | ... |
@@ -52,7 +54,7 @@ rm -rf %{buildroot}/*
|
| 52 | 52 |
%defattr(-,root,root) |
| 53 | 53 |
%{_bindir}
|
| 54 | 54 |
%{_libdir}/*.so.*
|
| 55 |
-/sbin/ |
|
| 55 |
+/sbin/* |
|
| 56 | 56 |
|
| 57 | 57 |
%files devel |
| 58 | 58 |
%defattr(-,root,root) |