Rebase to git commit cd6b557

This commit is contained in:
Jiri Pirko 2012-06-27 15:37:50 +02:00
parent 4d575bef6b
commit 8b655cfd3e
3 changed files with 14 additions and 6 deletions

1
.gitignore vendored
View File

@ -5,3 +5,4 @@
/libteam-20120405gita82f8ac.tar.gz
/libteam-20120504git11e234a.tar.gz
/libteam-20120620gita88fabf.tar.gz
/libteam-20120627gitcd6b557.tar.gz

View File

@ -1,6 +1,6 @@
Name: libteam
Version: 0.1
Release: 7.20120620gita88fabf%{?dist}
Release: 8.20120627gitcd6b557%{?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 a88fabf
# git reset --hard cd6b557
# ./autogen.sh
# ./configure
# make distcheck
# mv libteam-0.1.tar.gz libteam-20120620gita88fabf.tar.gz
Source0: libteam-20120620gita88fabf.tar.gz
# mv libteam-0.1.tar.gz libteam-20120627gitcd6b557.tar.gz
Source0: libteam-20120627gitcd6b557.tar.gz
BuildRequires: jansson-devel
BuildRequires: libdaemon-devel
BuildRequires: libnl3-devel
@ -83,6 +83,8 @@ python ./setup.py build
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name \*.la -delete
rm -rf $RPM_BUILD_ROOT/%{_bindir}/team_*
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d
install teamd/dbus/teamd.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/
cd binding/python
python ./setup.py install --root $RPM_BUILD_ROOT -O1
@ -105,7 +107,9 @@ python ./setup.py install --root $RPM_BUILD_ROOT -O1
%files -n teamd
%defattr(-,root,root,-)
%doc COPYING teamd/example_configs
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/teamd.conf
%{_bindir}/teamd
%{_bindir}/teamdctl
%{_mandir}/man8/*
%files -n python-libteam
@ -114,7 +118,10 @@ python ./setup.py install --root $RPM_BUILD_ROOT -O1
%{python_sitearch}/*
%changelog
* Thu Jun 20 2012 Jiri Pirko <jpirko@redhat.com> - 0.1-6.20120620gita88fabf
* Thu Jun 27 2012 Jiri Pirko <jpirko@redhat.com> - 0.1-8.20120627gitcd6b557
- Rebase to git commit cd6b557
* Thu Jun 20 2012 Jiri Pirko <jpirko@redhat.com> - 0.1-7.20120620gita88fabf
- Rebase to git commit a88fabf
* Thu May 04 2012 Jiri Pirko <jpirko@redhat.com> - 0.1-6.20120504git11e234a

View File

@ -1 +1 @@
f781d387649f11ea76f240d0fbe9846c libteam-20120620gita88fabf.tar.gz
8b21177c512bb040362479bec1919f4d libteam-20120627gitcd6b557.tar.gz