From d5e8609187fb65dee92bfa6dbc3b0d01b3ae23de9d364a65e48927c6cf3329ce Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 4 Aug 2021 10:04:47 +0000 Subject: [PATCH] revert all the pointless style changes OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ipset?expand=0&rev=103 --- ipset.spec | 56 +++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/ipset.spec b/ipset.spec index 4bad0a1..a6cc0bf 100644 --- a/ipset.spec +++ b/ipset.spec @@ -33,20 +33,20 @@ Group: Productivity/Networking/Security URL: https://ipset.netfilter.org/ #Git-Clone: git://git.netfilter.org/ipset #Git-Web: http://git.netfilter.org/ -Source: http://ipset.netfilter.org/%{name}-%{version}.tar.bz2 -Source3: %{name}-preamble +Source: http://ipset.netfilter.org/%name-%version.tar.bz2 +Source3: %name-preamble Patch1: ipset-destdir.diff BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool BuildRequires: linux-glibc-devel >= 2.6.24 -BuildRequires: pkgconfig >= 0.21 +BuildRequires: pkg-config >= 0.21 BuildRequires: pkgconfig(libmnl) >= 1 %if 0%{?ipset_build_kmp} -BuildRequires: %{kernel_module_package_buildreqs} +BuildRequires: %kernel_module_package_buildreqs BuildRequires: kernel-devel >= 2.6.39 BuildRequires: kmod-compat -%kernel_module_package -p %{name}-preamble +%kernel_module_package -p %name-preamble %endif %description @@ -77,11 +77,11 @@ when matching an entry against a set. 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 Group: System/Libraries -%description -n %{lname} +%description -n %lname IP sets are a framework inside the Linux kernel, which can be administered by the ipset utility. Depending on the type, currently an IP set may store IP addresses, (TCP/UDP) port numbers or IP @@ -91,7 +91,7 @@ when matching an entry against a set. %package devel Summary: Development files for ipset extensions Group: Development/Libraries/C and C++ -Requires: %{lname} = %{version} +Requires: %lname = %version %description devel IP sets are a framework inside the Linux kernel, which can be @@ -108,49 +108,49 @@ when matching an entry against a set. export PATH="$PATH:%_sbindir" autoreconf -fi %if 0%{?ipset_build_kmp} -for flavor in %{flavors_to_build}; do - cp -a . "../%{name}-$flavor-%{version}" - pushd "../%{name}-$flavor-%{version}/" +for flavor in %flavors_to_build; do + cp -a . "../%name-$flavor-%version" + pushd "../%name-$flavor-%version/" # ksource: it just checks for a header %configure --disable-static \ - --with-kbuild="%{_prefix}/src/linux-obj/%{_target_cpu}/$flavor" \ - --with-ksource="%{_prefix}/src/linux" \ - --includedir="%{_includedir}/%{name}" + --with-kbuild="%_prefix/src/linux-obj/%_target_cpu/$flavor" \ + --with-ksource="%_prefix/src/linux" \ + --includedir="%_includedir/%name" %make_build all modules popd done %endif %configure --disable-static --with-kmod=no \ - --includedir="%{_includedir}/%{name}" + --includedir="%_includedir/%name" %make_build %install export PATH="$PATH:%_sbindir" -b=%{buildroot} +b="%buildroot" %if 0%{?ipset_build_kmp} -for flavor in %{flavors_to_build}; do - pushd "../%{name}-$flavor-%{version}/" +for flavor in %flavors_to_build; do + pushd "../%name-$flavor-%version/" make %{?_smp_mflags} install modules_install \ DESTDIR="$b" INSTALL_MOD_PATH="$b" V=1 popd done %endif %make_install -find %{buildroot} -type f -name "*.la" -delete -print +find %buildroot -type f -name "*.la" -delete -print -%post -n %{lname} -p /sbin/ldconfig -%postun -n %{lname} -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig %files -%{_sbindir}/ipset* -%{_mandir}/man*/* +%_sbindir/ipset* +%_mandir/man*/* -%files -n %{lname} -%{_libdir}/libipset.so.13* +%files -n %lname +%_libdir/libipset.so.13* %files devel -%{_libdir}/libipset.so -%{_libdir}/pkgconfig/libipset.pc -%{_includedir}/%{name}/ +%_libdir/libipset.so +%_libdir/pkgconfig/libipset.pc +%_includedir/%name/ %changelog