SPECS (DEVEL): zaptel.spec - up to 1.4.1

Wed Apr 18 23:14:24 CEST 2007

Author: arekm                        Date: Wed Apr 18 21:14:24 2007 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- up to 1.4.1

---- Files affected:
SPECS:
   zaptel.spec (1.70.2.11 -> 1.70.2.12) 

---- Diffs:

================================================================
Index: SPECS/zaptel.spec
diff -u SPECS/zaptel.spec:1.70.2.11 SPECS/zaptel.spec:1.70.2.12

--- SPECS/zaptel.spec:1.70.2.11	Fri Apr  6 01:52:47 2007
+++ SPECS/zaptel.spec	Wed Apr 18 23:14:16 2007
@@ -5,17 +5,16 @@
 %bcond_without	kernel		# don't build kernel modules
 %bcond_without	userspace	# don't build userspace tools
 #
-%define		_rel 1	
+%define	_rel	1
 Summary:	Zaptel telephony device support
 Summary(pl.UTF-8):   ObsĹ‚uga urzÄ
dzeĹ„ telefonicznych Zaptel
 Name:		zaptel
-Version:	1.4.0.2273
+Version:	1.4.1
 Release:	%{_rel}
 License:	GPL
 Group:		Base/Kernel
-#Source0:	http://ftp.digium.com/pub/zaptel/releases/%{name}-%{version}.tar.gz
-Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	4d34a4cf755d0178d0559c29d26363b8
+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
@@ -23,11 +22,7 @@
 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-module-build
@@ -54,6 +49,18 @@
 %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
@@ -97,17 +104,12 @@
 Sterownik dla jÄ
dra Linuksa do urzÄ
dzeĹ„ telefonicznych Zaptel.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-#%patch4 -p1
-%patch5 -p1
+%patch1 -p1
 
 %define buildconfigs %{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}
 
-
 %build
 %configure
 
@@ -119,6 +121,11 @@
 %if %{with kernel}
 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
@@ -142,7 +149,7 @@
 		M=$PWD O=$PWD/o SUBDIRS=$PWD \
 		DOWNLOAD=wget \
 		%{?with_verbose:V=1}
-	mv *.ko modules/$cfg/
+	cp *.ko modules/$cfg/
 done
 %endif
 
@@ -169,7 +176,9 @@
 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 $RPM_BUILD_ROOT%{_sbindir}
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/zaptel
@@ -187,7 +196,6 @@
 %postun -n kernel-%{name}
 %depmod %{_kernel_ver}
 
-%if %{with userspace}
 %post init
 /sbin/chkconfig --add %{name}
 %service %{name} restart
@@ -198,12 +206,14 @@
 	/sbin/chkconfig --del %{name}
 fi
 
+%if %{with userspace}
 %files
 %defattr(644,root,root,755)
 %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
@@ -217,6 +227,10 @@
 %{_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)
 %attr(755,root,root) %{_sbindir}/*
@@ -226,6 +240,7 @@
 %files -n kernel-%{name}
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/*.ko*
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -233,6 +248,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.70.2.12  2007/04/18 21:14:16  arekm
+- up to 1.4.1
+
 Revision 1.70.2.11  2007/04/05 23:52:47  aredridel
 - remove smp
 - rpmbuild(macros) >= 1.379
================================================================

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

