SPECS: zaptel.spec - move 1.4.1 from devel

arekm arekm at pld-linux.org
Wed Apr 18 23:16:19 CEST 2007 

Author: arekm                        Date: Wed Apr 18 21:16:19 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- move 1.4.1 from devel

---- Files affected:
SPECS:
   zaptel.spec (1.82 -> 1.83) 

---- Diffs:

================================================================
Index: SPECS/zaptel.spec
diff -u SPECS/zaptel.spec:1.82 SPECS/zaptel.spec:1.83
--- SPECS/zaptel.spec:1.82	Thu Mar  8 13:27:33 2007
+++ SPECS/zaptel.spec	Wed Apr 18 23:16:14 2007
@@ -3,49 +3,34 @@
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# don't build kernel modules
-%bcond_without	up		# don't build UP module
-%bcond_without	smp		# don't build SMP module
 %bcond_without	userspace	# don't build userspace tools
-%bcond_with	grsec_kernel	# build for kernel-grsecurity
 #
-%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
-%define	alt_kernel	grsecurity
-%endif
-#
-%ifarch sparc
-%undefine	with_smp
-%endif
-#
-%define		_rel	4
+%define	_rel	1
 Summary:	Zaptel telephony device support
-Summary(pl.UTF-8):	Obsługa urządzeń telefonicznych Zaptel
+Summary(pl.UTF-8):   Obsługa urządzeń telefonicznych Zaptel
 Name:		zaptel
-Version:	1.2.15
+Version:	1.4.1
 Release:	%{_rel}
 License:	GPL
 Group:		Base/Kernel
-Source0:	ftp://ftp.digium.com/pub/zaptel/%{name}-%{version}.tar.gz
-# Source0-md5:	9072603b6e53e89d74973bd254e8285e
+Source0:	http://ftp.digium.com/pub/zaptel/releases/%{name}-%{version}.tar.gz
+# Source0-md5:	4e429375161c1d4ec07950e18526ced2
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
+Source3:	http://ftp.digium.com/pub/telephony/firmware/releases/zaptel-fw-oct6114-064-1.05.01.tar.gz
+# Source3-md5:	18e6e6879070a8d61068e1c87b8c2b22
+Source4:	http://ftp.digium.com/pub/telephony/firmware/releases/zaptel-fw-oct6114-128-1.05.01.tar.gz
+# Source4-md5:	c46a13f468b53828dc5c78f0eadbefd4
 Patch0:		%{name}-make.patch
-Patch1:		%{name}-sparc.patch
-Patch2:		%{name}-LIBDIR.patch
-Patch3:		%{name}-LDFLAGS.patch
-Patch4:		%{name}-as_needed-fix.patch
-Patch5:		%{name}-sangoma.patch
+Patch1:		%{name}-sangoma.patch
 URL:		http://www.asterisk.org/
 %if %{with kernel} && %{with dist_kernel}
-BuildRequires:	kernel%{_alt_kernel}-module-build
+BuildRequires:	kernel-module-build
 %endif
-%if %{with userspace}
+BuildRequires:  rpmbuild(macros) >= 1.379
 BuildRequires:	newt-devel
-%endif
-BuildRequires:	rpmbuild(macros) >= 1.330
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define	modules pciradio,tor2,torisa,wcfxo,wct1xxp,wct4xxp/wct4xxp,wctc4xxp/wctc4xxp,wctdm,wctdm24xxp,wcte11xp,wcte12xp,wcusb,xpp/{xpd_fxo,xpd_fxs,xpp,xpp_usb},zaptel,ztd-eth,ztd-loc,ztdummy,ztdynamic,zttranscode
-
 %description
 Zaptel telephony device driver.
 
@@ -54,11 +39,9 @@
 
 %package devel
 Summary:	Zaptel development headers
-Summary(pl.UTF-8):	Pliki nagłówkowe Zaptel
+Summary(pl.UTF-8):   Pliki nagłówkowe Zaptel
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{_rel}
-# files in /usr/include/linux
-Requires:	linux-libc-headers
 
 %description devel
 Zaptel development headers.
@@ -66,9 +49,21 @@
 %description devel -l pl.UTF-8
 Pliki nagłówkowe Zaptel.
 
+%package static
+Summary:	Zaptel static library
+Summary(pl.UTF-8):   Biblioteka statyczna Zaptel
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{_rel}
+
+%description static
+Zaptel static library.
+
+%description static -l pl.UTF-8
+Biblioteka statyczna Zaptel.
+
 %package utils
 Summary:	Zaptel utility programs
-Summary(pl.UTF-8):	Programy narzędziowe Zaptel
+Summary(pl.UTF-8):   Programy narzędziowe Zaptel
 Group:		Applications/Communications
 
 %description utils
@@ -79,7 +74,7 @@
 
 %package init
 Summary:	Zaptel init scripts
