#%define kernel 2.6.40.4-5.fc15.x86_64
+# Enable PIE, bz#955181
+%global _hardened_build 1
+
Name: openvswitch
Summary: Open vSwitch
Group: System Environment/Daemons
BuildRequires: desktop-file-utils
BuildRequires: groff graphviz
+Requires: openssl iproute module-init-tools
+#Upstream kernel commit 4f647e0a3c37b8d5086214128614a136064110c3
+Requires: kernel >= 3.15.0-0
+
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
+Obsoletes: openvswitch-controller <= 0:2.1.0-1
%bcond_without check
%description
-Open vSwitch provides standard network bridging functions augmented with
+Open vSwitch provides standard network bridging functions and
support for the OpenFlow protocol for remote per-flow control of
traffic.
+%package -n python-openvswitch
+Summary: Open vSwitch python bindings
+License: ASL 2.0
+BuildArch: noarch
+Requires: python
+
+%description -n python-openvswitch
+Python bindings for the Open vSwitch database
+
+%package test
+Summary: Open vSwitch testing utilities
+License: ASL 2.0
+BuildArch: noarch
+Requires: python-openvswitch = %{version}-%{release}
+Requires: python python-twisted-core python-twisted-web
+
+%description test
+Utilities that are useful to diagnose performance and connectivity
+issues in Open vSwitch setup.
+
+%package devel
+Summary: Open vSwitch OpenFlow development package (library, headers)
+License: ASL 2.0
+Provides: openvswitch-static = %{version}-%{release}
+
+%description devel
+This provides static library, libopenswitch.a and the openvswitch header
+files needed to build an external application.
+
+
%prep
-%setup -q -n openvswitch-%{version}
+%setup -q
%build
-./configure --prefix=/usr --sysconfdir=/etc --localstatedir=%{_localstatedir} --enable-ssl
-make %{_smp_mflags}
+%configure --enable-ssl --with-pkidir=%{_sharedstatedir}/openvswitch/pki
+make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-install -d -m 755 $RPM_BUILD_ROOT/etc
-install -d -m 755 $RPM_BUILD_ROOT/etc/openvswitch
+install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}
+install -d -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch
install -p -D -m 0644 rhel/usr_lib_systemd_system_openvswitch.service \
$RPM_BUILD_ROOT%{_unitdir}/openvswitch.service
install -p -D -m 0644 rhel/usr_lib_systemd_system_openvswitch-nonetwork.service \
$RPM_BUILD_ROOT%{_unitdir}/openvswitch-nonetwork.service
install -m 755 rhel/etc_init.d_openvswitch \
$RPM_BUILD_ROOT%{_datadir}/openvswitch/scripts/openvswitch.init
-install -d -m 755 $RPM_BUILD_ROOT/etc/sysconfig
-install -d -m 755 $RPM_BUILD_ROOT/etc/logrotate.d
+install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig
+install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d
install -m 755 rhel/etc_logrotate.d_openvswitch \
- $RPM_BUILD_ROOT/etc/logrotate.d/openvswitch
-install -d -m 755 $RPM_BUILD_ROOT/etc/profile.d
+ $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/openvswitch
+install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d
install -m 644 vswitchd/vswitch.ovsschema \
- $RPM_BUILD_ROOT/usr/share/openvswitch/vswitch.ovsschema
-install -d -m 755 $RPM_BUILD_ROOT/usr/share/openvswitch/scripts
-install -d -m 0755 $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/
+ $RPM_BUILD_ROOT/%{_datadir}/openvswitch/vswitch.ovsschema
+install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/openvswitch/scripts
+install -d -m 0755 $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/
install -p -m 0755 rhel/etc_sysconfig_network-scripts_ifdown-ovs \
- $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifdown-ovs
+ $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs
install -p -m 0755 rhel/etc_sysconfig_network-scripts_ifup-ovs \
- $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-ovs
+ $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/ifup-ovs
install -p -D -m 0644 rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template \
- $RPM_BUILD_ROOT/etc/sysconfig/openvswitch
-install -d -m 755 $RPM_BUILD_ROOT/usr/share/openvswitch/scripts
+ $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/openvswitch
+install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/openvswitch/scripts
+
+install -d -m 0755 $RPM_BUILD_ROOT%{python_sitelib}
+mv $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/* $RPM_BUILD_ROOT%{python_sitelib}
+rmdir $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/
+
+install -d -m 755 $RPM_BUILD_ROOT/%{_sharedstatedir}/openvswitch
+
+install -d -m 0755 $RPM_BUILD_ROOT%{_includedir}/openvswitch
+install -p -D -m 0644 include/openvswitch/*.h \
+ -t $RPM_BUILD_ROOT%{_includedir}/openvswitch
+install -p -D -m 0644 config.h -t $RPM_BUILD_ROOT%{_includedir}/openvswitch
-install python/compat/uuid.py $RPM_BUILD_ROOT/usr/share/openvswitch/python
-install python/compat/argparse.py $RPM_BUILD_ROOT/usr/share/openvswitch/python
+install -d -m 0755 $RPM_BUILD_ROOT%{_includedir}/openvswitch/lib
+install -p -D -m 0644 lib/*.h \
+ -t $RPM_BUILD_ROOT%{_includedir}/openvswitch/lib
-install -d -m 755 $RPM_BUILD_ROOT/var/lib/openvswitch
+install -d -m 0755 $RPM_BUILD_ROOT%{_includedir}/openflow
+install -p -D -m 0644 include/openflow/*.h \
+ -t $RPM_BUILD_ROOT%{_includedir}/openflow
-# Get rid of stuff we don't want to make RPM happy.
-(cd "$RPM_BUILD_ROOT" && rm -f usr/lib/lib*)
+touch $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/conf.db
+touch $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/system-id.conf
%check
%if %{with check}
%postun
+%files -n python-openvswitch
+%{python_sitelib}/ovs
+%doc COPYING
+
+%files test
+%{_bindir}/ovs-test
+%{_bindir}/ovs-vlan-test
+%{_bindir}/ovs-l3ping
+%{_mandir}/man8/ovs-test.8*
+%{_mandir}/man8/ovs-vlan-test.8*
+%{_mandir}/man8/ovs-l3ping.8*
+%{python_sitelib}/ovstest
+
+%files devel
+%{_libdir}/*.a
+%{_libdir}/*.la
+%{_includedir}/openvswitch/*
+%{_includedir}/openflow/*
+
%files
%defattr(-,root,root)
-%config /etc/sysconfig/openvswitch
-%config /etc/logrotate.d/openvswitch
+%dir %{_sysconfdir}/openvswitch
+%config %ghost %{_sysconfdir}/openvswitch/conf.db
+%config %ghost %{_sysconfdir}/openvswitch/system-id.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/openvswitch
+%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch
%{_unitdir}/openvswitch.service
%{_unitdir}/openvswitch-nonetwork.service
%{_datadir}/openvswitch/scripts/openvswitch.init
%{_sysconfdir}/sysconfig/network-scripts/ifup-ovs
%{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs
-/usr/share/openvswitch/bugtool-plugins/
-/usr/share/openvswitch/python/ovs/__init__.py*
-/usr/share/openvswitch/python/ovs/daemon.py*
-/usr/share/openvswitch/python/ovs/db/__init__.py*
-/usr/share/openvswitch/python/ovs/db/data.py*
-/usr/share/openvswitch/python/ovs/db/error.py*
-/usr/share/openvswitch/python/ovs/db/idl.py*
-/usr/share/openvswitch/python/ovs/db/parser.py*
-/usr/share/openvswitch/python/ovs/db/schema.py*
-/usr/share/openvswitch/python/ovs/db/types.py*
-/usr/share/openvswitch/python/ovs/dirs.py*
-/usr/share/openvswitch/python/ovs/fatal_signal.py*
-/usr/share/openvswitch/python/ovs/json.py*
-/usr/share/openvswitch/python/ovs/jsonrpc.py*
-/usr/share/openvswitch/python/ovs/ovsuuid.py*
-/usr/share/openvswitch/python/ovs/poller.py*
-/usr/share/openvswitch/python/ovs/process.py*
-/usr/share/openvswitch/python/ovs/reconnect.py*
-/usr/share/openvswitch/python/ovs/socket_util.py*
-/usr/share/openvswitch/python/ovs/stream.py*
-/usr/share/openvswitch/python/ovs/timeval.py*
-/usr/share/openvswitch/python/ovs/util.py*
-/usr/share/openvswitch/python/ovs/version.py*
-/usr/share/openvswitch/python/ovs/unixctl/__init__.py*
-/usr/share/openvswitch/python/ovs/unixctl/client.py*
-/usr/share/openvswitch/python/ovs/unixctl/server.py*
-/usr/share/openvswitch/python/uuid.py*
-/usr/share/openvswitch/python/argparse.py*
-/usr/share/openvswitch/python/ovs/vlog.py*
-/usr/share/openvswitch/python/ovstest/__init__.py*
-/usr/share/openvswitch/python/ovstest/args.py*
-/usr/share/openvswitch/python/ovstest/rpcserver.py*
-/usr/share/openvswitch/python/ovstest/tcp.py*
-/usr/share/openvswitch/python/ovstest/udp.py*
-/usr/share/openvswitch/python/ovstest/util.py*
-/usr/share/openvswitch/python/ovstest/vswitch.py*
-/usr/share/openvswitch/python/ovstest/tests.py*
-/usr/share/openvswitch/scripts/ovs-bugtool-*
-/usr/share/openvswitch/scripts/ovs-check-dead-ifs
-/usr/share/openvswitch/scripts/ovs-lib
-/usr/share/openvswitch/scripts/ovs-vtep
-%config /usr/share/openvswitch/vswitch.ovsschema
-%config /usr/share/openvswitch/vtep.ovsschema
-/usr/sbin/ovs-bugtool
-/usr/sbin/ovs-vswitchd
-/usr/sbin/ovsdb-server
-/usr/bin/ovs-appctl
-/usr/bin/ovs-docker
-/usr/bin/ovs-dpctl
-/usr/bin/ovs-dpctl-top
-/usr/bin/ovs-ofctl
-/usr/bin/ovs-vsctl
-/usr/bin/ovsdb-client
-/usr/bin/ovsdb-tool
-/usr/bin/ovs-testcontroller
-/usr/bin/ovs-pki
-/usr/bin/ovs-test
-/usr/bin/ovs-l3ping
-/usr/bin/vtep-ctl
-%doc /usr/share/man/man8/ovs-testcontroller.8.gz
-%doc /usr/share/man/man8/ovs-pki.8.gz
-%doc /usr/share/man/man1/ovsdb-client.1.gz
-%doc /usr/share/man/man1/ovsdb-server.1.gz
-%doc /usr/share/man/man1/ovsdb-tool.1.gz
-%doc /usr/share/man/man5/ovs-vswitchd.conf.db.5.gz
-%doc /usr/share/man/man5/vtep.5.gz
-%doc /usr/share/man/man8/ovs-appctl.8.gz
-%doc /usr/share/man/man8/ovs-bugtool.8.gz
-%doc /usr/share/man/man8/ovs-ctl.8.gz
-%doc /usr/share/man/man8/ovs-dpctl.8.gz
-%doc /usr/share/man/man8/ovs-dpctl-top.8.gz
-%doc /usr/share/man/man8/ovs-ofctl.8.gz
-%doc /usr/share/man/man8/ovs-parse-backtrace.8.gz
-%doc /usr/share/man/man8/ovs-vsctl.8.gz
-%doc /usr/share/man/man8/ovs-vswitchd.8.gz
-%doc /usr/share/man/man8/ovs-test.8.gz
-%doc /usr/share/man/man8/ovs-l3ping.8.gz
-%doc /usr/share/man/man8/vtep-ctl.8.gz
-%doc COPYING DESIGN.md INSTALL.SSL.md NOTICE README.md WHY-OVS.md FAQ.md NEWS INSTALL.DPDK.md
+%{_datadir}/openvswitch/bugtool-plugins/
+%{_datadir}/openvswitch/scripts/ovs-bugtool-*
+%{_datadir}/openvswitch/scripts/ovs-check-dead-ifs
+%{_datadir}/openvswitch/scripts/ovs-lib
+%{_datadir}/openvswitch/scripts/ovs-vtep
+%{_datadir}/openvswitch/scripts/ovs-ctl
+%config %{_datadir}/openvswitch/vswitch.ovsschema
+%config %{_datadir}/openvswitch/vtep.ovsschema
+%{_bindir}/ovs-appctl
+%{_bindir}/ovs-docker
+%{_bindir}/ovs-dpctl
+%{_bindir}/ovs-dpctl-top
+%{_bindir}/ovs-ofctl
+%{_bindir}/ovs-vsctl
+%{_bindir}/ovsdb-client
+%{_bindir}/ovsdb-tool
+%{_bindir}/ovs-testcontroller
+%{_bindir}/ovs-pki
+%{_bindir}/vtep-ctl
+%{_sbindir}/ovs-bugtool
+%{_sbindir}/ovs-vswitchd
+%{_sbindir}/ovsdb-server
+%{_mandir}/man1/ovs-benchmark.1*
+%{_mandir}/man1/ovs-pcap.1*
+%{_mandir}/man1/ovs-tcpundump.1*
+%{_mandir}/man1/ovsdb-client.1*
+%{_mandir}/man1/ovsdb-server.1*
+%{_mandir}/man1/ovsdb-tool.1*
+%{_mandir}/man5/ovs-vswitchd.conf.db.5*
+%{_mandir}/man5/vtep.5*
+%{_mandir}/man8/vtep-ctl.8*
+%{_mandir}/man8/ovs-appctl.8*
+%{_mandir}/man8/ovs-bugtool.8*
+%{_mandir}/man8/ovs-ctl.8*
+%{_mandir}/man8/ovs-dpctl.8*
+%{_mandir}/man8/ovs-dpctl-top.8*
+%{_mandir}/man8/ovs-ofctl.8*
+%{_mandir}/man8/ovs-pki.8*
+%{_mandir}/man8/ovs-vsctl.8*
+%{_mandir}/man8/ovs-vswitchd.8*
+%{_mandir}/man8/ovs-parse-backtrace.8*
+%{_mandir}/man8/ovs-testcontroller.8*
+%doc COPYING DESIGN.md INSTALL.SSL.md NOTICE README.md WHY-OVS.md
+%doc FAQ.md NEWS INSTALL.DPDK.md rhel/README.RHEL
/var/lib/openvswitch
/var/log/openvswitch
-/usr/share/openvswitch/scripts/ovs-ctl
-%exclude /etc/openvswitch
-%exclude /usr/bin/ovs-benchmark
-%exclude /usr/bin/ovs-parse-backtrace
-%exclude /usr/bin/ovs-pcap
-%exclude /usr/bin/ovs-tcpundump
-%exclude /usr/bin/ovs-vlan-test
-%exclude /usr/sbin/ovs-vlan-bug-workaround
-%exclude /usr/share/man/man1/ovs-benchmark.1.gz
-%exclude /usr/share/man/man1/ovs-pcap.1.gz
-%exclude /usr/share/man/man1/ovs-tcpundump.1.gz
-%exclude /usr/share/man/man8/ovs-vlan-bug-workaround.8.gz
-%exclude /usr/share/man/man8/ovs-vlan-test.8.gz
-%exclude /usr/share/openvswitch/scripts/ovs-save
+%exclude %{_bindir}/ovs-benchmark
+%exclude %{_bindir}/ovs-parse-backtrace
+%exclude %{_bindir}/ovs-pcap
+%exclude %{_bindir}/ovs-tcpundump
+%exclude %{_sbindir}/ovs-vlan-bug-workaround
+%exclude %{_mandir}/man1/ovs-benchmark.1.gz
+%exclude %{_mandir}/man1/ovs-pcap.1.gz
+%exclude %{_mandir}/man1/ovs-tcpundump.1.gz
+%exclude %{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
+%exclude %{_datadir}/openvswitch/scripts/ovs-save
%changelog
* Wed Jan 12 2011 Ralf Spenneberg <ralf@os-s.net>
projects / cascardo / ovs.git / blobdiff