From 9ea57b923157679a50ccbbef5f0d2eaa0432f68aee0ac29682aecd6baddb819f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 3 Apr 2013 11:02:53 +0000 Subject: [PATCH] Accepting request 162231 from devel:libraries:c_c++ - Update to new upstream release 1.0 - (no changes summary provided; this is the first tarball release) OBS-URL: https://build.opensuse.org/request/show/162231 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libteam?expand=0&rev=5 --- libteam-0.0+git368.tar.xz | 3 --- libteam-1.0.tar.xz | 3 +++ libteam.changes | 6 ++++++ libteam.spec | 24 ++++++++---------------- soversion.diff | 27 --------------------------- 5 files changed, 17 insertions(+), 46 deletions(-) delete mode 100644 libteam-0.0+git368.tar.xz create mode 100644 libteam-1.0.tar.xz delete mode 100644 soversion.diff diff --git a/libteam-0.0+git368.tar.xz b/libteam-0.0+git368.tar.xz deleted file mode 100644 index 559860f..0000000 --- a/libteam-0.0+git368.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0dbec0c2710115bbb25bf115c90d0729f62fbb8ba36a5f1056fc42588bf2a544 -size 287100 diff --git a/libteam-1.0.tar.xz b/libteam-1.0.tar.xz new file mode 100644 index 0000000..2dc4f01 --- /dev/null +++ b/libteam-1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8d647ded994b569012e908403ed8429243490bbdf1bc082cf45d7a2c365fe8b +size 284796 diff --git a/libteam.changes b/libteam.changes index aed2eee..64e52d9 100644 --- a/libteam.changes +++ b/libteam.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 28 23:14:35 UTC 2013 - jengelh@inai.de + +- Update to new upstream release 1.0 - + (no changes summary provided; this is the first tarball release) + ------------------------------------------------------------------- Wed Nov 14 23:47:08 UTC 2012 - jengelh@inai.de diff --git a/libteam.spec b/libteam.spec index b83fbd7..d6bcd8f 100644 --- a/libteam.spec +++ b/libteam.spec @@ -1,7 +1,7 @@ # # spec file for package libteam # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,23 +17,19 @@ Name: libteam -%define lname libteam-0p0 +%define lname libteam1 Summary: Utilities for controlling 802.1AX team network device License: LGPL-2.1+ Group: System/Kernel -Version: 0.0+git368 +Version: 1.0 Release: 0 -Url: https://fedorahosted.org/libteam/ +Url: http://libteam.org/ #Git-Web: https://github.com/jpirko/libteam #Git-Clone: git://github.com/jpirko/libteam Source: %name-%version.tar.xz -Patch1: soversion.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: python-devel BuildRequires: swig @@ -44,6 +40,7 @@ BuildRequires: pkgconfig(libdaemon) BuildRequires: pkgconfig(libnl-3.0) >= 3.2.0 BuildRequires: pkgconfig(libnl-cli-3.0) >= 3.2.0 BuildRequires: pkgconfig(libnl-genl-3.0) >= 3.2.0 +BuildRequires: pkgconfig(libnl-route-3.0) >= 3.2.19 %if 0%{?suse_version} >= 1220 BuildRequires: systemd %endif @@ -104,13 +101,9 @@ programs that will manipulate team network devices. %prep -%setup -qn %name -%patch -P 1 -p1 +%setup -q %build -if [ ! -e configure ]; then - autoreconf -fi -fi %configure --includedir="%_includedir/%name-%version" --bindir="%_sbindir" \ --disable-static # Use CFLAGS= to kill -Werror @@ -136,13 +129,12 @@ install -pm0644 teamd/redhat/systemd/*.service "$b/%_unitdir/"; %check make check -%post -n %lname -p /sbin/ldconfig - +%post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig %files -n %lname %defattr(-,root,root) -%_libdir/libteam-0p.so.0* +%_libdir/libteam.so.1* %files devel %defattr(-,root,root) diff --git a/soversion.diff b/soversion.diff deleted file mode 100644 index f05b3b6..0000000 --- a/soversion.diff +++ /dev/null @@ -1,27 +0,0 @@ -From: Jan Engelhardt -Date: 2012-05-12 02:07:15.879119810 +0200 -Upstream: no - -build: use unique SO version that won't clash - -The current ABI/API might not stay the same until the first official -libteam release, so we should not use libteam.so.0 to avoid such -future collision. Suffix it with 0p (preview). - ---- - lib/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: libteam/lib/Makefile.am -=================================================================== ---- libteam.orig/lib/Makefile.am -+++ libteam/lib/Makefile.am -@@ -6,7 +6,7 @@ lib_LTLIBRARIES = libteam.la - libteam_la_SOURCES = libteam.c ports.c options.c ifinfo.c stringify.c - libteam_la_CFLAGS= $(LIBNL_CFLAGS) -I${top_srcdir}/include -D_GNU_SOURCE - libteam_la_LIBADD= $(LIBNL_LIBS) --libteam_la_LDFLAGS = -version-info @LIBTEAM_CURRENT@:@LIBTEAM_REVISION@:@LIBTEAM_AGE@ -+libteam_la_LDFLAGS = -version-info @LIBTEAM_CURRENT@:@LIBTEAM_REVISION@:@LIBTEAM_AGE@ -release 0p - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = libteam.pc