-Summary(pl.UTF-8):	Skrypty inicjalizujące Zaptel
+Summary(pl.UTF-8):   Skrypty inicjalizujące Zaptel
 Group:		Applications/Communications
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-utils = %{version}-%{_rel}
@@ -91,56 +86,76 @@
 %description init -l pl.UTF-8
 Inicjalizacja Zaptel w czasie startu systemu.
 
-%package -n kernel%{_alt_kernel}-%{name}
+%package -n kernel-%{name}
 Summary:	Zaptel Linux kernel driver
-Summary(pl.UTF-8):	Sterownik Zaptel dla jądra Linuksa
+Summary(pl.UTF-8):   Sterownik Zaptel dla jądra Linuksa
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_up}
-Requires(post,postun):	/sbin/depmod
+Requires(post,postun):  /sbin/depmod
+%if %{with dist_kernel}
+%requires_releq_kernel
+Requires(postun):       %releq_kernel
+%endif
 
-%description -n kernel%{_alt_kernel}-%{name}
+%description -n kernel-%{name}
 Zaptel telephony Linux kernel driver.
 
-%description -n kernel%{_alt_kernel}-%{name} -l pl.UTF-8
+%description -n kernel-%{name} -l pl.UTF-8
 Sterownik dla jądra Linuksa do urządzeń telefonicznych Zaptel.
 
-%package -n kernel%{_alt_kernel}-smp-%{name}
-Summary:	Zaptel Linux SMP kernel driver
-Summary(pl.UTF-8):	Sterownik Zaptel dla jądra Linuksa SMP
-Release:	%{_rel}@%{_kernel_ver_str}
-Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
-Requires(post,postun):	/sbin/depmod
-
-%description -n kernel%{_alt_kernel}-smp-%{name}
-Zaptel telephony Linux SMP kernel driver.
-
-%description -n kernel%{_alt_kernel}-smp-%{name} -l pl.UTF-8
-Sterownik dla jądra Linuksa SMP do urządzeń telefonicznych Zaptel.
-
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+
+%define buildconfigs %{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}
 
 %build
+%configure
+
 %{__make} prereq zttest \
 	CC="%{__cc}" \
 	LDFLAGS="%{rpmldflags}" \
 	OPTFLAGS="%{rpmcflags}"
 
 %if %{with kernel}
