From d0bbe45460d239c13de8a345a1107797da9e8ee27836bdd6bcadd575a23556d3 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 29 Jun 2012 22:41:34 +0000 Subject: [PATCH] Rip out dependence on patch OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnl3?expand=0&rev=31 --- libdir.diff | 23 ----------------------- libnl3.spec | 25 ++++++++----------------- 2 files changed, 8 insertions(+), 40 deletions(-) delete mode 100644 libdir.diff diff --git a/libdir.diff b/libdir.diff deleted file mode 100644 index 967a629..0000000 --- a/libdir.diff +++ /dev/null @@ -1,23 +0,0 @@ -From: Jan Engelhardt -Date: 2011-09-14 10:16:16.747806482 +0200 -Upstream: possibly not - -Quick hack to make pkglibdir include the version. - ---- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: libnl-3.2.8/configure.in -=================================================================== ---- libnl-3.2.8.orig/configure.in -+++ libnl-3.2.8/configure.in -@@ -41,7 +41,7 @@ m4_define([libnl_lt_age], [6]) - m4_define([libnl_version], - [libnl_major_version.libnl_minor_version.libnl_micro_version]) - --AC_INIT(libnl, [libnl_version], [http://www.infradead.org/~tgr/libnl/]) -+AC_INIT(libnl3-200, [libnl_version], [http://www.infradead.org/~tgr/libnl/]) - AC_CONFIG_HEADERS([lib/defs.h]) - AC_CONFIG_MACRO_DIR([m4]) - AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) diff --git a/libnl3.spec b/libnl3.spec index c452431..cc3a4a2 100644 --- a/libnl3.spec +++ b/libnl3.spec @@ -30,17 +30,15 @@ Url: http://people.suug.ch/~tgr/libnl/ #Git-Clone: git://git.infradead.org/users/tgr/libnl Source: libnl-%version.tar.bz2 Source2: baselibs.conf -Patch1: libdir.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf -BuildRequires: automake BuildRequires: bison -BuildRequires: fdupes -BuildRequires: flex +BuildRequires: flex >= 2.5.19 BuildRequires: libtool BuildRequires: pkgconfig >= 0.23 BuildRequires: python-devel -BuildRequires: xz +%if 0%{?suse_version} +BuildRequires: fdupes +%endif %description The libnl suite is a collection of libraries providing APIs to @@ -99,33 +97,26 @@ demonstrated. %endif %prep -%if 0%{?__xz:1} %setup -qn libnl-%version -%else -tar -xf "%{S:0}" --use=xz; -%setup -DTqn libnl-%version -%endif -%patch -P 1 -p1 %build -# we do have patches -autoreconf -fi; - if [ ! -e configure ]; then autoreconf -fi; fi; %configure --disable-static -make %{?_smp_mflags}; +make %{?_smp_mflags} pkglibdir="%_libdir/%lname"; %install b="%buildroot"; -%makeinstall +make install DESTDIR="%buildroot" pkglibdir="%_libdir/%lname"; find "$b" -iname "*.la" -delete; %if !%with_tools rm -Rf "$b/%_sysconfdir/libnl"; rm -Rf "$b/%_sbindir" "$b/%_mandir/man8"; %endif +%if "%{?fudes:1}" %fdupes %buildroot +%endif %post -n %lname -p /sbin/ldconfig