Browse code

Avoid searching for sources in the parent path

Change-Id: I055cf4544363f5a6ac7bda4270664a50e845cc34
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6169
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Tested-by: Anish Swaminathan <anishs@vmware.com>

suezzelur authored on 2018/11/14 05:28:48
Showing 7 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,313 @@
0
+%{!?python2_sitelib: %global python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1
+%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2
+Summary:        Open vSwitch daemon/database/utilities
3
+Name:           openvswitch
4
+Version:        2.8.2
5
+Release:        3%{?dist}
6
+License:        ASL 2.0 and LGPLv2+
7
+URL:            http://www.openvswitch.org/
8
+Group:          System Environment/Daemons
9
+Vendor:         VMware, Inc.
10
+Distribution:   Photon
11
+
12
+Source0:        http://openvswitch.org/releases/%{name}-%{version}.tar.gz
13
+%define sha1 openvswitch=1d0e8cbf6d6e649e0f518219a599d7411f863875
14
+
15
+BuildRequires:  gcc >= 4.0.0
16
+BuildRequires:  libcap-ng
17
+BuildRequires:  libcap-ng-devel
18
+BuildRequires:  make
19
+BuildRequires:  openssl
20
+BuildRequires:  openssl-devel
21
+BuildRequires:  systemd
22
+BuildRequires:  python2 >= 2.7.0
23
+BuildRequires:  python2-devel
24
+BuildRequires:  python2-libs
25
+BuildRequires:  python-pip
26
+BuildRequires:  python-six
27
+BuildRequires:  python-xml
28
+BuildRequires:  python-setuptools
29
+BuildRequires:  python3 >= 3.4.0
30
+BuildRequires:  python3-devel
31
+BuildRequires:  python3-libs
32
+BuildRequires:  python3-six
33
+
34
+Requires:       libgcc-atomic
35
+Requires:       libcap-ng
36
+Requires:       openssl
37
+Requires:       python2
38
+Requires:       python2-libs
39
+Requires:       python-six
40
+Requires:       python-xml
41
+Requires:       gawk
42
+
43
+%description
44
+Open vSwitch provides standard network bridging functions and
45
+support for the OpenFlow protocol for remote per-flow control of
46
+traffic.
47
+
48
+%package -n     python-openvswitch
49
+Summary:        python-openvswitch
50
+Requires:       python2
51
+Requires:       python2-libs
52
+
53
+%description -n python-openvswitch
54
+Python 2 openvswith bindings.
55
+
56
+%package -n     python3-openvswitch
57
+Summary:        python3-openvswitch
58
+Requires:       python3
59
+Requires:       python3-libs
60
+
61
+%description -n python3-openvswitch
62
+Python 3 version.
63
+
64
+%package        devel
65
+Summary:        Header and development files for openvswitch
66
+Requires:       %{name} = %{version}
67
+%description    devel
68
+openvswitch-devel package contains header files and libs.
69
+
70
+%package        devel-static
71
+Summary:        Static libs for openvswitch
72
+Requires:       %{name} = %{version}
73
+%description    devel-static
74
+openvswitch-devel-static package contains static libs.
75
+
76
+%package        doc
77
+Summary:        Documentation for openvswitch
78
+Requires:       %{name} = %{version}-%{release}
79
+%description    doc
80
+It contains the documentation and manpages for openvswitch.
81
+
82
+%package -n	ovn-common
83
+Summary:	Common files for OVN
84
+Requires:	%{name} = %{version}-%{release}
85
+%description -n ovn-common
86
+It contains the common userspace components for OVN.
87
+
88
+%package -n	ovn-host
89
+Summary:	Host components of OVN
90
+Requires:	ovn-common = %{version}-%{release}
91
+%description -n ovn-host
92
+It contains the userspace components for OVN to be run on each hypervisor.
93
+
94
+%package -n	ovn-central
95
+Summary:	Central components of OVN
96
+Requires:	ovn-common = %{version}-%{release}
97
+%description -n ovn-central
98
+It contains the user space components for OVN to be run on central host.
99
+
100
+%package -n	ovn-controller-vtep
101
+Summary:	OVN VTEP controller binaries
102
+Requires:	ovn-common = %{version}-%{release}
103
+%description -n ovn-controller-vtep
104
+It contains the user space components for OVN Controller VTEP.
105
+
106
+%package -n	ovn-docker
107
+Summary:	OVN drivers for docker
108
+Requires:	ovn-common = %{version}-%{release}
109
+%description -n ovn-docker
110
+It contains the OVN drivers for docker networking.
111
+
112
+%package -n	ovn-doc
113
+Summary:        Documentation for OVN
114
+Requires:       ovn-common = %{version}-%{release}
115
+%description -n ovn-doc
116
+It contains the documentation and manpages for OVN.
117
+
118
+%prep
119
+%setup -q
120
+
121
+%build
122
+%configure --enable-ssl --enable-shared
123
+
124
+make %{_smp_mflags}
125
+
126
+%install
127
+make DESTDIR=%{buildroot} install
128
+find %{buildroot}/%{_libdir} -name '*.la' -delete
129
+mkdir -p %{buildroot}/%{python2_sitelib}
130
+mkdir -p %{buildroot}/%{python3_sitelib}
131
+cp -a %{buildroot}/%{_datadir}/openvswitch/python/ovs/* %{buildroot}/%{python2_sitelib}
132
+
133
+cp -a %{buildroot}/%{_datadir}/openvswitch/python/ovs/* %{buildroot}/%{python3_sitelib}
134
+
135
+mkdir -p %{buildroot}/%{_libdir}/systemd/system
136
+install -p -D -m 0644 rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template %{buildroot}/%{_sysconfdir}/sysconfig/openvswitch
137
+
138
+/usr/bin/perl build-aux/dpdkstrip.pl --nodpdk < rhel/usr_lib_systemd_system_ovs-vswitchd.service.in > rhel/usr_lib_systemd_system_ovs-vswitchd.service
139
+for service in openvswitch ovsdb-server ovs-vswitchd ovn-controller ovn-controller-vtep ovn-northd; do
140
+	install -p -D -m 0644 rhel/usr_lib_systemd_system_${service}.service %{buildroot}/%{_unitdir}/${service}.service
141
+done
142
+
143
+mkdir -p %{buildroot}/%{_sysconfdir}/openvswitch
144
+install -p -D -m 0644 rhel/etc_openvswitch_default.conf %{buildroot}/%{_sysconfdir}/openvswitch/default.conf
145
+sed -i '/OVS_USER_ID=.*/c\OVS_USER_ID=' %{buildroot}/%{_sysconfdir}/openvswitch/default.conf
146
+
147
+%check
148
+make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
149
+
150
+%preun
151
+%systemd_preun %{name}.service
152
+
153
+%preun -n ovn-central
154
+%systemd_preun ovn-northd.service
155
+
156
+%preun -n ovn-host
157
+%systemd_preun ovn-controller.service
158
+
159
+%preun -n ovn-controller-vtep
160
+%systemd_preun ovn-controller-vtep.service
161
+
162
+%post
163
+%systemd_post %{name}.service
164
+
165
+%post -n ovn-central
166
+%systemd_post ovn-northd.service
167
+
168
+%post -n ovn-host
169
+%systemd_post ovn-controller.service
170
+
171
+%post -n ovn-controller-vtep
172
+%systemd_post ovn-controller-vtep.service
173
+
174
+%postun
175
+%systemd_postun %{name}.service
176
+
177
+%postun -n ovn-central
178
+%systemd_postun ovn-northd.service
179
+
180
+%postun -n ovn-host
181
+%systemd_postun ovn-controller.service
182
+
183
+%postun -n ovn-controller-vtep
184
+%systemd_postun ovn-controller-vtep.service
185
+
186
+
187
+%files
188
+%defattr(-,root,root)
189
+%{_bindir}/ovs-*
190
+%{_bindir}/ovsdb-*
191
+%{_bindir}/vtep-ctl
192
+%{_sbindir}/ovs-*
193
+%{_sbindir}/ovsdb-server
194
+%{_unitdir}/openvswitch.service
195
+%{_unitdir}/ovs-vswitchd.service
196
+%{_unitdir}/ovsdb-server.service
197
+%{_libdir}/lib*
198
+%{_sysconfdir}/openvswitch/default.conf
199
+%{_sysconfdir}/bash_completion.d/ovs-*-bashcomp.bash
200
+%{_datadir}/openvswitch/*.ovsschema
201
+%{_datadir}/openvswitch/bugtool-plugins/*
202
+%{_datadir}/openvswitch/python/*
203
+%{_datadir}/openvswitch/scripts/ovs-*
204
+%config(noreplace) %{_sysconfdir}/sysconfig/openvswitch
205
+
206
+%files -n python-openvswitch
207
+%{python2_sitelib}/*
208
+
209
+%files -n python3-openvswitch
210
+%{python3_sitelib}/*
211
+
212
+%files devel
213
+%{_includedir}/ovn/*.h
214
+%{_includedir}/openflow/*.h
215
+%{_includedir}/openvswitch/*.h
216
+%{_libdir}/pkgconfig/*.pc
217
+
218
+%files devel-static
219
+%{_libdir}/*.a
220
+
221
+%files doc
222
+%{_mandir}/man1/ovs-*.1.gz
223
+%{_mandir}/man1/ovsdb-*.1.gz
224
+%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
225
+%{_mandir}/man5/vtep.5.gz
226
+%{_mandir}/man7/ovs-fields.7.gz
227
+%{_mandir}/man8/ovs-*.8.gz
228
+%{_mandir}/man8/vtep-ctl.8.gz
229
+
230
+%files -n ovn-common
231
+%{_bindir}/ovn-nbctl
232
+%{_bindir}/ovn-sbctl
233
+%{_bindir}/ovn-trace
234
+%{_bindir}/ovn-detrace
235
+%{_datadir}/openvswitch/scripts/ovn-ctl
236
+%{_datadir}/openvswitch/scripts/ovndb-servers.ocf
237
+%{_datadir}/openvswitch/scripts/ovn-bugtool-nbctl-show
238
+%{_datadir}/openvswitch/scripts/ovn-bugtool-sbctl-lflow-list
239
+%{_datadir}/openvswitch/scripts/ovn-bugtool-sbctl-show
240
+
241
+%files -n ovn-host
242
+%{_unitdir}/ovn-controller.service
243
+%{_bindir}/ovn-controller
244
+
245
+%files -n ovn-central
246
+%{_unitdir}/ovn-northd.service
247
+%{_bindir}/ovn-northd
248
+%{_datadir}/openvswitch/ovn-nb.ovsschema
249
+%{_datadir}/openvswitch/ovn-sb.ovsschema
250
+
251
+%files -n ovn-controller-vtep
252
+%{_unitdir}/ovn-controller-vtep.service
253
+%{_bindir}/ovn-controller-vtep
254
+
255
+%files -n ovn-docker
256
+%{_bindir}/ovn-docker-overlay-driver
257
+%{_bindir}/ovn-docker-underlay-driver
258
+
259
+%files -n ovn-doc
260
+%{_mandir}/man1/ovn-detrace.1.gz
261
+%{_mandir}/man7/ovn-architecture.7.gz
262
+%{_mandir}/man8/ovn-ctl.8.gz
263
+%{_mandir}/man8/ovn-nbctl.8.gz
264
+%{_mandir}/man8/ovn-sbctl.8.gz
265
+%{_mandir}/man8/ovn-controller-vtep.8.gz
266
+%{_mandir}/man8/ovn-controller.8.gz
267
+%{_mandir}/man5/ovn-nb.5.gz
268
+%{_mandir}/man5/ovn-sb.5.gz
269
+%{_mandir}/man8/ovn-northd.8.gz
270
+%{_mandir}/man8/ovn-trace.8.gz
271
+
272
+%changelog
273
+*   Tue Nov 13 2018 Anish Swaminathan <anishs@vmware.com> 2.8.2-3
274
+-   Replace with configure macro
275
+*   Wed Feb 28 2018 Vinay Kulkarni <kulkarniv@vmware.com> 2.8.2-2
276
+-   Setup the default conf file for local ovsdb server.
277
+*   Tue Feb 27 2018 Vinay Kulkarni <kulkarniv@vmware.com> 2.8.2-1
278
+-   Update to OVS 2.8.2
279
+*   Tue Oct 10 2017 Dheeraj Shetty <dheerajs@vmware.com> 2.7.0-9
280
+-   Fix CVE-2017-14970
281
+*   Wed Oct 04 2017 Dheeraj Shetty <dheerajs@vmware.com> 2.7.0-8
282
+-   Fix CVE-2017-9263
283
+*   Tue Sep 19 2017 Anish Swaminathan <anishs@vmware.com> 2.7.0-7
284
+-   Add gawk to Requires
285
+*   Tue Aug 29 2017 Sarah Choi <sarahc@vmware.com> 2.7.0-6
286
+-   Add python2/python-six/python-xml to Requires
287
+*   Thu Jul 13 2017 Nishant Nelogal <nnelogal@vmware.com> 2.7.0-5
288
+-   Created OVN packages and systemd service scripts
289
+*   Fri Jun 16 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.7.0-4
290
+-   Fix CVE-2017-9214, CVE-2017-9265
291
+*   Mon Jun 12 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.7.0-3
292
+-   Fix CVE-2017-9264
293
+*   Tue May 23 2017 Xiaolin Li <xiaolinl@vmware.com> 2.7.0-2
294
+-   Added python and python3 subpackage.
295
+*   Sat Apr 15 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.7.0-1
296
+-   Update to 2.7.0
297
+*   Fri Feb 10 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.6.1-2
298
+-   Build ovs shared library
299
+*   Wed Nov 16 2016 Vinay Kulkarni <kulkarniv@vmware.com> 2.6.1-1
300
+-   Update to openvswitch 2.6.1
301
+*   Sat Sep 24 2016 Vinay Kulkarni <kulkarniv@vmware.com> 2.5.0-1
302
+-   Update to openvswitch 2.5.0
303
+*   Fri Sep 09 2016 Vinay Kulkarni <kulkarniv@vmware.com> 2.4.1-1
304
+-   Update to openvswitch 2.4.1
305
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.4.0-3
306
+-   GA - Bump release of all rpms
307
+*   Sat Oct 31 2015 Vinay Kulkarni <kulkarniv@vmware.com> 2.4.0-2
308
+-   OVS requires libatomic.so.1 provided by gcc.
309
+*   Mon Oct 12 2015 Vinay Kulkarni <kulkarniv@vmware.com> 2.4.0-1
310
+-   Update to OVS v2.4.0
311
+*   Fri May 29 2015 Kumar Kaushik <kaushikk@vmware.com> 2.3.1-1
312
+-   Initial build. First version
0 313
deleted file mode 100644
... ...
@@ -1,319 +0,0 @@
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())")}
3
-Summary:        Open vSwitch daemon/database/utilities
4
-Name:           openvswitch
5
-Version:        2.8.2
6
-Release:        2%{?dist}
7
-License:        ASL 2.0 and LGPLv2+
8
-URL:            http://www.openvswitch.org/
9
-Group:          System Environment/Daemons
10
-Vendor:         VMware, Inc.
11
-Distribution:   Photon
12
-
13
-Source0:        http://openvswitch.org/releases/%{name}-%{version}.tar.gz
14
-%define sha1 openvswitch=1d0e8cbf6d6e649e0f518219a599d7411f863875
15
-
16
-BuildRequires:  gcc >= 4.0.0
17
-BuildRequires:  libcap-ng
18
-BuildRequires:  libcap-ng-devel
19
-BuildRequires:  make
20
-BuildRequires:  openssl
21
-BuildRequires:  openssl-devel
22
-BuildRequires:  systemd
23
-
24
-Requires:       libgcc-atomic
25
-Requires:       libcap-ng
26
-Requires:       openssl
27
-Requires:       python2
28
-Requires:       python2-libs
29
-Requires:       python-six
30
-Requires:       python-xml
31
-Requires:       gawk
32
-
33
-%description
34
-Open vSwitch provides standard network bridging functions and
35
-support for the OpenFlow protocol for remote per-flow control of
36
-traffic.
37
-
38
-%package -n     python-openvswitch
39
-Summary:        python-openvswitch
40
-BuildRequires:  python2 >= 2.7.0
41
-BuildRequires:  python2-devel
42
-BuildRequires:  python2-libs
43
-BuildRequires:  python-pip
44
-BuildRequires:  python-six
45
-BuildRequires:  python-xml
46
-BuildRequires:  python-setuptools
47
-Requires:       python2
48
-Requires:       python2-libs
49
-
50
-%description -n python-openvswitch
51
-Python 2 openvswith bindings.
52
-
53
-%package -n     python3-openvswitch
54
-Summary:        python3-openvswitch
55
-BuildRequires:  python3 >= 3.4.0
56
-BuildRequires:  python3-devel
57
-BuildRequires:  python3-libs
58
-BuildRequires:  python3-six
59
-Requires:       python3
60
-Requires:       python3-libs
61
-
62
-%description -n python3-openvswitch
63
-Python 3 version.
64
-
65
-%package        devel
66
-Summary:        Header and development files for openvswitch
67
-Requires:       %{name} = %{version}
68
-%description    devel
69
-openvswitch-devel package contains header files and libs.
70
-
71
-%package        devel-static
72
-Summary:        Static libs for openvswitch
73
-Requires:       %{name} = %{version}
74
-%description    devel-static
75
-openvswitch-devel-static package contains static libs.
76
-
77
-%package        doc
78
-Summary:        Documentation for openvswitch
79
-Requires:       %{name} = %{version}-%{release}
80
-%description    doc
81
-It contains the documentation and manpages for openvswitch.
82
-
83
-%package -n	ovn-common
84
-Summary:	Common files for OVN
85
-Requires:	%{name} = %{version}-%{release}
86
-%description -n ovn-common
87
-It contains the common userspace components for OVN.
88
-
89
-%package -n	ovn-host
90
-Summary:	Host components of OVN
91
-Requires:	ovn-common = %{version}-%{release}
92
-%description -n ovn-host
93
-It contains the userspace components for OVN to be run on each hypervisor.
94
-
95
-%package -n	ovn-central
96
-Summary:	Central components of OVN
97
-Requires:	ovn-common = %{version}-%{release}
98
-%description -n ovn-central
99
-It contains the user space components for OVN to be run on central host.
100
-
101
-%package -n	ovn-controller-vtep
102
-Summary:	OVN VTEP controller binaries
103
-Requires:	ovn-common = %{version}-%{release}
104
-%description -n ovn-controller-vtep
105
-It contains the user space components for OVN Controller VTEP.
106
-
107
-%package -n	ovn-docker
108
-Summary:	OVN drivers for docker
109
-Requires:	ovn-common = %{version}-%{release}
110
-%description -n ovn-docker
111
-It contains the OVN drivers for docker networking.
112
-
113
-%package -n	ovn-doc
114
-Summary:        Documentation for OVN
115
-Requires:       ovn-common = %{version}-%{release}
116
-%description -n ovn-doc
117
-It contains the documentation and manpages for OVN.
118
-
119
-%prep
120
-%setup -q
121
-
122
-%build
123
-./configure \
124
-        CFLAGS="%{optflags}" \
125
-        --prefix=%{_prefix} \
126
-        --bindir=%{_bindir} \
127
-        --libdir=%{_libdir} \
128
-        --sysconfdir=/etc \
129
-        --localstatedir=/var \
130
-        --enable-ssl \
131
-        --enable-shared
132
-
133
-make %{_smp_mflags}
134
-
135
-%install
136
-make DESTDIR=%{buildroot} install
137
-find %{buildroot}/%{_libdir} -name '*.la' -delete
138
-mkdir -p %{buildroot}/%{python2_sitelib}
139
-mkdir -p %{buildroot}/%{python3_sitelib}
140
-cp -a %{buildroot}/%{_datadir}/openvswitch/python/ovs/* %{buildroot}/%{python2_sitelib}
141
-
142
-cp -a %{buildroot}/%{_datadir}/openvswitch/python/ovs/* %{buildroot}/%{python3_sitelib}
143
-
144
-mkdir -p %{buildroot}/%{_libdir}/systemd/system
145
-install -p -D -m 0644 rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template %{buildroot}/%{_sysconfdir}/sysconfig/openvswitch
146
-
147
-/usr/bin/perl build-aux/dpdkstrip.pl --nodpdk < rhel/usr_lib_systemd_system_ovs-vswitchd.service.in > rhel/usr_lib_systemd_system_ovs-vswitchd.service
148
-for service in openvswitch ovsdb-server ovs-vswitchd ovn-controller ovn-controller-vtep ovn-northd; do
149
-	install -p -D -m 0644 rhel/usr_lib_systemd_system_${service}.service %{buildroot}/%{_unitdir}/${service}.service
150
-done
151
-
152
-mkdir -p %{buildroot}/%{_sysconfdir}/openvswitch
153
-install -p -D -m 0644 rhel/etc_openvswitch_default.conf %{buildroot}/%{_sysconfdir}/openvswitch/default.conf
154
-sed -i '/OVS_USER_ID=.*/c\OVS_USER_ID=' %{buildroot}/%{_sysconfdir}/openvswitch/default.conf
155
-
156
-%check
157
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
158
-
159
-%preun
160
-%systemd_preun %{name}.service
161
-
162
-%preun -n ovn-central
163
-%systemd_preun ovn-northd.service
164
-
165
-%preun -n ovn-host
166
-%systemd_preun ovn-controller.service
167
-
168
-%preun -n ovn-controller-vtep
169
-%systemd_preun ovn-controller-vtep.service
170
-
171
-%post
172
-%systemd_post %{name}.service
173
-
174
-%post -n ovn-central
175
-%systemd_post ovn-northd.service
176
-
177
-%post -n ovn-host
178
-%systemd_post ovn-controller.service
179
-
180
-%post -n ovn-controller-vtep
181
-%systemd_post ovn-controller-vtep.service
182
-
183
-%postun
184
-%systemd_postun %{name}.service
185
-
186
-%postun -n ovn-central
187
-%systemd_postun ovn-northd.service
188
-
189
-%postun -n ovn-host
190
-%systemd_postun ovn-controller.service
191
-
192
-%postun -n ovn-controller-vtep
193
-%systemd_postun ovn-controller-vtep.service
194
-
195
-
196
-%files
197
-%defattr(-,root,root)
198
-%{_bindir}/ovs-*
199
-%{_bindir}/ovsdb-*
200
-%{_bindir}/vtep-ctl
201
-%{_sbindir}/ovs-*
202
-%{_sbindir}/ovsdb-server
203
-%{_unitdir}/openvswitch.service
204
-%{_unitdir}/ovs-vswitchd.service
205
-%{_unitdir}/ovsdb-server.service
206
-%{_libdir}/lib*
207
-%{_sysconfdir}/openvswitch/default.conf
208
-%{_sysconfdir}/bash_completion.d/ovs-*-bashcomp.bash
209
-%{_datadir}/openvswitch/*.ovsschema
210
-%{_datadir}/openvswitch/bugtool-plugins/*
211
-%{_datadir}/openvswitch/python/*
212
-%{_datadir}/openvswitch/scripts/ovs-*
213
-%config(noreplace) %{_sysconfdir}/sysconfig/openvswitch
214
-
215
-%files -n python-openvswitch
216
-%{python2_sitelib}/*
217
-
218
-%files -n python3-openvswitch
219
-%{python3_sitelib}/*
220
-
221
-%files devel
222
-%{_includedir}/ovn/*.h
223
-%{_includedir}/openflow/*.h
224
-%{_includedir}/openvswitch/*.h
225
-%{_libdir}/pkgconfig/*.pc
226
-
227
-%files devel-static
228
-%{_libdir}/*.a
229
-
230
-%files doc
231
-%{_mandir}/man1/ovs-*.1.gz
232
-%{_mandir}/man1/ovsdb-*.1.gz
233
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
234
-%{_mandir}/man5/vtep.5.gz
235
-%{_mandir}/man7/ovs-fields.7.gz
236
-%{_mandir}/man8/ovs-*.8.gz
237
-%{_mandir}/man8/vtep-ctl.8.gz
238
-
239
-%files -n ovn-common
240
-%{_bindir}/ovn-nbctl
241
-%{_bindir}/ovn-sbctl
242
-%{_bindir}/ovn-trace
243
-%{_bindir}/ovn-detrace
244
-%{_datadir}/openvswitch/scripts/ovn-ctl
245
-%{_datadir}/openvswitch/scripts/ovndb-servers.ocf
246
-%{_datadir}/openvswitch/scripts/ovn-bugtool-nbctl-show
247
-%{_datadir}/openvswitch/scripts/ovn-bugtool-sbctl-lflow-list
248
-%{_datadir}/openvswitch/scripts/ovn-bugtool-sbctl-show
249
-
250
-%files -n ovn-host
251
-%{_unitdir}/ovn-controller.service
252
-%{_bindir}/ovn-controller
253
-
254
-%files -n ovn-central
255
-%{_unitdir}/ovn-northd.service
256
-%{_bindir}/ovn-northd
257
-%{_datadir}/openvswitch/ovn-nb.ovsschema
258
-%{_datadir}/openvswitch/ovn-sb.ovsschema
259
-
260
-%files -n ovn-controller-vtep
261
-%{_unitdir}/ovn-controller-vtep.service
262
-%{_bindir}/ovn-controller-vtep
263
-
264
-%files -n ovn-docker
265
-%{_bindir}/ovn-docker-overlay-driver
266
-%{_bindir}/ovn-docker-underlay-driver
267
-
268
-%files -n ovn-doc
269
-%{_mandir}/man1/ovn-detrace.1.gz
270
-%{_mandir}/man7/ovn-architecture.7.gz
271
-%{_mandir}/man8/ovn-ctl.8.gz
272
-%{_mandir}/man8/ovn-nbctl.8.gz
273
-%{_mandir}/man8/ovn-sbctl.8.gz
274
-%{_mandir}/man8/ovn-controller-vtep.8.gz
275
-%{_mandir}/man8/ovn-controller.8.gz
276
-%{_mandir}/man5/ovn-nb.5.gz
277
-%{_mandir}/man5/ovn-sb.5.gz
278
-%{_mandir}/man8/ovn-northd.8.gz
279
-%{_mandir}/man8/ovn-trace.8.gz
280
-
281
-%changelog
282
-*   Wed Feb 28 2018 Vinay Kulkarni <kulkarniv@vmware.com> 2.8.2-2
283
--   Setup the default conf file for local ovsdb server.
284
-*   Tue Feb 27 2018 Vinay Kulkarni <kulkarniv@vmware.com> 2.8.2-1
285
--   Update to OVS 2.8.2
286
-*   Tue Oct 10 2017 Dheeraj Shetty <dheerajs@vmware.com> 2.7.0-9
287
--   Fix CVE-2017-14970
288
-*   Wed Oct 04 2017 Dheeraj Shetty <dheerajs@vmware.com> 2.7.0-8
289
--   Fix CVE-2017-9263
290
-*   Tue Sep 19 2017 Anish Swaminathan <anishs@vmware.com> 2.7.0-7
291
--   Add gawk to Requires
292
-*   Tue Aug 29 2017 Sarah Choi <sarahc@vmware.com> 2.7.0-6
293
--   Add python2/python-six/python-xml to Requires
294
-*   Thu Jul 13 2017 Nishant Nelogal <nnelogal@vmware.com> 2.7.0-5
295
--   Created OVN packages and systemd service scripts
296
-*   Fri Jun 16 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.7.0-4
297
--   Fix CVE-2017-9214, CVE-2017-9265
298
-*   Mon Jun 12 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.7.0-3
299
--   Fix CVE-2017-9264
300
-*   Tue May 23 2017 Xiaolin Li <xiaolinl@vmware.com> 2.7.0-2
301
--   Added python and python3 subpackage.
302
-*   Sat Apr 15 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.7.0-1
303
--   Update to 2.7.0
304
-*   Fri Feb 10 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.6.1-2
305
--   Build ovs shared library
306
-*   Wed Nov 16 2016 Vinay Kulkarni <kulkarniv@vmware.com> 2.6.1-1
307
--   Update to openvswitch 2.6.1
308
-*   Sat Sep 24 2016 Vinay Kulkarni <kulkarniv@vmware.com> 2.5.0-1
309
--   Update to openvswitch 2.5.0
310
-*   Fri Sep 09 2016 Vinay Kulkarni <kulkarniv@vmware.com> 2.4.1-1
311
--   Update to openvswitch 2.4.1
312
-*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.4.0-3
313
--   GA - Bump release of all rpms
314
-*   Sat Oct 31 2015 Vinay Kulkarni <kulkarniv@vmware.com> 2.4.0-2
315
--   OVS requires libatomic.so.1 provided by gcc.
316
-*   Mon Oct 12 2015 Vinay Kulkarni <kulkarniv@vmware.com> 2.4.0-1
317
--   Update to OVS v2.4.0
318
-*   Fri May 29 2015 Kumar Kaushik <kaushikk@vmware.com> 2.3.1-1
319
--   Initial build. First version
320 1
deleted file mode 100644
... ...
@@ -1,72 +0,0 @@
1
-%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2
-%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3
-
4
-Summary:        Fast javascript parser (based on esprima.js).
5
-Name:           python-pyjsparser
6
-Version:        2.5.2
7
-Release:        1%{?dist}
8
-License:        MIT License
9
-Group:          Development/Languages/Python
10
-Vendor:         VMware, Inc.
11
-Distribution:   Photon
12
-Url:            https://pypi.python.org/pypi/pyjsparser/2.5.2
13
-Source0:        https://files.pythonhosted.org/packages/source/p/pyjsparser/pyjsparser-%{version}.tar.gz
14
-%define         sha1 pyjsparser=5a03ca6042b2f5bb2226158c8e7f15210f4eb38e
15
-BuildRequires:  python2
16
-BuildRequires:  python2-libs
17
-BuildRequires:  python2-devel
18
-BuildRequires:  python-setuptools
19
-BuildRequires:  python-six
20
-
21
-Requires:       python2
22
-Requires:       python2-libs
23
-
24
-BuildArch:      noarch
25
-
26
-%description
27
-Fast javascript parser (based on esprima.js).
28
-
29
-%package -n     python3-pyjsparser
30
-Summary:        python-pyjsparser
31
-BuildRequires:  python3-devel
32
-BuildRequires:  python3-libs
33
-BuildRequires:  python3-six
34
-BuildRequires:  python3-setuptools
35
-
36
-Requires:       python3
37
-Requires:       python3-libs
38
-
39
-%description -n python3-pyjsparser
40
-Python 3 version.
41
-
42
-%prep
43
-%setup -q -n pyjsparser-%{version}
44
-rm -rf ../p3dir
45
-cp -a . ../p3dir
46
-
47
-%build
48
-python2 setup.py build
49
-pushd ../p3dir
50
-python3 setup.py build
51
-popd
52
-
53
-%install
54
-python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
55
-pushd ../p3dir
56
-python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
57
-popd
58
-
59
-#%check
60
-#This package does not come with a test suite.
61
-
62
-%files
63
-%defattr(-,root,root)
64
-%{python2_sitelib}/*
65
-
66
-%files -n python3-pyjsparser
67
-%defattr(-,root,root)
68
-%{python3_sitelib}/*
69
-
70
-%changelog
71
-*   Mon Sep 11 2017 Xiaolin Li <xiaolinl@vmware.com> 2.5.2-1
72
--   Initial packaging for Photon
73 1
new file mode 100644
... ...
@@ -0,0 +1,72 @@
0
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1
+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2
+
3
+Summary:        Fast javascript parser (based on esprima.js).
4
+Name:           python-pyjsparser
5
+Version:        2.5.2
6
+Release:        1%{?dist}
7
+License:        MIT License
8
+Group:          Development/Languages/Python
9
+Vendor:         VMware, Inc.
10
+Distribution:   Photon
11
+Url:            https://pypi.python.org/pypi/pyjsparser/2.5.2
12
+Source0:        https://files.pythonhosted.org/packages/source/p/pyjsparser/pyjsparser-%{version}.tar.gz
13
+%define         sha1 pyjsparser=5a03ca6042b2f5bb2226158c8e7f15210f4eb38e
14
+BuildRequires:  python2
15
+BuildRequires:  python2-libs
16
+BuildRequires:  python2-devel
17
+BuildRequires:  python-setuptools
18
+BuildRequires:  python-six
19
+
20
+Requires:       python2
21
+Requires:       python2-libs
22
+
23
+BuildArch:      noarch
24
+
25
+%description
26
+Fast javascript parser (based on esprima.js).
27
+
28
+%package -n     python3-pyjsparser
29
+Summary:        python-pyjsparser
30
+BuildRequires:  python3-devel
31
+BuildRequires:  python3-libs
32
+BuildRequires:  python3-six
33
+BuildRequires:  python3-setuptools
34
+
35
+Requires:       python3
36
+Requires:       python3-libs
37
+
38
+%description -n python3-pyjsparser
39
+Python 3 version.
40
+
41
+%prep
42
+%setup -q -n pyjsparser-%{version}
43
+rm -rf ../p3dir
44
+cp -a . ../p3dir
45
+
46
+%build
47
+python2 setup.py build
48
+pushd ../p3dir
49
+python3 setup.py build
50
+popd
51
+
52
+%install
53
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
54
+pushd ../p3dir
55
+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
56
+popd
57
+
58
+#%check
59
+#This package does not come with a test suite.
60
+
61
+%files
62
+%defattr(-,root,root)
63
+%{python2_sitelib}/*
64
+
65
+%files -n python3-pyjsparser
66
+%defattr(-,root,root)
67
+%{python3_sitelib}/*
68
+
69
+%changelog
70
+*   Mon Sep 11 2017 Xiaolin Li <xiaolinl@vmware.com> 2.5.2-1
71
+-   Initial packaging for Photon
0 72
deleted file mode 100644
... ...
@@ -1,85 +0,0 @@
1
-%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2
-%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3
-
4
-Name:           python-zope.interface
5
-Version:        4.5.0
6
-Release:        1%{?dist}
7
-Url:            https://github.com/zopefoundation/zope.interface
8
-Summary:        Interfaces for Python
9
-License:        ZPL 2.1
10
-Group:          Development/Languages/Python
11
-Source0:        https://pypi.python.org/packages/source/z/zope.interface/zope.interface-%{version}.tar.gz
12
-%define sha1    zope.interface=c580dead9e8afa8f602c1e1613bb22c2060cc700
13
-
14
-BuildRequires:  python2-devel
15
-BuildRequires:  python2-libs
16
-BuildRequires:  python-setuptools
17
-
18
-Requires:       python2
19
-Requires:       python2-libs
20
-
21
-%description
22
-This package is intended to be independently reusable in any Python project. It is maintained by the Zope Toolkit project.
23
-
24
-This package provides an implementation of “object interfaces” for Python. Interfaces are a mechanism for labeling objects as conforming to a given API or contract. So, this package can be considered as implementation of the Design By Contract methodology support in Python.
25
-
26
-For detailed documentation, please see http://docs.zope.org/zope.interface
27
-
28
-%package -n     python3-zope.interface
29
-Summary:        python-zope.interface
30
-BuildRequires:  python3
31
-BuildRequires:  python3-devel
32
-BuildRequires:  python3-libs
33
-BuildRequires:  python3-setuptools
34
-BuildRequires:  python3-xml
35
-Requires:       python3
36
-Requires:       python3-libs
37
-
38
-%description -n python3-zope.interface
39
-
40
-Python 3 version.
41
-%prep
42
-%setup -q -n zope.interface-%{version}
43
-rm -rf ../p3dir
44
-cp -a . ../p3dir
45
-
46
-%build
47
-python2 setup.py build
48
-pushd ../p3dir
49
-python3 setup.py build
50
-popd
51
-
52
-%install
53
-python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
54
-pushd ../p3dir
55
-python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
56
-popd
57
-
58
-
59
-%check
60
-python2 setup.py test
61
-pushd ../p3dir
62
-python3 setup.py test
63
-popd
64
-
65
-%files
66
-%defattr(-,root,root)
67
-%{python2_sitelib}/*
68
-
69
-%files -n python3-zope.interface
70
-%defattr(-,root,root,-)
71
-%{python3_sitelib}/*
72
-
73
-%changelog
74
-*   Fri Sep 14 2018 Tapas Kundu <tkundu@vmware.com> 4.5.0-1
75
--   Updated to release 4.5.0
76
-*   Wed Jun 07 2017 Xiaolin Li <xiaolinl@vmware.com> 4.3.3-2
77
--   Add python3-setuptools and python3-xml to python3 sub package Buildrequires.
78
-*   Mon Mar 13 2017 Xiaolin Li <xiaolinl@vmware.com> 4.3.3-1
79
--   Updated to version 4.3.3.
80
-*   Mon Oct 04 2016 ChangLee <changlee@vmware.com> 4.1.3-3
81
--   Modified %check
82
-*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.1.3-2
83
--   GA - Bump release of all rpms
84
-*   Tue Oct 27 2015 Mahmoud Bassiouny <mbassiouny@vmware.com>
85
--   Initial packaging for Photon
86 1
new file mode 100644
... ...
@@ -0,0 +1,85 @@
0
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1
+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2
+
3
+Name:           python-zope.interface
4
+Version:        4.5.0
5
+Release:        1%{?dist}
6
+Url:            https://github.com/zopefoundation/zope.interface
7
+Summary:        Interfaces for Python
8
+License:        ZPL 2.1
9
+Group:          Development/Languages/Python
10
+Source0:        https://pypi.python.org/packages/source/z/zope.interface/zope.interface-%{version}.tar.gz
11
+%define sha1    zope.interface=c580dead9e8afa8f602c1e1613bb22c2060cc700
12
+
13
+BuildRequires:  python2-devel
14
+BuildRequires:  python2-libs
15
+BuildRequires:  python-setuptools
16
+
17
+Requires:       python2
18
+Requires:       python2-libs
19
+
20
+%description
21
+This package is intended to be independently reusable in any Python project. It is maintained by the Zope Toolkit project.
22
+
23
+This package provides an implementation of “object interfaces” for Python. Interfaces are a mechanism for labeling objects as conforming to a given API or contract. So, this package can be considered as implementation of the Design By Contract methodology support in Python.
24
+
25
+For detailed documentation, please see http://docs.zope.org/zope.interface
26
+
27
+%package -n     python3-zope.interface
28
+Summary:        python-zope.interface
29
+BuildRequires:  python3
30
+BuildRequires:  python3-devel
31
+BuildRequires:  python3-libs
32
+BuildRequires:  python3-setuptools
33
+BuildRequires:  python3-xml
34
+Requires:       python3
35
+Requires:       python3-libs
36
+
37
+%description -n python3-zope.interface
38
+
39
+Python 3 version.
40
+%prep
41
+%setup -q -n zope.interface-%{version}
42
+rm -rf ../p3dir
43
+cp -a . ../p3dir
44
+
45
+%build
46
+python2 setup.py build
47
+pushd ../p3dir
48
+python3 setup.py build
49
+popd
50
+
51
+%install
52
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
53
+pushd ../p3dir
54
+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
55
+popd
56
+
57
+
58
+%check
59
+python2 setup.py test
60
+pushd ../p3dir
61
+python3 setup.py test
62
+popd
63
+
64
+%files
65
+%defattr(-,root,root)
66
+%{python2_sitelib}/*
67
+
68
+%files -n python3-zope.interface
69
+%defattr(-,root,root,-)
70
+%{python3_sitelib}/*
71
+
72
+%changelog
73
+*   Fri Sep 14 2018 Tapas Kundu <tkundu@vmware.com> 4.5.0-1
74
+-   Updated to release 4.5.0
75
+*   Wed Jun 07 2017 Xiaolin Li <xiaolinl@vmware.com> 4.3.3-2
76
+-   Add python3-setuptools and python3-xml to python3 sub package Buildrequires.
77
+*   Mon Mar 13 2017 Xiaolin Li <xiaolinl@vmware.com> 4.3.3-1
78
+-   Updated to version 4.3.3.
79
+*   Mon Oct 04 2016 ChangLee <changlee@vmware.com> 4.1.3-3
80
+-   Modified %check
81
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.1.3-2
82
+-   GA - Bump release of all rpms
83
+*   Tue Oct 27 2015 Mahmoud Bassiouny <mbassiouny@vmware.com>
84
+-   Initial packaging for Photon
... ...
@@ -198,7 +198,7 @@ class PackageUtils(object):
198 198
 
199 199
         sourcePath = cmdUtils.findFile(source, constants.sourcePath)
200 200
         if not sourcePath:
201
-            sourcePath = cmdUtils.findFile(source, constants.specPath)
201
+            sourcePath = cmdUtils.findFile(source, os.path.dirname(SPECS.getData().getSpecFile(package, version)))
202 202
             if not sourcePath:
203 203
                 if sha1 is None:
204 204
                     self.logger.error("No sha1 found or missing source for " + source)