rpms/callweaver/devel import.log, NONE, 1.1 callweaver.spec, 1.18, 1.19

[Itamar Reis Peixoto]

Author: itamarjp

Update of /cvs/pkgs/rpms/callweaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23565/devel

Modified Files:
	callweaver.spec 
Added Files:
	import.log 
Log Message:
- fix bz #473572 /var/lib/callweaver not packaged
- fix bz #511302 callweaver should build with compat-readline5-devel
- fix postgresql includes-dir




--- NEW FILE import.log ---
callweaver-1_2_0_1-5_fc12:HEAD:callweaver-1.2.0.1-5.fc12.src.rpm:1248759154


Index: callweaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/callweaver/devel/callweaver.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- callweaver.spec	24 Jul 2009 18:38:51 -0000	1.18
+++ callweaver.spec	28 Jul 2009 05:33:28 -0000	1.19
@@ -7,7 +7,7 @@
 
 Name:		callweaver
 Version:	1.2.0.1
-Release:	4%{?snap:.%{snap}}%{?dist}
+Release:	5%{?snap:.%{snap}}%{?dist}
 Summary:	The Truly Open Source PBX
 
 Group:		Applications/Internet
@@ -27,7 +27,7 @@ BuildRequires:	fedora-usermgmt-devel blu
 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 readline-devel %{?with_misdn:mISDN-devel}
+BuildRequires:	postgresql-devel compat-readline5-devel %{?with_misdn:mISDN-devel}
 BuildRequires:	popt-devel %{?with_zaptel:zaptel-devel libpri-devel}
 
 Requires:	/sbin/chkconfig
@@ -175,27 +175,38 @@ convenient interface between CallWeaver 
 
 
 %prep
-%setup0 -q 
+%setup0 -q
 %patch1 -p1
 
 %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
+# changes the license to GPLv3+. As callweaver is GPLv2, it should be built with
+# the older readline (packaged in compat-readline5) to avoid licensing
+# incompatibility or switched to libedit which is compatible with GPLv3, but
+# doesn't support UTF-8.
+
+export CPPFLAGS="-I%{_includedir}/readline5" LDFLAGS="-L%{_libdir}/readline5"
+
 # res_sqlite seems to use internal functions of sqlite3 which don't 
 # even _exist_ in current versions. Disable it until it's fixed.
 
 %configure --with-directory-layout=lsb --with-chan_bluetooth \
 	   --with-chan_fax --with-chan_capi --with-chan_alsa --with-app_ldap \
 	   --disable-zaptel --enable-t38 --enable-postgresql --with-cdr-pgsql \
-	   --with-res_config_pqsql --with-cdr-odbc --with-res_config_odbc \
+	   --with-res_config_pqsql --with-pgsql-inc=%{_includedir} \
+	   --with-cdr-odbc --with-res_config_odbc \
 	   --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
-	   
+
 
 # Poxy fscking libtool is _such_ a pile of crap...
 #sed -i 's/^CC="gcc"/CC="gcc -Wl,--as-needed"/' libtool
@@ -211,13 +222,13 @@ mv doc/README.{misdn,chan_capi,res_jabbe
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/callweaver/modules/*.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/callweaver/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/callweaver/*.la
-mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-install -m0755 contrib/fedora/callweaver $RPM_BUILD_ROOT%{_initrddir}/callweaver
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
-install -m0644 contrib/fedora/callweaver.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/callweaver
+
+#remove .a and .la files
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
+
+install -Dp -m 0755 contrib/fedora/callweaver $RPM_BUILD_ROOT%{_initrddir}/callweaver
+install -Dp -m 0644 contrib/fedora/callweaver.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/callweaver
 
 mv $RPM_BUILD_ROOT/%{_datadir}/callweaver/ogi/eogi-*test $RPM_BUILD_ROOT/%{_sbindir}
 
@@ -231,6 +242,8 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/callw
 rm -f $RPM_BUILD_ROOT/%{_sbindir}/safe_callweaver
 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}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -277,6 +290,10 @@ test "$1" != 0 || /sbin/chkconfig --del 
 %attr(2755,callweaver,callweaver) %{_localstatedir}/spool/callweaver
 %attr(0755,callweaver,callweaver) %{_localstatedir}/log/callweaver
 %attr(0755,callweaver,callweaver) %{_localstatedir}/run/callweaver
+
+#fix bz 473572
+%attr(0755,callweaver,callweaver) %{_sharedstatedir}/%{name}
+
 # Unneeded
 %exclude %{_sysconfdir}/callweaver/cdr_tds.conf
 # Separately packaged
@@ -377,6 +394,11 @@ test "$1" != 0 || /sbin/chkconfig --del 
 %{_sbindir}/eogi*
 
 %changelog
+* Tue Jul 28 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.0.1-5
+- fix bz #473572 /var/lib/callweaver not packaged
+- fix bz #511302 callweaver should build with compat-readline5-devel
+- fix postgresql includes-dir
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild