Rebase to git commit bdcf72c

This commit is contained in:
Jiri Pirko 2012-09-04 13:40:28 +02:00
parent 08a659e416
commit 9dd0100904
3 changed files with 15 additions and 7 deletions

1
.gitignore vendored
View File

@ -11,3 +11,4 @@
/libteam-20120807gitf042120.tar.gz
/libteam-20120807git9fa4a96.tar.gz
/libteam-20120822gitc0d943d.tar.gz
/libteam-20120904gitbdcf72c.tar.gz

View File

@ -1,6 +1,6 @@
Name: libteam
Version: 0.1
Release: 13.20120822gitc0d943d%{?dist}
Release: 14.20120904gitbdcf72c%{?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 c0d943d
# git reset --hard bdcf72c
# ./autogen.sh
# ./configure
# make distcheck
# mv libteam-0.1.tar.gz libteam-20120822gitc0d943d.tar.gz
Source0: libteam-20120822gitc0d943d.tar.gz
# mv libteam-0.1.tar.gz libteam-20120904gitbdcf72c.tar.gz
Source0: libteam-20120904gitbdcf72c.tar.gz
BuildRequires: jansson-devel
BuildRequires: libdaemon-devel
BuildRequires: libnl3-devel
@ -67,7 +67,7 @@ programs that will manipulate team network devices.
# prepare example dir for -devel
mkdir -p _tmpdoc1/examples
cp -p src/*.c _tmpdoc1/examples
cp -p examples/*.c _tmpdoc1/examples
# prepare example dir for team-python
mkdir -p _tmpdoc2/examples
cp -p examples/python/*.py _tmpdoc2/examples
@ -103,6 +103,8 @@ python ./setup.py install --root $RPM_BUILD_ROOT -O1
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/*so.*
%{_bindir}/teamnl
%{_mandir}/man8/teamnl.8*
%files devel
%defattr(-,root,root,-)
@ -122,7 +124,9 @@ python ./setup.py install --root $RPM_BUILD_ROOT -O1
%{_sysconfdir}/sysconfig/network-scripts/ifdown-TeamPort
%{_bindir}/teamd
%{_bindir}/teamdctl
%{_mandir}/man8/*
%{_mandir}/man8/teamd.8*
%{_mandir}/man8/teamdctl.8*
%{_mandir}/man5/teamd.conf.5*
%files -n python-libteam
%defattr(-,root,root,-)
@ -130,6 +134,9 @@ python ./setup.py install --root $RPM_BUILD_ROOT -O1
%{python_sitearch}/*
%changelog
* Tue Sep 04 2012 Jiri Pirko <jpirko@redhat.com> - 0.1-14.20120904gitbdcf72c
- Rebase to git commit bdcf72c
* Thu Aug 22 2012 Jiri Pirko <jpirko@redhat.com> - 0.1-13.20120822gitc0d943d
- Rebase to git commit c0d943d

View File

@ -1 +1 @@
96a630b7074075e0d15d32209731cf0c libteam-20120822gitc0d943d.tar.gz
3b8655cfc2d48c55d339b576a2e4affd libteam-20120904gitbdcf72c.tar.gz