run spec-beautifier instead

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ipset?expand=0&rev=60
This commit is contained in:
Jan Engelhardt 2017-09-17 21:03:21 +00:00 committed by Git OBS Bridge
parent 8c7adcba78
commit 508415b4cd
2 changed files with 29 additions and 30 deletions

View File

@ -2,7 +2,6 @@
Fri Sep 15 16:44:31 UTC 2017 - kstreitova@suse.com Fri Sep 15 16:44:31 UTC 2017 - kstreitova@suse.com
- fix build for Factory - fix build for Factory
- run spec-cleaner
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 17 11:45:35 UTC 2017 - jengelh@inai.de Fri Mar 17 11:45:35 UTC 2017 - jengelh@inai.de

View File

@ -33,8 +33,8 @@ Group: Productivity/Networking/Security
Url: http://ipset.netfilter.org/ Url: http://ipset.netfilter.org/
#Git-Clone: git://git.netfilter.org/ipset #Git-Clone: git://git.netfilter.org/ipset
#Git-Web: http://git.netfilter.org/ #Git-Web: http://git.netfilter.org/
Source: http://ipset.netfilter.org/%{name}-%{version}.tar.bz2 Source: http://ipset.netfilter.org/%name-%version.tar.bz2
Source3: %{name}-preamble Source3: %name-preamble
Patch1: ipset-destdir.diff Patch1: ipset-destdir.diff
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
@ -43,9 +43,9 @@ BuildRequires: linux-glibc-devel >= 2.6.24
BuildRequires: pkgconfig >= 0.21 BuildRequires: pkgconfig >= 0.21
BuildRequires: pkgconfig(libmnl) >= 1 BuildRequires: pkgconfig(libmnl) >= 1
%if 0%{?ipset_build_kmp} %if 0%{?ipset_build_kmp}
BuildRequires: %{kernel_module_package_buildreqs} BuildRequires: %kernel_module_package_buildreqs
BuildRequires: kernel-syms >= 2.6.39 BuildRequires: kernel-syms >= 2.6.39
%kernel_module_package -p %{name}-preamble %kernel_module_package -p %name-preamble
%if 0%{?suse_version} >= 1320 %if 0%{?suse_version} >= 1320
BuildRequires: kmod-compat BuildRequires: kmod-compat
%endif %endif
@ -79,11 +79,11 @@ when matching an entry against a set.
This package contains a version update to the in-kernel ipset modules. This package contains a version update to the in-kernel ipset modules.
%package -n %{lname} %package -n %lname
Summary: Userspace library for the in-kernel Netfilter ipset interface Summary: Userspace library for the in-kernel Netfilter ipset interface
Group: System/Libraries Group: System/Libraries
%description -n %{lname} %description -n %lname
IP sets are a framework inside the Linux kernel, which can be IP sets are a framework inside the Linux kernel, which can be
administered by the ipset utility. Depending on the type, currently administered by the ipset utility. Depending on the type, currently
an IP set may store IP addresses, (TCP/UDP) port numbers or IP an IP set may store IP addresses, (TCP/UDP) port numbers or IP
@ -93,7 +93,7 @@ when matching an entry against a set.
%package devel %package devel
Summary: Development files for ipset extensions Summary: Development files for ipset extensions
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{lname} = %{version} Requires: %lname = %version
%description devel %description devel
IP sets are a framework inside the Linux kernel, which can be IP sets are a framework inside the Linux kernel, which can be
@ -108,52 +108,52 @@ when matching an entry against a set.
%build %build
# build wants to call modinfo at some point # build wants to call modinfo at some point
export PATH="$PATH:%{_prefix}/sbin" export PATH="$PATH:%_prefix/sbin"
autoreconf -fi autoreconf -fi
%if 0%{?ipset_build_kmp} %if 0%{?ipset_build_kmp}
for flavor in %{flavors_to_build}; do for flavor in %flavors_to_build; do
cp -a . "../%{name}-$flavor-%{version}" cp -a . "../%name-$flavor-%version"
pushd "../%{name}-$flavor-%{version}/" pushd "../%name-$flavor-%version/"
# ksource: it just checks for a header # ksource: it just checks for a header
%configure --disable-static \ %configure --disable-static \
--with-kbuild="%{_prefix}/src/linux-obj/%{_target_cpu}/$flavor" \ --with-kbuild="%_prefix/src/linux-obj/%_target_cpu/$flavor" \
--with-ksource="%{_prefix}/src/linux" \ --with-ksource="%_prefix/src/linux" \
--includedir="%{_includedir}/%{name}" --includedir="%_includedir/%name"
make %{?_smp_mflags} all modules make %{?_smp_mflags} all modules
popd popd
done done
%endif %endif
%configure --disable-static --with-kmod=no \ %configure --disable-static --with-kmod=no \
--includedir="%{_includedir}/%{name}" --includedir="%_includedir/%name"
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
export PATH="$PATH:%{_prefix}/sbin" export PATH="$PATH:%_prefix/sbin"
b=%{buildroot} b=%buildroot
%if 0%{?ipset_build_kmp} %if 0%{?ipset_build_kmp}
for flavor in %{flavors_to_build}; do for flavor in %flavors_to_build; do
pushd "../%{name}-$flavor-%{version}/" pushd "../%name-$flavor-%version/"
make %{?_smp_mflags} install modules_install \ make %{?_smp_mflags} install modules_install \
DESTDIR="$b" INSTALL_MOD_PATH="$b" V=1 DESTDIR="$b" INSTALL_MOD_PATH="$b" V=1
popd; popd;
done; done;
%endif %endif
make %{?_smp_mflags} install DESTDIR="$b" make %{?_smp_mflags} install DESTDIR="$b"
find %{buildroot} -type f -name "*.la" -delete -print find %buildroot -type f -name "*.la" -delete -print
%post -n %{lname} -p /sbin/ldconfig %post -n %lname -p /sbin/ldconfig
%postun -n %{lname} -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig
%files %files
%{_sbindir}/ipset %_sbindir/ipset
%{_mandir}/man*/* %_mandir/man*/*
%files -n %{lname} %files -n %lname
%{_libdir}/libipset.so.3* %_libdir/libipset.so.3*
%files devel %files devel
%{_libdir}/libipset.so %_libdir/libipset.so
%{_libdir}/pkgconfig/libipset.pc %_libdir/pkgconfig/libipset.pc
%{_includedir}/%{name}/ %_includedir/%name/
%changelog %changelog