1. photon
  2. Commit e40b7ea4a3be0d69e189acc708890b1f31f57d38
Browse code

Added python3 subpackage to lvm2. Added python and python3 subpackages to openvswitch.

Change-Id: I050cc169ae3a75cb402a83435aefd4d11a8aacc5
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2824
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>

xiaolin-vmware authored on 2017/06/01 02:46:37
Showing 2 changed files
SPECS/lvm2/lvm2.spec
History View file @ e40b7ea
... ... 
@@ -1,7 +1,9 @@
1 
+%{!?python2_sitelib: %global python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 
+%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 3 
 Summary:        Userland logical volume management tools
2 4 
 Name:           lvm2
3 5 
 Version:        2.02.171
4 
-Release:        1%{?dist}
6 
+Release:        2%{?dist}
5 7 
 License:        GPLv2
6 8 
 Group:          System Environment/Base
7 9 
 URL:            http://sources.redhat.com/dm
... ... 
@@ -14,8 +16,6 @@ Patch0:         lvm2-set-default-preferred_names.patch
14 14 
 BuildRequires:  libselinux-devel, libsepol-devel
15 15 
 BuildRequires:  ncurses-devel
16 16 
 BuildRequires:  readline-devel
17 
-BuildRequires:  python2-devel
18 
-BuildRequires:  python2-libs
19 17 
 BuildRequires:  systemd-devel
20 18 
 BuildRequires:  thin-provisioning-tools
21 19 
 Requires:       device-mapper-libs = %{version}-%{release}
... ... 
@@ -58,18 +58,32 @@ This package contains shared lvm2 libraries for applications.
58 58
59 59 
 %postun libs -p /sbin/ldconfig
60 60
61 
-%package    python-libs
62 
-Summary:    Python module to access LVM
63 
-License:    LGPLv2
64 
-Group:      Development/Libraries
65 
-Requires:   %{name}-libs = %{version}-%{release}
66 
-Requires:   python2-libs
67 
-Requires:   python2
61 
+%package        python-libs
62 
+Summary:        Python module to access LVM
63 
+License:        LGPLv2
64 
+Group:          Development/Libraries
65 
+BuildRequires:  python2-devel
66 
+Requires:       %{name}-libs = %{version}-%{release}
67 
+Requires:       python2-libs
68 
+Requires:       python2
68 69
69 70 
 %description    python-libs
70 71 
 Python module to allow the creation and use of LVM
71 72 
 logical volumes, physical volumes, and volume groups.
72 73
74 
+%package    -n  python3-lvm2-libs
75 
+Summary:        Python module to access LVM
76 
+License:        LGPLv2
77 
+Group:          Development/Libraries
78 
+BuildRequires:  python3-devel
79 
+Requires:       %{name}-libs = %{version}-%{release}
80 
+Requires:       python3-libs
81 
+Requires:       python3
82 
+
83 
+%description -n python3-lvm2-libs
84 
+Python module to allow the creation and use of LVM
85 
+logical volumes, physical volumes, and volume groups.
86 
+
73 87 
 %package -n device-mapper
74 88 
 Summary:    Device mapper utility
75 89 
 Group:      System Environment/Base
... ... 
@@ -193,6 +207,7 @@ the device-mapper event library.
193 193 
     --enable-dmeventd \
194 194 
     --enable-use_lvmetad \
195 195 
     --enable-python2-bindings \
196 
+    --enable-python3-bindings \
196 197 
     --enable-blkid_wiping \
197 198 
     --enable-lvmetad \
198 199 
     --with-udevdir=%{_udevdir} --enable-udev_sync \
... ... 
@@ -248,7 +263,10 @@ cp %{SOURCE1} %{buildroot}/lib/systemd/system/lvm2-activate.service
248 248 
 %{_libdir}/device-mapper/libdevmapper-event-lvm2thin.so
249 249
250 250 
 %files  python-libs
251 
-%{python_sitearch}/*
251 
+%{python2_sitelib}/*
252 
+
253 
+%files -n  python3-lvm2-libs
254 
+%{python3_sitelib}/*
252 255
253 256 
 %files -n device-mapper
254 257 
 %defattr(-,root,root,-)
... ... 
@@ -319,6 +337,8 @@ cp %{SOURCE1} %{buildroot}/lib/systemd/system/lvm2-activate.service
319 319
320 320
321 321 
 %changelog
322 
+*   Tue May 23 2017 Xiaolin Li <xiaolinl@vmware.com> 2.02.171-2
323 
+-   Added python3 subpackage.
322 324 
 *   Thu May 4  2017 Bo Gan <ganb@vmware.com> 2.02.171-1
323 325 
 -   Update to 2.02.171
324 326 
 *   Wed Dec 21 2016 Xiaolin Li <xiaolinl@vmware.com> 2.02.141-8
SPECS/ovs/openvswitch.spec
History View file @ e40b7ea
... ... 
@@ -1,7 +1,9 @@
1 
+%{!?python2_sitelib: %global python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 
+%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 3 
 Summary:        Open vSwitch daemon/database/utilities
2 4 
 Name:           openvswitch
3 5 
 Version:        2.7.0
4 
-Release:        1%{?dist}
6 
+Release:        2%{?dist}
5 7 
 License:        ASL 2.0 and LGPLv2+
6 8 
 URL:            http://www.openvswitch.org/
7 9 
 Group:          System Environment/Daemons
... ... 
@@ -17,6 +19,18 @@ BuildRequires:  libcap-ng-devel
17 17 
 BuildRequires:  make
18 18 
 BuildRequires:  openssl
19 19 
 BuildRequires:  openssl-devel
20 
+
21 
+Requires:       libgcc-atomic
22 
+Requires:       libcap-ng
23 
+Requires:       openssl
24 
+
25 
+%description
26 
+Open vSwitch provides standard network bridging functions and
27 
+support for the OpenFlow protocol for remote per-flow control of
28 
+traffic.
29 
+
30 
+%package -n     python-openvswitch
31 
+Summary:        python-openvswitch
20 32 
 BuildRequires:  python2 >= 2.7.0
21 33 
 BuildRequires:  python2-devel
22 34 
 BuildRequires:  python2-libs
... ... 
@@ -24,27 +38,27 @@ BuildRequires:  python-pip
24 24 
 BuildRequires:  python-six
25 25 
 BuildRequires:  python-xml
26 26 
 BuildRequires:  python-setuptools
27 
-
28 
-Requires:       libgcc-atomic
29 
-Requires:       libcap-ng
30 
-Requires:       openssl
31 
-Requires:       PyYAML
32 27 
 Requires:       python2
33 28 
 Requires:       python2-libs
34 
-Requires:       python-xml
35 
-Requires:       python-configobj
36 
-Requires:       python-jsonpatch
37 
-Requires:       python-prettytable
38 
-Requires:       python-requests
39 29
40 
-%description
41 
-Open vSwitch provides standard network bridging functions and
42 
-support for the OpenFlow protocol for remote per-flow control of
43 
-traffic.
30 
+%description -n python-openvswitch
31 
+Python 2 openvswith bindings.
44 32
45 
-%package	devel
46 
-Summary:	Header and development files for openvswitch
47 
-Requires:	%{name} = %{version}
33 
+%package -n     python3-openvswitch
34 
+Summary:        python3-openvswitch
35 
+BuildRequires:  python3 >= 3.4.0
36 
+BuildRequires:  python3-devel
37 
+BuildRequires:  python3-libs
38 
+BuildRequires:  python3-six
39 
+Requires:       python3
40 
+Requires:       python3-libs
41 
+
42 
+%description -n python3-openvswitch
43 
+Python 3 version.
44 
+
45 
+%package        devel
46 
+Summary:        Header and development files for openvswitch
47 
+Requires:       %{name} = %{version}
48 48 
 %description    devel
49 49 
 openvswitch-devel package contains header files and libs.
50 50
... ... 
@@ -73,7 +87,12 @@ make %{_smp_mflags}
73 73
74 74 
 %install
75 75 
 make DESTDIR=%{buildroot} install
76 
-find %{buildroot}%{_libdir} -name '*.la' -delete
76 
+find %{buildroot}/%{_libdir} -name '*.la' -delete
77 
+mkdir -p %{buildroot}/%{python2_sitelib}
78 
+mkdir -p %{buildroot}/%{python3_sitelib}
79 
+cp -a %{buildroot}/%{_datadir}/openvswitch/python/ovs/* %{buildroot}/%{python2_sitelib}
80 
+
81 
+cp -a %{buildroot}/%{_datadir}/openvswitch/python/ovs/* %{buildroot}/%{python3_sitelib}
77 82
78 83 
 mkdir -p %{buildroot}/%{_libdir}/systemd/system
79 84 
 cat << EOF >> %{buildroot}/%{_libdir}/systemd/system/openvswitch.service
... ... 
@@ -121,6 +140,12 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
121 121 
 %{_datadir}/openvswitch/scripts/ovn-*
122 122 
 %{_datadir}/openvswitch/scripts/ovndb-servers.ocf
123 123
124 
+%files -n python-openvswitch
125 
+%{python2_sitelib}/*
126 
+
127 
+%files -n python3-openvswitch
128 
+%{python3_sitelib}/*
129 
+
124 130 
 %files devel
125 131 
 %{_includedir}/ovn/*.h
126 132 
 %{_includedir}/openflow/*.h
... ... 
@@ -140,21 +165,23 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
140 140 
 %{_mandir}/man8/vtep-ctl.8.gz
141 141
142 142 
 %changelog
143 
-*	Sat Apr 15 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.7.0-1
144 
--	Update to 2.7.0
145 
-*	Fri Feb 10 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.6.1-2
146 
--	Build ovs shared library
147 
-*	Wed Nov 16 2016 Vinay Kulkarni <kulkarniv@vmware.com> 2.6.1-1
148 
--	Update to openvswitch 2.6.1
149 
-*	Sat Sep 24 2016 Vinay Kulkarni <kulkarniv@vmware.com> 2.5.0-1
150 
--	Update to openvswitch 2.5.0
151 
-*	Fri Sep 09 2016 Vinay Kulkarni <kulkarniv@vmware.com> 2.4.1-1
152 
--	Update to openvswitch 2.4.1
153 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.4.0-3
154 
--	GA - Bump release of all rpms
155 
-*       Sat Oct 31 2015 Vinay Kulkarni <kulkarniv@vmware.com> 2.4.0-2
156 
--       OVS requires libatomic.so.1 provided by gcc.
157 
-*       Mon Oct 12 2015 Vinay Kulkarni <kulkarniv@vmware.com> 2.4.0-1
158 
--       Update to OVS v2.4.0
159 
-*       Fri May 29 2015 Kumar Kaushik <kaushikk@vmware.com> 2.3.1-1
160 
--       Initial build. First version
143 
+*   Tue May 23 2017 Xiaolin Li <xiaolinl@vmware.com> 2.7.0-2
144 
+-   Added python and python3 subpackage.
145 
+*   Sat Apr 15 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.7.0-1
146 
+-   Update to 2.7.0
147 
+*   Fri Feb 10 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.6.1-2
148 
+-   Build ovs shared library
149 
+*   Wed Nov 16 2016 Vinay Kulkarni <kulkarniv@vmware.com> 2.6.1-1
150 
+-   Update to openvswitch 2.6.1
151 
+*   Sat Sep 24 2016 Vinay Kulkarni <kulkarniv@vmware.com> 2.5.0-1
152 
+-   Update to openvswitch 2.5.0
153 
+*   Fri Sep 09 2016 Vinay Kulkarni <kulkarniv@vmware.com> 2.4.1-1
154 
+-   Update to openvswitch 2.4.1
155 
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.4.0-3
156 
+-   GA - Bump release of all rpms
157 
+*   Sat Oct 31 2015 Vinay Kulkarni <kulkarniv@vmware.com> 2.4.0-2
158 
+-   OVS requires libatomic.so.1 provided by gcc.
159 
+*   Mon Oct 12 2015 Vinay Kulkarni <kulkarniv@vmware.com> 2.4.0-1
160 
+-   Update to OVS v2.4.0
161 
+*   Fri May 29 2015 Kumar Kaushik <kaushikk@vmware.com> 2.3.1-1
162 
+-   Initial build. First version