Accepting request 397564 from home:jengelh:branches:network

- Keep %prep small for speedier `quilt setup`. Kill __DATE__ from
  source. Drop all .la files that are in %_libdir.
  Combine systemd calls.

OBS-URL: https://build.opensuse.org/request/show/397564
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=89

openvswitch.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 23 18:33:13 UTC 2016 - jengelh@inai.de
+
+- Keep %prep small for speedier `quilt setup`. Kill __DATE__ from
+  source. Drop all .la files that are in %_libdir.
+
 -------------------------------------------------------------------
 Fri May 20 09:54:16 UTC 2016 - mchandras@suse.de
 

openvswitch.spec

@@ -190,13 +190,14 @@ Open vSwitch is a full-featured software-based Ethernet switch.
 %prep
 %setup -q
 
+%build
 set -- * .travis*
 mkdir source
 mv "$@" source/
 mkdir obj
 
-%build
 pushd source
+perl -i -pe 's{__(DATE|TIME)__}{""}g' include/openvswitch/util.h
 # only call boot.sh for distros with autoconf >= 2.64
 bash -x boot.sh
 popd
@@ -271,6 +272,8 @@ mkdir -p %{buildroot}%{py_sitedir}
 mv %{buildroot}%{_datadir}/%{name}/python/* %{buildroot}%{py_sitedir}
 rmdir %{buildroot}%{_datadir}/%{name}/python
 
+rm -f %buildroot/%_libdir/*.la
+
 %fdupes %{buildroot}%{py_sitedir}
 
 %post -p /sbin/ldconfig
@@ -289,25 +292,17 @@ rmdir %{buildroot}%{_datadir}/%{name}/python
 %service_del_postun openvswitch.service
 
 %pre ovn
-%service_add_pre ovn-controller.service
+%service_add_pre ovn-controller.service ovn-controller-vtep.service ovn-northd.service
-%service_add_pre ovn-controller-vtep.service
-%service_add_pre ovn-northd.service
 
 %post ovn
 /sbin/ldconfig
-%service_add_post ovn-controller.service
+%service_add_post ovn-controller.service ovn-controller-vtep.service ovn-northd.service
-%service_add_post ovn-controller-vtep.service
-%service_add_post ovn-northd.service
 
 %preun ovn
-%service_del_preun ovn-controller.service
+%service_del_preun ovn-controller.service ovn-controller-vtep.service ovn-northd.service
-%service_del_preun ovn-controller-vtep.service
-%service_del_preun ovn-northd.service
 
 %postun ovn
-%service_del_postun ovn-controller.service
+%service_del_postun ovn-controller.service ovn-controller-vtep.service ovn-northd.service
-%service_del_postun ovn-controller-vtep.service
-%service_del_postun ovn-northd.service
 /sbin/ldconfig
 
 %preun test
@@ -458,17 +453,11 @@ rmdir %{buildroot}%{_datadir}/%{name}/python
 %files devel
 %defattr(-,root,root)
 %{_libdir}/libofproto.so
-%{_libdir}/libofproto.la
 %{_libdir}/libopenvswitch.so
-%{_libdir}/libopenvswitch.la
 %{_libdir}/libovn.so
-%exclude %{_libdir}/libovn.la
 %{_libdir}/libovsdb.so
-%{_libdir}/libovsdb.la
 %{_libdir}/libsflow.so
-%{_libdir}/libsflow.la
 %{_libdir}/libvtep.so
-%{_libdir}/libvtep.la
 %{_includedir}/openflow/
 %{_includedir}/openvswitch/
 %{_libdir}/pkgconfig/*.pc