X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=blobdiff_plain;f=rhel%2Fopenvswitch-fedora.spec.in;h=44cd7b979d14c096d84cf6d9a207bd8eebd7edf2;hp=dc40403ee0ac352b82f5a70fb9b383b6b69b1133;hb=HEAD;hpb=85606e05b691be7c2f2d4bcf0e91170b71ec8fbb diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in index dc40403ee..44cd7b979 100644 --- a/rhel/openvswitch-fedora.spec.in +++ b/rhel/openvswitch-fedora.spec.in @@ -1,6 +1,6 @@ # Spec file for Open vSwitch. -# Copyright (C) 2009, 2010, 2013 Nicira Networks, Inc. +# Copyright (C) 2009, 2010, 2013, 2014 Nicira Networks, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright @@ -35,7 +35,7 @@ traffic. %setup -q -n openvswitch-%{version} %build -./configure --prefix=/usr --sysconfdir=/etc --localstatedir=%{_localstatedir} --enable-ssl %{build_number} +./configure --prefix=/usr --sysconfdir=/etc --localstatedir=%{_localstatedir} --enable-ssl make %{_smp_mflags} %install @@ -45,6 +45,8 @@ install -d -m 755 $RPM_BUILD_ROOT/etc install -d -m 755 $RPM_BUILD_ROOT/etc/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 @@ -60,7 +62,7 @@ install -p -m 0755 rhel/etc_sysconfig_network-scripts_ifdown-ovs \ $RPM_BUILD_ROOT/etc/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 -install -p -D -m 0644 rhel/usr_share_openvswitch_scripts_sysconfig.template \ +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 @@ -69,6 +71,9 @@ install python/compat/argparse.py $RPM_BUILD_ROOT/usr/share/openvswitch/python install -d -m 755 $RPM_BUILD_ROOT/var/lib/openvswitch +# Get rid of stuff we don't want to make RPM happy. +(cd "$RPM_BUILD_ROOT" && rm -f usr/lib/lib*) + %clean rm -rf $RPM_BUILD_ROOT @@ -101,79 +106,87 @@ systemctl start openvswitch.service %config /etc/sysconfig/openvswitch %config /etc/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/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-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-controller /usr/bin/ovs-pki /usr/bin/ovs-test /usr/bin/ovs-l3ping -%doc /usr/share/man/man8/ovs-controller.8.gz +/usr/bin/vtep-ctl %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 /var/lib/openvswitch +/var/log/openvswitch /usr/share/openvswitch/scripts/ovs-ctl %exclude /etc/openvswitch %exclude /usr/bin/ovs-benchmark @@ -185,7 +198,6 @@ systemctl start openvswitch.service %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-ctl.8.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