Browse code
Fixed the conflicts arising from perllocal.pod
Change-Id: Ief56d60fab85328f21e2ad93e6b8792aa5998c82
Reviewed-on: http://photon-jenkins.eng.vmware.com/1033
Reviewed-by: Sharath George
Tested-by: Sharath George
(cherry picked from commit b2e62a8a5b07cbf0c169bfdb5437fbb0c04146d8)
Reviewed-on: http://photon-jenkins.eng.vmware.com/1034
harishspqr authored on 2016/05/27 06:46:17Showing 2 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Fast distributed version control system |
| 2 | 2 |
Name: git |
| 3 | 3 |
Version: 2.8.1 |
| 4 |
-Release: 4%{?dist}
|
|
| 4 |
+Release: 5%{?dist}
|
|
| 5 | 5 |
License: GPLv2 |
| 6 | 6 |
URL: http://git-scm.com/ |
| 7 | 7 |
Group: System Environment/Programming |
| ... | ... |
@@ -82,11 +82,14 @@ rm -rf %{buildroot}/*
|
| 82 | 82 |
%exclude %{_mandir}/man3/*:SVN:*
|
| 83 | 83 |
%exclude %{perl_sitelib}/Git/SVN
|
| 84 | 84 |
%exclude %{perl_sitelib}/Git/SVN.pm
|
| 85 |
+%exclude /usr/lib/perl5/5.22.1/x86_64-linux-thread-multi/perllocal.pod |
|
| 85 | 86 |
|
| 86 | 87 |
%files lang -f %{name}.lang
|
| 87 | 88 |
%defattr(-,root,root) |
| 88 | 89 |
|
| 89 | 90 |
%changelog |
| 91 |
+* Thu May 26 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.8.1-5 |
|
| 92 |
+- Excluded the perllocal.pod log. |
|
| 90 | 93 |
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.8.1-4 |
| 91 | 94 |
- GA - Bump release of all rpms |
| 92 | 95 |
* Wed May 18 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.8.1-3 |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
Summary: Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6. |
| 3 | 3 |
Name: net-snmp |
| 4 | 4 |
Version: 5.7.3 |
| 5 |
-Release: 3%{?dist}
|
|
| 5 |
+Release: 4%{?dist}
|
|
| 6 | 6 |
License: BSD (like) |
| 7 | 7 |
URL: http://net-snmp.sourceforge.net/ |
| 8 | 8 |
Group: Productivity/Networking/Other |
| ... | ... |
@@ -100,7 +100,7 @@ rm -rf %{buildroot}/*
|
| 100 | 100 |
/lib/systemd/system/snmptrapd.service |
| 101 | 101 |
%{_bindir}
|
| 102 | 102 |
%{_libdir}/*.so.*
|
| 103 |
-/sbin/* |
|
| 103 |
+/sbin/* |
|
| 104 | 104 |
|
| 105 | 105 |
%files devel |
| 106 | 106 |
%defattr(-,root,root) |
| ... | ... |
@@ -109,8 +109,11 @@ rm -rf %{buildroot}/*
|
| 109 | 109 |
%{_libdir}/perl5
|
| 110 | 110 |
%{_libdir}/*.so
|
| 111 | 111 |
%{_datadir}
|
| 112 |
+%exclude /usr/lib/perl5/5.22.1/x86_64-linux-thread-multi/perllocal.pod |
|
| 112 | 113 |
|
| 113 | 114 |
%changelog |
| 115 |
+* Thu May 26 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 5.7.3-4 |
|
| 116 |
+- Excluded the perllocal.pod log. |
|
| 114 | 117 |
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 5.7.3-3 |
| 115 | 118 |
- GA - Bump release of all rpms |
| 116 | 119 |
* Wed May 04 2016 Nick Shi <nshi@vmware.com> 5.7.3-2 |