From 1ef1e410451fcc813d30989f0291815b98081455 Mon Sep 17 00:00:00 2001 From: Flavio Leitner Date: Aug 25 2015 18:12:38 +0000 Subject: Updated to 2.4.0 Resolves: #1256171 --- diff --git a/.gitignore b/.gitignore index dc38922..ae59ad4 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /openvswitch-2.3.1-git3282e51.tar.gz /openvswitch-2.3.1-git4750c96.tar.gz /openvswitch-2.3.2.tar.gz +/openvswitch-2.4.0.tar.gz diff --git a/openvswitch-runtimedir.patch b/openvswitch-runtimedir.patch deleted file mode 100644 index 5d7c30a..0000000 --- a/openvswitch-runtimedir.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -pur openvswitch-2.3.1-git4750c96/rhel/usr_lib_systemd_system_openvswitch-nonetwork.service openvswitch-2.3.1-git4750c96.runtime/rhel/usr_lib_systemd_system_openvswitch-nonetwork.service ---- openvswitch-2.3.1-git4750c96/rhel/usr_lib_systemd_system_openvswitch-nonetwork.service 2015-03-27 07:11:14.000000000 -0300 -+++ openvswitch-2.3.1-git4750c96.runtime/rhel/usr_lib_systemd_system_openvswitch-nonetwork.service 2015-04-27 14:28:24.200553595 -0300 -@@ -11,3 +11,5 @@ EnvironmentFile=-/etc/sysconfig/openvswi - ExecStart=/usr/share/openvswitch/scripts/ovs-ctl start \ - --system-id=random $OPTIONS - ExecStop=/usr/share/openvswitch/scripts/ovs-ctl stop -+RuntimeDirectory=openvswitch -+RuntimeDirectoryMode=0755 diff --git a/openvswitch.spec b/openvswitch.spec index 3e26680..651531a 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -1,17 +1,9 @@ # Uncomment these for snapshot releases: # snapshot is the date YYYYMMDD of the snapshot # snap_git is the 8 git sha digits of the last commit -# You must edit configure.ac and downgrade the version from -# the development one to the stable one to not confuse RPM -# during future upgrades. -# Steps: -# 1. Checkout the git branch -# 2. Change version in configure.ac to be -git<8sha> -# 3. Run: ./boot.sh -# 4. Run: ./configure.sh -# 5. Run: make dist -#% define snapshot .git20150327 -#% define snap_gitsha -git4750c96 +# Use ovs-snapshot.sh to create the tarball. +#% define snapshot .git20150730 +#% define snap_gitsha -git72bfa562 # If wants to run tests while building, specify the '--with check' # option. For example: @@ -21,7 +13,7 @@ %global _hardened_build 1 Name: openvswitch -Version: 2.3.2 +Version: 2.4.0 Release: 1%{?snapshot}%{?dist} Summary: Open vSwitch daemon/database/utilities @@ -32,12 +24,11 @@ Summary: Open vSwitch daemon/database/utilities License: ASL 2.0 and LGPLv2+ and SISSL URL: http://openvswitch.org Source0: http://openvswitch.org/releases/%{name}-%{version}%{?snap_gitsha}.tar.gz - -Patch1: openvswitch-runtimedir.patch +Source1: ovs-snapshot.sh ExcludeArch: ppc -BuildRequires: autoconf +BuildRequires: autoconf automake libtool BuildRequires: systemd-units openssl openssl-devel BuildRequires: python python-twisted-core python-zope-interface PyQt4 BuildRequires: desktop-file-utils @@ -93,9 +84,14 @@ files needed to build an external application. %prep %setup -q -n %{name}-%{version}%{?snap_gitsha} -%patch1 -p1 %build +%if 0%{?snap_gitsha:1} +# fix the snapshot unreleased version to be the released one. +sed -i.old -e "s/^AC_INIT(openvswitch,.*,/AC_INIT(openvswitch, %{version},/" configure.ac +./boot.sh +%endif + %configure --enable-ssl --with-pkidir=%{_sharedstatedir}/openvswitch/pki make %{?_smp_mflags} @@ -137,20 +133,6 @@ rmdir $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/ install -d -m 0755 $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 -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 0755 $RPM_BUILD_ROOT%{_includedir}/openflow -install -p -D -m 0644 include/openflow/*.h \ - -t $RPM_BUILD_ROOT%{_includedir}/openflow - touch $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/conf.db touch $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/system-id.conf @@ -189,16 +171,6 @@ rm -rf $RPM_BUILD_ROOT fi %endif -# Package with native systemd unit file is installed for the first time -%triggerun -- %{name} < 1.9.0-1 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply openvswitch -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save %{name} >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del %{name} >/dev/null 2>&1 || : -/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : %postun %if 0%{?systemd_postun_with_restart:1} @@ -228,11 +200,14 @@ rm -rf $RPM_BUILD_ROOT %files devel %{_libdir}/*.a %{_libdir}/*.la +%{_libdir}/pkgconfig/*.pc %{_includedir}/openvswitch/* %{_includedir}/openflow/* %files %defattr(-,root,root) +%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash +%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash %dir %{_sysconfdir}/openvswitch %config %ghost %{_sysconfdir}/openvswitch/conf.db %config %ghost %{_sysconfdir}/openvswitch/system-id.conf @@ -252,14 +227,14 @@ rm -rf $RPM_BUILD_ROOT %config %{_datadir}/openvswitch/vswitch.ovsschema %config %{_datadir}/openvswitch/vtep.ovsschema %{_bindir}/ovs-appctl -#%{_bindir}/ovs-docker +%{_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-testcontroller %{_bindir}/ovs-pki %{_bindir}/vtep-ctl %{_sbindir}/ovs-bugtool @@ -284,9 +259,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/ovs-vsctl.8* %{_mandir}/man8/ovs-vswitchd.8* %{_mandir}/man8/ovs-parse-backtrace.8* -#%{_mandir}/man8/ovs-testcontroller.8* -%doc COPYING DESIGN INSTALL.SSL NOTICE README WHY-OVS -%doc FAQ NEWS INSTALL.DPDK rhel/README.RHEL +%{_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 %ghost %attr(755,root,root) %{_rundir}/openvswitch @@ -302,6 +277,9 @@ rm -rf $RPM_BUILD_ROOT %exclude %{_datadir}/openvswitch/scripts/ovs-save %changelog +* Mon Aug 24 2015 Flavio Leitner - 2.4.0-1 +- updated to 2.4.0 (#1256171) + * Thu Jun 18 2015 Flavio Leitner - 2.3.2-1 - updated to 2.3.2 (#1233442) - fixed to own /var/run/openvswitch directory (#1200887) diff --git a/ovs-snapshot.sh b/ovs-snapshot.sh new file mode 100644 index 0000000..379069a --- /dev/null +++ b/ovs-snapshot.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# +# This script is only used to create snapshot tarball from the git tree. +# + +echo "Warning: for unreleased code, the original version might be +the unreleased next one. In that case, downgrade to the previous +released version so that we have: stable + fixes." +basever="2.4.0" + +echo "Using version ${basever} while the code has" +grep "bugs@openvswitch.org" configure.ac + +snap_gitsha=`git log --pretty=oneline -n1|cut -c1-8` +prefix=openvswitch-${basever}-git${snap_gitsha} +archive=${prefix}.tar.gz + +echo "Creating ${archive}" +git archive --prefix=${prefix}/ HEAD | gzip -9 > ${archive} diff --git a/sources b/sources index f7dd7ae..22b9bd7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5a5739ed82f1accac1c2d8d7553dc88f openvswitch-2.3.2.tar.gz +4ff52595855c1f9e4dd3e84295599f5f openvswitch-2.4.0.tar.gz