[libteam] Rebase to git commit cd6b557
Jiří Pírko
jirka at fedoraproject.org
Wed Jun 27 13:38:43 UTC 2012
commit 8b655cfd3e6364b92a20034d5ffff3baa7df3672
Author: Jiri Pirko <jpirko at redhat.com>
Date: Wed Jun 27 15:37:50 2012 +0200
Rebase to git commit cd6b557
.gitignore | 1 +
libteam.spec | 17 ++++++++++++-----
sources | 2 +-
3 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e728c56..bf136ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/libteam-20120405gita82f8ac.tar.gz
/libteam-20120504git11e234a.tar.gz
/libteam-20120620gita88fabf.tar.gz
+/libteam-20120627gitcd6b557.tar.gz
diff --git a/libteam.spec b/libteam.spec
index 3cce4db..82215d6 100644
--- a/libteam.spec
+++ b/libteam.spec
@@ -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 at redhat.com> - 0.1-6.20120620gita88fabf
+* Thu Jun 27 2012 Jiri Pirko <jpirko at redhat.com> - 0.1-8.20120627gitcd6b557
+- Rebase to git commit cd6b557
+
+* Thu Jun 20 2012 Jiri Pirko <jpirko at redhat.com> - 0.1-7.20120620gita88fabf
- Rebase to git commit a88fabf
* Thu May 04 2012 Jiri Pirko <jpirko at redhat.com> - 0.1-6.20120504git11e234a
diff --git a/sources b/sources
index 40e9807..caa192e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f781d387649f11ea76f240d0fbe9846c libteam-20120620gita88fabf.tar.gz
+8b21177c512bb040362479bec1919f4d libteam-20120627gitcd6b557.tar.gz
More information about the scm-commits
mailing list