rpms/callweaver/EL-6 callweaver.spec,1.21,1.22 import.log,1.2,1.3

[Itamar Reis Peixoto]

Author: itamarjp

Update of /cvs/pkgs/rpms/callweaver/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31176/EL-6

Modified Files:
	callweaver.spec import.log 
Log Message:
- remove zaptel stuff



Index: callweaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/callweaver/EL-6/callweaver.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- callweaver.spec	21 Aug 2009 12:41:55 -0000	1.21
+++ callweaver.spec	11 May 2010 13:16:15 -0000	1.22
@@ -1,13 +1,10 @@
-#define snap 20071230
-
 %bcond_without misdn
-%bcond_without zaptel
 
 %bcond_without	fedora
 
 Name:		callweaver
 Version:	1.2.1
-Release:	2%{?snap:.%{snap}}%{?dist}
+Release:	6%{?dist}
 Summary:	The Truly Open Source PBX
 
 Group:		Applications/Internet
@@ -18,14 +15,24 @@ Source0:	http://devs.callweaver.org/rele
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	spandsp-devel >= 0.0.5-0.1.pre4
+BuildRequires:	spandsp-devel >= 0.0.6-0.1.pre12
 BuildRequires:	%{?snap:libtool automake autoconf} zlib-devel
 BuildRequires:	fedora-usermgmt-devel bluez-libs-devel openldap-devel
 BuildRequires:	libjpeg-devel loudmouth-devel nspr-devel js-devel ncurses-devel
 BuildRequires:	unixODBC-devel openssl-devel speex-devel alsa-lib-devel
 BuildRequires:	isdn4k-utils-devel libcap-devel sqlite-devel mysql-devel
-BuildRequires:	postgresql-devel compat-readline5-devel %{?with_misdn:mISDN-devel}
-BuildRequires:	popt-devel %{?with_zaptel:zaptel-devel libpri-devel}
+BuildRequires:	postgresql-devel %{?with_misdn:mISDN-devel}
+
+%if 0%{?rhel}
+BuildRequires: popt  readline-devel
+%endif
+
+%if 0%{?fedora} >= 11
+BuildRequires: popt-devel  compat-readline5-devel
+%endif
+
+
+
 
 Requires:	/sbin/chkconfig
 Obsoletes:	openpbx < 1.2-5
@@ -121,17 +128,6 @@ This package contains the mISDN channel 
 the replacement modular ISDN stack for Linux, intended to be merged
 into the 2.6 kernel.
 
-%package zaptel
-Obsoletes:	openpbx-zaptel < 1.2-5
-Group:		Applications/Internet
-Summary:	Zaptel modules for CallWeaver
-Requires:	%{name} = %{version}-%{release}
-Requires:	zaptel >= 1.4.0-1
-
-%description zaptel
-This package contains the Zap channel driver and MeetMe application
-for CallWeaver. Zaptel is Digium's telephony driver package.
-
 %package jabber
 Obsoletes:	openpbx-jabber < 1.2-5
 Group:		Applications/Internet
@@ -175,9 +171,6 @@ convenient interface between CallWeaver 
 %setup0 -q
 
 %build
-%if 0%{?snap}
-./bootstrap.sh
-%endif
 
 # fix bz #511302 callweaver should build with compat-readline5-devel
 # The readline package in rawhide will be soon updated to new 6.0 release which
@@ -186,7 +179,11 @@ convenient interface between CallWeaver 
 # incompatibility or switched to libedit which is compatible with GPLv3, but
 # doesn't support UTF-8.
 
+
+%if 0%{?fedora} >= 11
 export CPPFLAGS="-I%{_includedir}/readline5" LDFLAGS="-L%{_libdir}/readline5"
+%endif
+
 
 # res_sqlite seems to use internal functions of sqlite3 which don't 
 # even _exist_ in current versions. Disable it until it's fixed.
@@ -199,7 +196,6 @@ export CPPFLAGS="-I%{_includedir}/readli
 	   --with-perl-shebang='#! /usr/bin/perl' --disable-builtin-sqlite3 \
 	   --enable-javascript --with-res_js --enable-fast-install \
 	   %{?with_misdn:--with-chan_misdn} \
-	   %{?with_zaptel:--enable-zaptel} \
 	   --enable-jabber --with-res_jabber \
 	   --enable-mysql --with-res_config_mysql --with-cdr_mysql
 
