Accepting request 1124120 from network:utilities

- spec-cleaner run

- Fix EOF handling in xml-reader to avoid `virsh iface-*` commands
  - Do not report error in ncf_if_xml_state when interface
  - Refresh config handle earlier in ncf_define, fixed a
  - Automatically start port/slave/base interfeces when
  version (fate#306765).

OBS-URL: https://build.opensuse.org/request/show/1124120
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/netcontrol?expand=0&rev=22
This commit is contained in:
Ana Guerrero 2023-11-09 20:34:23 +00:00 committed by Git OBS Bridge
commit 18df6150ac
2 changed files with 18 additions and 56 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Nov 7 21:48:46 UTC 2023 - Dirk Müller <dmueller@suse.com>
- spec-cleaner run
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 21 15:06:25 UTC 2023 - Clemens Famulla-Conrad <cfamullaconrad@suse.com> Fri Jul 21 15:06:25 UTC 2023 - Clemens Famulla-Conrad <cfamullaconrad@suse.com>

View File

@ -33,39 +33,18 @@ Source0: %{name}-%{version}.tar.bz2
Source1: baselibs.conf Source1: baselibs.conf
Patch1: 0001-xml-reader-fix-xml_getc-and-xml_ungetc.patch Patch1: 0001-xml-reader-fix-xml_getc-and-xml_ungetc.patch
Patch2: 0002-xml-reader-allow-uppercase-for-lt-gt-and-amp-expansi.patch Patch2: 0002-xml-reader-allow-uppercase-for-lt-gt-and-amp-expansi.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} >= 1310
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: libnl3-devel BuildRequires: libnl3-devel
BuildRequires: libtool BuildRequires: libtool
%else BuildRequires: pkgconfig
%if 0%{?suse_version} >= 1210
BuildRequires: libnl-1_1-devel
%else
BuildRequires: libnl-devel
%endif
%endif
BuildRequires: pkg-config
%if 0%{?suse_version} >= 1230
Requires: sysconfig >= 0.80.0 Requires: sysconfig >= 0.80.0
%else
Requires: sysconfig >= 0.71.0
%endif
%description %description
A interim network configuration library, currently implementing the A interim network configuration library, currently implementing the
libnetcf interface for libvirt. libnetcf interface for libvirt.
Authors:
--------
Olaf Kirch <okir@suse.de>
Marius Tomaschewski <mt@suse.de>
%package -n libnetcontrol0 %package -n libnetcontrol0
Summary: A network configuration library Summary: A network configuration library
Group: Productivity/Networking/System Group: Productivity/Networking/System
@ -75,15 +54,7 @@ libnetcf interface for libvirt.
The libnetcontrol0 package provides the shared library. The libnetcontrol0 package provides the shared library.
Authors:
--------
Olaf Kirch <okir@suse.de>
Marius Tomaschewski <mt@suse.de>
%package -n libnetcontrol-devel %package -n libnetcontrol-devel
Summary: Development header and library files Summary: Development header and library files
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libnetcontrol0 = %{version} Requires: libnetcontrol0 = %{version}
@ -95,45 +66,31 @@ libnetcf interface for libvirt.
The libnetcontrol-devel package contains libraries and header files The libnetcontrol-devel package contains libraries and header files
required for development. required for development.
Authors:
--------
Olaf Kirch <okir@suse.de>
Marius Tomaschewski <mt@suse.de>
%prep %prep
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%build %build
export CFLAGS="-W -Wall $RPM_OPT_FLAGS"
%configure \ %configure \
%if 0%{?suse_version} >= 1230
--enable-network-service \ --enable-network-service \
%endif
--enable-pthreads \ --enable-pthreads \
--disable-static --disable-static
make %{?_smp_mflags} %make_build
%install %install
make install DESTDIR=$RPM_BUILD_ROOT %make_install
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la find %{buildroot} -type f -name "*.la" -delete -print
%post -n libnetcontrol0 %post -n libnetcontrol0 -p /sbin/ldconfig
/sbin/ldconfig %postun -n libnetcontrol0 -p /sbin/ldconfig
%postun -n libnetcontrol0
/sbin/ldconfig
%files -n libnetcontrol0 %files -n libnetcontrol0
%defattr(-,root,root,-)
%{_libdir}/*.so.* %{_libdir}/*.so.*
%files -n libnetcontrol-devel %files -n libnetcontrol-devel
%defattr(-,root,root,-) %license COPYING.LGPL COPYING.GPL
%doc README COPYING.LGPL COPYING.GPL ChangeLog.git %doc README ChangeLog.git
%{_libdir}/*.so %{_libdir}/*.so
%{_includedir}/* %{_includedir}/*
%{_libdir}/pkgconfig/netcontrol.pc %{_libdir}/pkgconfig/netcontrol.pc