packages: openvswitch/openvswitch.spec - rel 1 - make our builders happy wr...

[baggins]

Author: baggins                      Date: Mon Mar 26 10:07:28 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 1
- make our builders happy wrt alt-kernels

---- Files affected:
packages/openvswitch:
   openvswitch.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/openvswitch/openvswitch.spec
diff -u packages/openvswitch/openvswitch.spec:1.8 packages/openvswitch/openvswitch.spec:1.9
--- packages/openvswitch/openvswitch.spec:1.8	Mon Mar 26 11:25:09 2012
+++ packages/openvswitch/openvswitch.spec	Mon Mar 26 12:07:23 2012
@@ -24,26 +24,27 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	0.5
+%define		rel	1
+%define		pname	openvswitch
 Summary:	Production Quality, Multilayer Open Virtual Switch
 #Summary(pl.UTF-8):	-
-Name:		openvswitch
+Name:		%{pname}%{_alt_kernel}
 Version:	1.4.0
 Release:	%{rel}
 License:	Apache v2.0
 Group:		Networking/Daemons
-Source0:	http://openvswitch.org/releases/%{name}-%{version}.tar.gz
+Source0:	http://openvswitch.org/releases/%{pname}-%{version}.tar.gz
 # Source0-md5:	3847c60af329bfe81ff7220b9f489fa5
 Source1:	ifdown-ovs
 Source2:	ifup-ovs
 Source3:	README.PLD
-Source4:	%{name}.logrotate
-Source5:	%{name}.tmpfiles
-Source6:	%{name}.sysconfig
-Source7:	%{name}.init
+Source4:	%{pname}.logrotate
+Source5:	%{pname}.tmpfiles
+Source6:	%{pname}.sysconfig
+Source7:	%{pname}.init
 #Source8:	openvswitch-controller.init
 #Source9:	openvswitch-ipsec.init
-Source10:	%{name}.service
+Source10:	%{pname}.service
 Source11:	ovsdbmonitor.desktop
 Patch0:		linux-3.3.patch
 Patch1:		ovsdbmonitor-move-to-its-own-data-directory.patch
@@ -70,7 +71,7 @@
 Requires:	python-modules
 Requires:	rc-scripts
 Requires:	systemd-units
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRoot:	%{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
 
 %description
 Open vSwitch is a production quality, multilayer virtual switch
@@ -178,8 +179,8 @@
 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
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/%{pname}/python/{ovs,ovstest} $RPM_BUILD_ROOT%{py_sitescriptdir}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{pname}/python
 
 %py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
 %py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
@@ -228,12 +229,12 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/openvswitch
 %{systemdtmpfilesdir}/openvswitch.conf
 %{systemdunitdir}/openvswitch.service
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/pki
-%dir %{_datadir}/%{name}/scripts
-%attr(755,root,root) %{_datadir}/%{name}/scripts/*
-%{_datadir}/%{name}/bugtool-plugins
-%{_datadir}/%{name}/vswitch.ovsschema
+%dir %{_datadir}/%{pname}
+%{_datadir}/%{pname}/pki
+%dir %{_datadir}/%{pname}/scripts
+%attr(755,root,root) %{_datadir}/%{pname}/scripts/*
+%{_datadir}/%{pname}/bugtool-plugins
+%{_datadir}/%{pname}/vswitch.ovsschema
 
 %attr(754,root,root) /etc/rc.d/init.d/openvswitch
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/openvswitch
@@ -310,6 +311,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2012/03/26 10:07:23  baggins
+- rel 1
+- make our builders happy wrt alt-kernels
+
 Revision 1.8  2012/03/26 09:25:09  baggins
 - BR autotools
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/openvswitch/openvswitch.spec?r1=1.8&r2=1.9