Browse code

Excluded conflicting perllocal.pod

Change-Id: I4e213028284c4a1434ee84e03d5dea80eaa3cfde
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6828
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>

smaliakkal authored on 2019/03/06 08:48:01
Showing 2 changed files
... ...
@@ -1,7 +1,7 @@
1 1
 %{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2
 Name:           apparmor
3 3
 Version:        2.13
4
-Release:        6%{?dist}
4
+Release:        7%{?dist}
5 5
 Summary:        AppArmor is an effective and easy-to-use Linux application security system.
6 6
 License:        GNU LGPL v2.1
7 7
 URL:            https://launchpad.net/apparmor
... ...
@@ -350,9 +350,11 @@ make DESTDIR=%{buildroot} install
350 350
 %defattr(-,root,root)
351 351
 %{perl_vendorarch}/auto/LibAppArmor/
352 352
 %{perl_vendorarch}/LibAppArmor.pm
353
-%{perl_archlib}/perllocal.pod
353
+%exclude %{perl_archlib}/perllocal.pod
354 354
 
355 355
 %changelog
356
+*   Tue Mar 05 2019 Siju Maliakkal <smaliakkal@vmware.com> 2.13-7
357
+-   Excluded conflicting perllocal.pod
356 358
 *   Thu Dec 06 2018 Keerthana K <keerthanak@vmware.com> 2.13-6
357 359
 -   Fixed make check failures.
358 360
 *   Fri Oct 05 2018 Tapas Kundu <tkundu@vmware.com> 2.13-5
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        The Apache Subversion control system
2 2
 Name:           subversion
3 3
 Version:        1.10.2
4
-Release:        3%{?dist}
4
+Release:        4%{?dist}
5 5
 License:        Apache License 2.0
6 6
 URL:            http://subversion.apache.org/
7 7
 Group:          Utilities/System
... ...
@@ -45,7 +45,7 @@ Provides Perl (SWIG) support for Subversion version control system.
45 45
 %setup -q
46 46
 
47 47
 %build
48
-./configure --prefix=%{_prefix}         \
48
+sh configure --prefix=%{_prefix}         \
49 49
         --disable-static                \
50 50
         --with-apache-libexecdir        \
51 51
         --with-serf=%{_prefix}		\
... ...
@@ -90,9 +90,12 @@ sudo -u test make check && userdel test -r -f
90 90
 %{_libdir}/libsvn_swig_perl*so*
91 91
 %{_libdir}/perl5/*
92 92
 %{_mandir}/man3/SVN*
93
+%exclude %{_libdir}/perl5/*/*/perllocal.pod
93 94
 
94 95
 
95 96
 %changelog
97
+*   Tue Mar 05 2019 Siju Maliakkal <smaliakkal@vmware.com> 1.10.2-4
98
+-   Excluding conflicting perllocal.pod
96 99
 *   Tue Oct 02 2018 Siju Maliakkal <smaliakkal@vmware.com> 1.10.2-3
97 100
 -   Added Perl bindings
98 101
 *   Fri Sep 21 2018 Ankit Jain <ankitja@vmware.com> 1.10.2-2
... ...
@@ -122,7 +125,7 @@ sudo -u test make check && userdel test -r -f
122 122
 *   Tue Nov 10 2015 Xiaolin Li <xiaolinl@vmware.com> 1.8.13-5
123 123
 -   Handled locale files with macro find_lang
124 124
 *   Tue Sep 22 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.8.13-4
125
--   Updated build-requires after creating devel package for apr. 
125
+-   Updated build-requires after creating devel package for apr.
126 126
 *   Mon Sep 21 2015 Xiaolin Li <xiaolinl@vmware.com> 1.8.13-3
127 127
 -   Move .a, and .so files to devel pkg.
128 128
 *   Tue Sep 08 2015 Vinay Kulkarni <kulkarniv@vmware.com> 1.8.13-2