From 453da0e6c61b98ab506c633654d0d914ce7d0205 Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Sun, 7 Oct 2012 10:36:27 +0200 Subject: [PATCH] Rebase to git commit 6f48751 --- .gitignore | 1 + libteam.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 9e34c0c..ae8652e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /libteam-20120904gitbdcf72c.tar.gz /libteam-20120923git8448186.tar.gz /libteam-20120925gitcc5cddc.tar.gz +/libteam-20121007git6f48751.tar.gz diff --git a/libteam.spec b/libteam.spec index ba9ebfc..4758b6c 100644 --- a/libteam.spec +++ b/libteam.spec @@ -1,6 +1,6 @@ Name: libteam Version: 0.1 -Release: 16.20120925gitcc5cddc%{?dist} +Release: 17.20121007git6f48751%{?dist} Summary: Library for controlling team network device Group: System Environment/Libraries License: LGPLv2+ @@ -9,12 +9,12 @@ URL: http://www.libteam.org # following commands to generate the tarball: # git clone git://github.com/jpirko/libteam.git # cd libteam/ -# git reset --hard cc5cddc +# git reset --hard 6f48751 # ./autogen.sh # ./configure # make distcheck -# mv libteam-0.1.tar.gz libteam-20120925gitcc5cddc.tar.gz -Source0: libteam-20120925gitcc5cddc.tar.gz +# mv libteam-0.1.tar.gz libteam-20121007git6f48751.tar.gz +Source0: libteam-20121007git6f48751.tar.gz BuildRequires: jansson-devel BuildRequires: libdaemon-devel BuildRequires: libnl3-devel @@ -134,6 +134,9 @@ python ./setup.py install --root $RPM_BUILD_ROOT -O1 %{python_sitearch}/* %changelog +* Tue Oct 07 2012 Jiri Pirko - 0.1-17.20121007git6f48751 +- Rebase to git commit 6f48751 + * Tue Sep 25 2012 Jiri Pirko - 0.1-16.20120925gitcc5cddc - Rebase to git commit cc5cddc diff --git a/sources b/sources index 129b65f..32ebb38 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -789b2d748daa21bba49520a9e833390b libteam-20120925gitcc5cddc.tar.gz +4b7818dac17b3a2db793689ba5cd4967 libteam-20121007git6f48751.tar.gz