X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=vpb-driver.spec;h=9b7e10c74c908cc3352c7ce700153e9590b6dabf;hb=75d8015ca199909d77e539e41e59a087bc56a954;hp=b8735ec337bb04c5f7edbcf77c60184d328f5842;hpb=cf9820457488ad87710d99bfd0d88ec726f1ced3;p=packages%2Fvpb-driver.git

diff --git a/vpb-driver.spec b/vpb-driver.spec
index b8735ec..9b7e10c 100644
--- a/vpb-driver.spec
+++ b/vpb-driver.spec
@@ -1,40 +1,44 @@
 #
 # Conditional build:
-%bcond_without	dist_kernel	# without distribution kernel
 %bcond_without  kernel		# don't build kernel modules
 %bcond_without	userspace	# don't build userspace package
 %bcond_without	static_libs	# don't build static libraries
 %bcond_with	pri		# ISDN devices support (modified libpri)
-#
-%if "%{_alt_kernel}" != "%{nil}"
-%undefine	with_userspace
+
+# The goal here is to have main, userspace, package built once with
+# simple release number, and only rebuild kernel packages with kernel
+# version as part of release number, without the need to bump release
+# with every kernel change.
+%if 0%{?_pld_builder:1} && %{with kernel} && %{with userspace}
+%{error:kernel and userspace cannot be built at the same time on PLD builders}
+exit 1
 %endif
-%if %{without kernel}
-%undefine	with_dist_kernel
+
+%if %{without userspace}
+# nothing to be placed to debuginfo package
+%define		_enable_debug_packages	0
 %endif
 
-%define	rel	3
+%define		_duplicate_files_terminate_build	0
+
+%define	rel	9
 %define		pname	vpb-driver
 Summary:	Voicetronix voice processing board (VPB) driver software
 Summary(pl.UTF-8):	Oprogramowanie sterowników dla kart przetwarzających głos (VPB) Voicetronix
