diff --git a/libosmo-netif.spec b/libosmo-netif.spec index 151a817..a35d605 100644 --- a/libosmo-netif.spec +++ b/libosmo-netif.spec @@ -27,13 +27,11 @@ Url: http://openbsc.osmocom.org/trac/ #Git-Clone: git://git.osmocom.org/libosmo-netif #Git-Web: http://git.osmocom.org/libosmo-netif/ #Snapshot: 0.0.4 -#Update osmo-version.diff too! Source: %name-%version.tar.xz -Patch1: osmo-version.diff -Patch2: osmo-cppflags.diff -Patch3: osmo-ldadd.diff -Patch4: osmo-allincludes.diff -Patch5: osmo-talloc.diff +Patch1: osmo-cppflags.diff +Patch2: osmo-ldadd.diff +Patch3: osmo-allincludes.diff +Patch4: osmo-talloc.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -66,17 +64,17 @@ Requires: libosmonetif2 = %version %prep %setup -qn %name -%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1 +%patch -P 1 -P 2 -P 3 -P 4 -p1 %build +echo "%version" >.tarball-version autoreconf -fiv %configure --enable-shared --disable-static make %{?_smp_mflags} %install -b="%buildroot" -make %{?_smp_mflags} install DESTDIR="$b" -find "$b/%_libdir" -type f -name "*.la" -delete +%make_install +find "%buildroot/%_libdir" -type f -name "*.la" -delete %check make %{?_smp_mflags} check @@ -90,6 +88,7 @@ make %{?_smp_mflags} check %files -n libosmonetif-devel %defattr(-,root,root) +%doc COPYING %dir %_includedir/osmocom %_includedir/osmocom/netif/ %_libdir/libosmonetif.so diff --git a/osmo-version.diff b/osmo-version.diff deleted file mode 100644 index 8b6c2b5..0000000 --- a/osmo-version.diff +++ /dev/null @@ -1,20 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Sun, 17 Feb 2013 21:53:34 +0100 -Subject: [PATCH] build: set version - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 28dde0c..93bc119 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,5 +1,5 @@ - AC_INIT([libosmo-netif], -- m4_esyscmd([./git-version-gen .tarball-version]), -+ [0.0.4], - [openbsc-devel@lists.openbsc.org]) - - AM_INIT_AUTOMAKE([dist-bzip2])