X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Frpm_specs%2Fnetworking-vpp.spec;h=9fb66addbf40f14e44f87fee9831a9cddfe3734a;hb=70cade4f8df150281c16e72d9234fa3751f097c8;hp=2fd4e0497d8e9220055ca568c3c140a96c9ff074;hpb=dfe970932417a0a6ceca1b84d16aa51ba30e07f3;p=apex.git

diff --git a/build/rpm_specs/networking-vpp.spec b/build/rpm_specs/networking-vpp.spec
index 2fd4e049..9fb66add 100644
--- a/build/rpm_specs/networking-vpp.spec
+++ b/build/rpm_specs/networking-vpp.spec
@@ -1,33 +1,33 @@
-%define name networking-vpp
-%define version %(python setup.py --version)
 %define release 1
-%define _topdir %(pwd)/build/rpm
-%define _builddir %(pwd)
-%define _rpmdir %(pwd)/build/rpm
-
-Summary: OpenStack Networking for VPP
-Name: %{name}
-Version: %{version}
-Release: %{release}
-License: Apache 2.0
-Group: Development/Libraries
+
+Summary:   OpenStack Networking for VPP
+Name:      python-networking-vpp
+Version:   18.04
+Release:   %{release}%{?git}%{?dist}
+
+License:   Apache 2.0
+Group:     Applications/Internet
+Source0:   python-networking-vpp.tar.gz
+Url:       https://github.com/openstack/networking-vpp/
+
 BuildArch: noarch
-Requires: vpp
-Vendor: OpenStack <openstack-dev@lists.openstack.org>
-Packager: Feng Pan <fpan@redhat.com>
-Url: http://www.openstack.org/
+AutoReq:   no
+Requires:  vpp python-jwt
+Vendor:    OpenStack <openstack-dev@lists.openstack.org>
+Packager:  Feng Pan <fpan@redhat.com>
 
 %description
 ML2 Mechanism driver and small control plane for OpenVPP forwarder
 
 %prep
-cat << EOF > %{_builddir}/networking-vpp-agent.service
+%setup -q
+cat << EOF > %{_builddir}/neutron-vpp-agent.service
 [Unit]
 Description=Networking VPP ML2 Agent
 
 [Service]
 ExecStartPre=/usr/bin/systemctl is-active vpp
-ExecStart=/usr/bin/vpp-agent --config-file /etc/neutron/plugins/ml2/vpp_agent.ini
+ExecStart=/usr/bin/vpp-agent --config-file /etc/neutron/plugins/ml2/vpp_agent.ini --log-file /var/log/neutron/vpp-agent.log
 Type=simple
 Restart=on-failure
 RestartSec=5s
@@ -37,14 +37,22 @@ WantedBy=multi-user.target
 
 EOF
 
+%preun
+%systemd_preun neutron-vpp-agent.service
+
+%postun
+%systemd_postun
+rm -rf %{python2_sitelib}/networking_vpp*
+
 %install
-/usr/bin/python setup.py install -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
-mkdir -p %{buildroot}/usr/lib/systemd/system
-install %{_builddir}/networking-vpp-agent.service %{buildroot}/usr/lib/systemd/system
+python setup.py install -O1 --root=%{buildroot} --record=INSTALLED_FILES
+mkdir -p %{buildroot}%{_libdir}/systemd/system
+install %{_builddir}/neutron-vpp-agent.service %{buildroot}%{_unitdir}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files -f INSTALLED_FILES
 %defattr(-,root,root)
-%attr(644,root,root) /usr/lib/systemd/system/networking-vpp-agent.service
+%attr(644,root,root) %{_unitdir}/neutron-vpp-agent.service
+