-Name:		%{pname}%{_alt_kernel}
-Version:	4.2.56
-Release:	%{rel}
+Name:		%{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
+Version:	4.2.57
+Release:	%{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:	LGPL v2.1+ (libraries), GPL v2+ (libpri library, kernel module)
 Group:		Libraries
 Source0:	http://www.voicetronix.com.au/Downloads/vpb-driver-4.x/%{pname}-%{version}.tar.gz
-# Source0-md5:	aa7442b5b98a566fe67544115d83e20a
+# Source0-md5:	35d0ea8ab7a6bda267603ca7c9b78671
 Patch0:		%{pname}-make.patch
-Patch1:		%{pname}-kernel.patch
-Patch2:		linux-3.8.patch
 URL:		http://www.voicetronix.com.au/downloads.htm#linux
-%if %{with dist_kernel}
-BuildRequires:	kernel%{_alt_kernel}-module-build
-%endif
+BuildRequires:	rpmbuild(macros) >= 1.701
+%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	libstdc++-devel
 BuildRequires:	pciutils-devel
-BuildRequires:	rpmbuild(macros) >= 1.379
 BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel
 Requires:	vpb-libs = %{version}-%{rel}
@@ -85,31 +89,56 @@ Static VPD libraries.
 %description -n vpb-static -l pl.UTF-8
 Statyczne biblioteki VPD.
 
-%package -n kernel%{_alt_kernel}-telephony-vpb
-Summary:	Linux kernel driver for Voicetronix Voice Processing Board (VPB)
-Summary(pl.UTF-8):	Sterownik jądra Linuksa do kart VPB firmy Voicetronix
-Release:	%{rel}@%{_kernel_ver_str}
-License:	GPL v2+
-Group:		Base/Kernel
-Requires(post,postun):	/sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel
-Requires(postun):	%releq_kernel
-%endif
-
-%description -n kernel%{_alt_kernel}-telephony-vpb
-Linux kernel driver for Voicetronix Voice Processing Board (VPB).
-
-%description -n kernel%{_alt_kernel}-telephony-vpb -l pl.UTF-8
-Sterownik jądra Linuksa do kart VPB firmy Voicetronix.
+%define	kernel_pkg()\
+%package -n kernel%{_alt_kernel}-telephony-vpb\
+Summary:	Linux kernel driver for Voicetronix Voice Processing Board (VPB)\
+Summary(pl.UTF-8):	Sterownik jądra Linuksa do kart VPB firmy Voicetronix\
+Release:	%{rel}@%{_kernel_ver_str}\
+License:	GPL v2+\
+Group:		Base/Kernel\
+Requires(post,postun):	/sbin/depmod\
+%requires_releq_kernel\
+Requires(postun):	%releq_kernel\
+\
+%description -n kernel%{_alt_kernel}-telephony-vpb\
+Linux kernel driver for Voicetronix Voice Processing Board (VPB).\
+\
+%description -n kernel%{_alt_kernel}-telephony-vpb -l pl.UTF-8\
+Sterownik jądra Linuksa do kart VPB firmy Voicetronix.\
+\
+%files -n kernel%{_alt_kernel}-telephony-vpb\
+%defattr(644,root,root,755)\
+%dir /lib/modules/%{_kernel_ver}/kernel/drivers/telephony\
+/lib/modules/%{_kernel_ver}/kernel/drivers/telephony/vpb.ko*\
+/lib/modules/%{_kernel_ver}/kernel/drivers/telephony/vtcore.ko*\
+/lib/modules/%{_kernel_ver}/kernel/drivers/telephony/vtopenpci.ko*\
+/lib/modules/%{_kernel_ver}/kernel/drivers/telephony/vtopenswitch.ko*\
+%config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/blunt-axe.conf\
+\
+%post -n kernel%{_alt_kernel}-telephony-vpb\
+%depmod %{_kernel_ver}\
+\
+%postun -n kernel%{_alt_kernel}-telephony-vpb\
+%depmod %{_kernel_ver}\
+%{nil}
+
+%define build_kernel_pkg()\
+%{__make} -C src/vtcore KSRC=%{_kernelsrcdir} \
+%{__make} -C src/vpb KSRC=%{_kernelsrcdir} \
+p=`pwd`\
+%{__make} -C src/vtcore install \\\
+	DESTDIR=$p/installed \\\
+	KSRC=%{_kernelsrcdir}\
+%{__make} -C src/vpb install \\\
+	DESTDIR=$p/installed \\\
+	KSRC=%{_kernelsrcdir}\
+%{nil}
+
+%{?with_kernel:%{expand:%create_kernel_packages}}
 
 %prep
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
-%patch1 -p1
-%if "%{_alt_kernel}" == "%{nil}"
-%patch2 -p1
-%endif
 
 %if %{without kernel}
 %{__sed} -i -e 's,subdirs += $(srcdir)/vtcore $(srcdir)/vpb,,' src/Makefile.in
@@ -132,36 +161,31 @@ cd build-static
 	VPATH=%{_libdir}
 cd ..
 %endif
+
 %configure \
 	%{?with_pri:--with-pri} \
 	--enable-shared
 
-%if %{without userspace}
-%{__make} -C src \
-	%{?with_kernel:KSRC=%{_kernelsrcdir}} \
-	VPATH=%{_libdir}
-%else
+%if %{with userspace}
 %{__make} \
-	%{?with_kernel:KSRC=%{_kernelsrcdir}} \
 	VPATH=%{_libdir}
 %endif
 
+%{?with_kernel:%{expand:%build_kernel_packages}}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%if %{without userspace}
-%{__make} -C src install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	%{?with_kernel:KSRC=%{_kernelsrcdir}}
-
+%if %{with kernel}
 install -d $RPM_BUILD_ROOT/etc/modprobe.d
 install src/libvpb/blunt-axe.conf $RPM_BUILD_ROOT/etc/modprobe.d
 
-%else
+cp -a installed/* $RPM_BUILD_ROOT
+%endif
 
+%if %{with userspace}
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	%{?with_kernel:KSRC=%{_kernelsrcdir}}
+	DESTDIR=$RPM_BUILD_ROOT
 
 # let rpm generate dependencies
 chmod 755 $RPM_BUILD_ROOT%{_libdir}/lib*.so*
@@ -182,12 +206,6 @@ rm -rf $RPM_BUILD_ROOT
 %post	-n vpb-libs -p /sbin/ldconfig
 %postun	-n vpb-libs -p /sbin/ldconfig
 
-%post -n kernel%{_alt_kernel}-telephony-vpb
-%depmod %{_kernel_ver}
-
-%postun -n kernel%{_alt_kernel}-telephony-vpb
-%depmod %{_kernel_ver}
-
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
@@ -221,14 +239,3 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libvpb.a
 %endif
 %endif
-
-%if %{with kernel}
-%files -n kernel%{_alt_kernel}-telephony-vpb
-%defattr(644,root,root,755)
-%dir /lib/modules/%{_kernel_ver}/kernel/drivers/telephony
-/lib/modules/%{_kernel_ver}/kernel/drivers/telephony/vpb.ko*
-/lib/modules/%{_kernel_ver}/kernel/drivers/telephony/vtcore.ko*
-/lib/modules/%{_kernel_ver}/kernel/drivers/telephony/vtopenpci.ko*
-/lib/modules/%{_kernel_ver}/kernel/drivers/telephony/vtopenswitch.ko*
-%config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/blunt-axe.conf
-%endif