Author: baggins Date: Sun Mar 25 13:26:12 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- moved ovsdbmonitor to its own package
- moved python bindings to separate package
---- Files affected:
packages/openvswitch:
openvswitch.spec (1.6 -> 1.7)
---- Diffs:
================================================================
Index: packages/openvswitch/openvswitch.spec
diff -u packages/openvswitch/openvswitch.spec:1.6
packages/openvswitch/openvswitch.spec:1.7
--- packages/openvswitch/openvswitch.spec:1.6 Sun Mar 25 00:05:41 2012
+++ packages/openvswitch/openvswitch.spec Sun Mar 25 15:26:07 2012
@@ -24,7 +24,7 @@
%define _enable_debug_packages 0
%endif
-%define rel 0.1
+%define rel 0.2
Summary: Production Quality, Multilayer Open Virtual Switch
#Summary(pl.UTF-8): -
Name: openvswitch
@@ -44,19 +44,23 @@
#Source8: openvswitch-controller.init
#Source9: openvswitch-ipsec.init
Source10: %{name}.service
+Source11: ovsdbmonitor.desktop
+#Patch0: linux-3.3.patch
+Patch1: ovsdbmonitor-move-to-its-own-data-directory.patch
URL: http://openvswitch.org/
+BuildRequires: Zope-Interface
BuildRequires: graphviz
BuildRequires: groff
BuildRequires: openssl-devel
BuildRequires: openssl-tools
BuildRequires: pkgconfig
-BuildRequires: python-distribute
BuildRequires: python-PyQt4-devel
BuildRequires: python-PyQt4-devel-tools
BuildRequires: python-TwistedConch
BuildRequires: python-TwistedCore
-BuildRequires: rpmbuild(macros) >= 1.647
+BuildRequires: python-distribute
BuildRequires: rpm-pythonprov
+BuildRequires: rpmbuild(macros) >= 1.647
%if %{with kernel}
%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >=
3:2.6.20.2}
%endif
@@ -78,10 +82,36 @@
#%description -l pl.UTF-8
+%package -n python-openvswitch
+Summary: Open vSwitch python bindings
+Group: Development/Languages/Python
+Requires: python-modules
+
+%description -n python-openvswitch
+Python bindings for the Open vSwitch database
+
+%package -n ovsdbmonitor
+Summary: Open vSwitch graphical monitoring tool
+Group: Networking/Admin
+Requires: Zope-Interface
+Requires: python-PyQt4-devel-tools
+Requires: python-TwistedConch
+Requires: python-TwistedCore
+Requires: python-modules
+Requires: python-openvswitch = %{version}-%{release}
+
+%description -n ovsdbmonitor
+A GUI tool for monitoring and troubleshooting local or remote Open
+vSwitch installations. It presents GUI tables that graphically
+represent an Open vSwitch kernel flow table (similar to "ovs-dpctl
+dump-flows") and Open vSwitch database contents (similar to "ovs-vsctl
+list <table>").
+
%package test
Summary: Open vSwitch test package
Group: Networking/Admin
Requires: python-modules
+Requires: python-openvswitch = %{version}-%{release}
%description test
This package contains utilities that are useful to diagnose
@@ -110,9 +140,14 @@
%prep
%setup -q
+#%patch0 -p1
+%patch1 -p1
cp %{SOURCE3} .
%build
+%{__aclocal} -I m4
+%{__automake}
+%{__autoconf}
%configure \
%if %{with kernel}
--with-linux=%{_kernelsrcdir} \
@@ -126,7 +161,8 @@
%if %{with userspace}
install -d
$RPM_BUILD_ROOT{%{py_sitescriptdir},%{systemdunitdir},%{systemdtmpfilesdir}} \
-
$RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d,logrotate.d},/lib/rc-scripts}
+
$RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d,logrotate.d},/lib/rc-scripts} \
+ $RPM_BUILD_ROOT%{_desktopdir}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
@@ -138,12 +174,16 @@
install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/openvswitch
install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/openvswitch
install -p %{SOURCE10} $RPM_BUILD_ROOT%{systemdunitdir}/openvswitch.service
+install -p %{SOURCE11} $RPM_BUILD_ROOT%{_desktopdir}
%{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/python/{ovs,ovstest}
$RPM_BUILD_ROOT%{py_sitescriptdir}
%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{name}/python
%py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
%py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
+
+%py_ocomp $RPM_BUILD_ROOT%{_datadir}/ovsdbmonitor
+%py_comp $RPM_BUILD_ROOT%{_datadir}/ovsdbmonitor
%endif
%if %{with kernel}
@@ -190,7 +230,6 @@
%{_datadir}/%{name}/pki
%dir %{_datadir}/%{name}/scripts
%attr(755,root,root) %{_datadir}/%{name}/scripts/*
-%{_datadir}/%{name}/ovsdbmonitor
%{_datadir}/%{name}/bugtool-plugins
%{_datadir}/%{name}/vswitch.ovsschema
@@ -209,7 +248,6 @@
%attr(755,root,root) %{_bindir}/ovs-vsctl
%attr(755,root,root) %{_bindir}/ovsdb-client
%attr(755,root,root) %{_bindir}/ovsdb-tool
-%attr(755,root,root) %{_bindir}/ovsdbmonitor
%attr(755,root,root) %{_sbindir}/ovs-brcompatd
%attr(755,root,root) %{_sbindir}/ovs-bugtool
%attr(755,root,root) %{_sbindir}/ovs-vlan-bug-workaround
@@ -221,7 +259,6 @@
%{_mandir}/man1/ovsdb-client.1*
%{_mandir}/man1/ovsdb-server.1*
%{_mandir}/man1/ovsdb-tool.1*
-%{_mandir}/man1/ovsdbmonitor.1*
%{_mandir}/man5/ovs-vswitchd.conf.db.5*
%{_mandir}/man8/ovs-appctl.8*
%{_mandir}/man8/ovs-brcompatd.8*
@@ -236,11 +273,21 @@
%{_mandir}/man8/ovs-vlan-test.8*
%{_mandir}/man8/ovs-vsctl.8*
%{_mandir}/man8/ovs-vswitchd.8*
+
+%files -n python-openvswitch
+%defattr(644,root,root,755)
%dir %{py_sitescriptdir}/ovs
%{py_sitescriptdir}/ovs/*.py*
%dir %{py_sitescriptdir}/ovs/db
%{py_sitescriptdir}/ovs/db/*.py*
+%files -n ovsdbmonitor
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/ovsdbmonitor
+%{_datadir}/ovsdbmonitor
+%{_desktopdir}/ovsdbmonitor.desktop
+%{_mandir}/man1/ovsdbmonitor.1*
+
%files test
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/ovs-test
@@ -261,6 +308,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.7 2012/03/25 13:26:07 baggins
+- moved ovsdbmonitor to its own package
+- moved python bindings to separate package
+
Revision 1.6 2012/03/24 23:05:41 baggins
- HANDLING=1 for all types of ovs devs
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/openvswitch/openvswitch.spec?r1=1.6&r2=1.7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
