Message ID | 302a733fe61aaf60cf2b0d24ea0e199e2af45377.1542739250.git.tredaelli@redhat.com |
---|---|
State | Accepted |
Headers | show |
Series | [ovs-dev] rhel: Don't ship static libraries | expand |
On Tue, Nov 20, 2018 at 07:40:50PM +0100, Timothy Redaelli wrote: > Since commit bc4fd439586f ("rhel: Ship ovs shared libraries, fedora") > openvswitch-devel RPM package includes both static and shared library. > This is against the Fedora Packaging Guidelines [1]. > > This commit prevent the static libraries and libtool archives to be shipped. > > [1] https://fedoraproject.org/wiki/Packaging:Guidelines#Packaging_Static_Libraries > Signed-off-by: Timothy Redaelli <tredaelli@redhat.com> > --- Acked-by: Flavio Leitner <fbl@sysclose.org>
On Tue, Dec 04, 2018 at 10:34:43AM -0200, Flavio Leitner wrote: > On Tue, Nov 20, 2018 at 07:40:50PM +0100, Timothy Redaelli wrote: > > Since commit bc4fd439586f ("rhel: Ship ovs shared libraries, fedora") > > openvswitch-devel RPM package includes both static and shared library. > > This is against the Fedora Packaging Guidelines [1]. > > > > This commit prevent the static libraries and libtool archives to be shipped. > > > > [1] https://fedoraproject.org/wiki/Packaging:Guidelines#Packaging_Static_Libraries > > Signed-off-by: Timothy Redaelli <tredaelli@redhat.com> > > --- > > Acked-by: Flavio Leitner <fbl@sysclose.org> Applied to master, thanks Timothy (and Flavio).
diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in index 5a49cd8e1..fedaf1077 100644 --- a/rhel/openvswitch-fedora.spec.in +++ b/rhel/openvswitch-fedora.spec.in @@ -156,10 +156,9 @@ issues in Open vSwitch setup. %package devel Summary: Open vSwitch OpenFlow development package (library, headers) License: ASL 2.0 -Provides: openvswitch-static = %{version}-%{release} %description devel -This provides static library, libopenswitch.a and the openvswitch header +This provides shared library, libopenswitch.so and the openvswitch header files needed to build an external application. %if 0%{?rhel} > 7 || 0%{?fedora} > 28 @@ -244,6 +243,7 @@ This package provides IPsec tunneling support for OVS tunnels. --with-dpdk=$(dirname %{_datadir}/dpdk/*/.config) \ %endif --enable-ssl \ + --disable-static \ --enable-shared \ --with-pkidir=%{_sharedstatedir}/openvswitch/pki \ %if 0%{?fedora} > 22 || %{with build_python3} @@ -547,12 +547,11 @@ fi %files devel %{_libdir}/lib*.so -%{_libdir}/*.a -%{_libdir}/*.la %{_libdir}/pkgconfig/*.pc %{_includedir}/openvswitch/* %{_includedir}/openflow/* %{_includedir}/ovn/* +%exclude %{_libdir}/*.la %if 0%{?rhel} > 7 || 0%{?fedora} > 28 %files -n network-scripts-%{name}
Since commit bc4fd439586f ("rhel: Ship ovs shared libraries, fedora") openvswitch-devel RPM package includes both static and shared library. This is against the Fedora Packaging Guidelines [1]. This commit prevent the static libraries and libtool archives to be shipped. [1] https://fedoraproject.org/wiki/Packaging:Guidelines#Packaging_Static_Libraries Signed-off-by: Timothy Redaelli <tredaelli@redhat.com> --- rhel/openvswitch-fedora.spec.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)