@@ -239,7 +235,17 @@ rm -f $RPM_BUILD_ROOT/%{_sbindir}/safe_c
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/safe_callweaver.8
 
 #fix bz 473572 /var/lib/callweaver not packaged (todo - send a patch to upstream to fix this)
-mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}
+# %{_localstatedir} should be used because in EL %{_sharedstatedir} points to /usr/com
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
+#if you know a better way to create all directory's with only one mkdir tell me
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/core
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/coredump
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/images
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/keys
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/moh
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/ogi
+
+
 #create /usr/share/callweaver/keys
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/keys
 
@@ -261,9 +267,6 @@ test "$1" != 0 || /sbin/chkconfig --del 
 %__fe_userdel  callweaver &>/dev/null || :
 %__fe_groupdel callweaver &>/dev/null || :
 
-%pre zaptel
-%{_sbindir}/usermod -G `id -G callweaver | tr " " , `,zaptel callweaver
-
 %pre misdn
 %{_sbindir}/usermod -G `id -G callweaver | tr " " , `,misdn callweaver
 
@@ -291,7 +294,7 @@ test "$1" != 0 || /sbin/chkconfig --del 
 %attr(0755,callweaver,callweaver) %{_localstatedir}/run/callweaver
 
 #fix bz 473572
-%attr(0755,callweaver,callweaver) %{_sharedstatedir}/%{name}
+%attr(0755,callweaver,callweaver) %{_localstatedir}/lib/%{name}/
 
 # Unneeded
 %exclude %{_sysconfdir}/callweaver/cdr_tds.conf
@@ -318,14 +321,6 @@ test "$1" != 0 || /sbin/chkconfig --del 
 %exclude %{_libdir}/callweaver/modules/chan_misdn.so
 %exclude %{_sysconfdir}/callweaver/misdn.conf
 %endif
-%if 0%{?with_zaptel:1}
-%exclude %{_libdir}/callweaver/modules/chan_zap.so
-%exclude %{_libdir}/callweaver/modules/app_meetme.so
-%exclude %{_libdir}/callweaver/modules/app_flash.so
-%exclude %{_sysconfdir}/callweaver/chan_dahdi.conf
-%exclude %{_sysconfdir}/callweaver/meetme.conf
-
-%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -366,15 +361,6 @@ test "$1" != 0 || /sbin/chkconfig --del 
 %doc doc2/README.misdn
 %endif
 
-%if 0%{?with_zaptel:1}
-%files zaptel
-%{_libdir}/callweaver/modules/chan_zap.so
-%{_libdir}/callweaver/modules/app_meetme.so
-%{_libdir}/callweaver/modules/app_flash.so
-%config(noreplace) %attr(0644,callweaver,callweaver) %{_sysconfdir}/callweaver/chan_dahdi.conf
-%config(noreplace) %attr(0644,callweaver,callweaver) %{_sysconfdir}/callweaver/meetme.conf
-%endif
-
 %files jabber
 %{_libdir}/callweaver/modules/res_jabber.so
 %config(noreplace) %attr(0644,callweaver,callweaver) %{_sysconfdir}/callweaver/res_jabber.conf
@@ -394,6 +380,18 @@ test "$1" != 0 || /sbin/chkconfig --del 
 %{_sbindir}/eogi*
 
 %changelog
+* Tue May 11 2010 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.1-6
+- remove zaptel stuff
+
+* Mon Feb 01 2010 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.1-5
+- fix remaining macro in file section
+
+* Mon Feb 01 2010 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.1-4
+- replace %%{_sharedstatedir} with %%{_localstatedir}/lib to be compatible with EL macros
+
+* Mon Oct 19 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.1-3
+- modify spec file for compatibility with EL
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-2
 - rebuilt with new openssl
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/callweaver/EL-6/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	29 Jul 2009 14:46:07 -0000	1.2
+++ import.log	11 May 2010 13:16:16 -0000	1.3
@@ -1,2 +1,3 @@
 callweaver-1_2_0_1-5_fc12:HEAD:callweaver-1.2.0.1-5.fc12.src.rpm:1248759154
 callweaver-1_2_1-1_fc12:HEAD:callweaver-1.2.1-1.fc12.src.rpm:1248878636
+callweaver-1_2_1-6_fc14:EL-6:callweaver-1.2.1-6.fc14.src.rpm:1273583658