-%build_kernel_modules SUBDIRS=$PWD -m %{modules}
+cp %{SOURCE3} firmware/
+cp %{SOURCE4} firmware/
+cd firmware
+for t in *.tar.gz; do
+	tar -xzf $t
+done
+cd ..
+for cfg in %{buildconfigs}; do
+	rm -rf o
+	mkdir -p modules/$cfg
+	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
+		exit 1
+	fi
+	chmod 000 modules
+	install -d o/include/linux
+	ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
+	%{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+	%{__make} -C %{_kernelsrcdir} clean \
+		RCS_FIND_IGNORE="-name '*.ko' -o" \
+		M=$PWD O=$PWD/o \
+		%{?with_verbose:V=1}
+	install -d o/include/config
+	chmod 700 modules
+	%{__make} -C %{_kernelsrcdir} modules \
+		CC="%{__cc}" CPP="%{__cpp}" \
+		M=$PWD O=$PWD/o SUBDIRS=$PWD \
+		DOWNLOAD=wget \
+		%{?with_verbose:V=1}
+	cp *.ko modules/$cfg/
+done
 %endif
 
 %if %{with userspace}
 %{__make} ztcfg torisatool makefw ztmonitor ztspeed libtonezone.so \
-	fxstest fxotune gendigits \
+	fxstest fxotune \
 	CC="%{__cc} %{rpmcflags}" \
 	LDFLAGS="%{rpmldflags}"
 %endif
@@ -149,35 +164,38 @@
 rm -rf $RPM_BUILD_ROOT
 
 %if %{with kernel}
-%install_kernel_modules -m %{modules} -d misc
+for cfg in %{buildconfigs}; do
+	cfgdest=''
+	install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
+	install modules/$cfg/*.ko \
+		$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
+done
 %endif
 
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT{/sbin,%{_includedir}/linux,/etc/{rc.d/init.d,sysconfig},%{_sbindir},%{_mandir}/{man1,man8}}
 %{__make} -o all -o devices install \
 	LIBDIR="%{_libdir}" \
+	LIB_DIR="$RPM_BUILD_ROOT%{_libdir}" \
 	INSTALL_PREFIX=$RPM_BUILD_ROOT \
+	DESTDIR=$RPM_BUILD_ROOT \
 	MODCONF=$RPM_BUILD_ROOT/etc/modprobe.conf
-install zttest torisatool makefw ztmonitor ztspeed fxstest fxotune gendigits $RPM_BUILD_ROOT%{_sbindir}
+install zttest torisatool makefw ztmonitor ztspeed fxstest fxotune $RPM_BUILD_ROOT%{_sbindir}
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/zaptel
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/zaptel
+
+install zconfig.h ecdis.h fasthdlc.h biquad.h $RPM_BUILD_ROOT/usr/include/zaptel/
 %endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -n kernel%{_alt_kernel}-%{name}
+%post -n kernel-%{name}
 %depmod %{_kernel_ver}
 
-%postun -n kernel%{_alt_kernel}-%{name}
+%postun -n kernel-%{name}
 %depmod %{_kernel_ver}
 
-%post -n kernel%{_alt_kernel}-smp-%{name}
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-%{name}
-%depmod %{_kernel_ver}smp
-
 %post init
 /sbin/chkconfig --add %{name}
 %service %{name} restart
@@ -188,12 +206,14 @@
 	/sbin/chkconfig --del %{name}
 fi
 
+%if %{with userspace}
 %files
 %defattr(644,root,root,755)
-%doc README ChangeLog
+%doc README
 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zaptel.conf
 %attr(755,root,root) /sbin/*
 %attr(755,root,root) %{_libdir}/*.so.*
+%{_datadir}/zaptel
 %{_mandir}/man8/*
 
 %files init
@@ -204,8 +224,12 @@
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/*.so
-%{_includedir}/linux/*
-%{_includedir}/*.h
+%{_includedir}/zaptel/
+%{_includedir}/zaptel/*.h
+
+%files static
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/*.a
 
 %files utils
 %defattr(644,root,root,755)
@@ -213,64 +237,56 @@
 %endif
 
 %if %{with kernel}
-%if %{with up} || %{without dist_kernel}
-%files -n kernel%{_alt_kernel}-%{name}
+%files -n kernel-%{name}
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/*.ko*
 %endif
 
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-%{name}
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/*.ko*
-%endif
-%endif
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.82  2007/03/08 12:27:33  dzeus
-- updated modules, added gendigits, rel. 4
-
-Revision 1.81  2007/03/06 21:48:51  glen
-- -devel :R llh
+Revision 1.83  2007/04/18 21:16:14  arekm
+- move 1.4.1 from devel
 
-Revision 1.80  2007/03/04 15:54:43  qboosh
-- no need to bcond post/preun
+Revision 1.70.2.12  2007/04/18 21:14:16  arekm
+- up to 1.4.1
 
-Revision 1.79  2007/03/03 15:53:31  aredridel
-- 1.2.15
+Revision 1.70.2.11  2007/04/05 23:52:47  aredridel
+- remove smp
+- rpmbuild(macros) >= 1.379
 
-Revision 1.78  2007/02/27 11:13:28  sparky
-- --without up bcond
-- fixed %files
+Revision 1.70.2.10  2007/03/04 18:38:04  aredridel
+- clean build environment to force rebuild between up and smp configs
 
-Revision 1.77  2007/02/12 22:09:26  glen
-- tabs in preamble
+Revision 1.70.2.9  2007/03/03 16:44:40  aredridel
+- 1.4.0.2273
 
-Revision 1.76  2007/02/12 01:06:41  baggins
+Revision 1.70.2.8  2007/02/12 13:20:16  baggins
 - converted to UTF-8
 
-Revision 1.75  2007/01/23 19:01:35  hawk
-- release 3
+Revision 1.70.2.7  2007/01/04 21:00:26  areq
+- install biquad.h
+
+Revision 1.70.2.6  2007/01/03 22:40:54  areq
+- 1.4.0
+
+Revision 1.70.2.5  2006/11/23 12:37:05  dzeus
+- fixed _rel
+
+Revision 1.70.2.4  2006/11/23 12:31:43  dzeus
+- up to beta2
+
+Revision 1.70.2.3  2006/09/21 20:42:59  areq
+- Zaptel 1.4 Beta 1
 
-Revision 1.74  2006/12/08 14:20:48  hawk
-- workaround for builder automation to allow building against
-  kernel-grsecurity (via bcond)
-- release 2
-
-Revision 1.73  2006/11/14 20:36:22  sparky
-- BR: rpmbuild(macros) >= 1.330 -- build_kernel_modules fix for kernels 2.6.18
-
-Revision 1.72  2006/11/11 16:34:00  sparky
-- %{_alt_kernel} support
-- use %build_kernel_modules, %install_kernel_modules macros
+Revision 1.70.2.2  2006/09/17 21:55:18  areq
+- update md5
 
-Revision 1.71  2006/10/23 06:39:52  dzeus
-- up to 1.2.10
+Revision 1.70.2.1  2006/09/17 21:48:34  areq
+- SVN trunk
 
 Revision 1.70  2006/09/17 16:20:08  areq
 - 1.2.9.1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/zaptel.spec?r1=1.82&r2=1.83&f=u

More information about the pld-cvs-commit mailing list