rpms/speech-dispatcher/F-10 speech-dispatcher-gcc44-0.6.7.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 speech-dispatcher.spec, 1.8, 1.9

Wed May 20 11:49:58 UTC 2009

Author: pbrobinson

Update of /cvs/pkgs/rpms/speech-dispatcher/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21182

Modified Files:
	.cvsignore sources speech-dispatcher.spec 
Added Files:
	speech-dispatcher-gcc44-0.6.7.patch 
Log Message:
- New upstream release, some spec file cleanups.

speech-dispatcher-gcc44-0.6.7.patch:

--- NEW FILE speech-dispatcher-gcc44-0.6.7.patch ---
--- speech-dispatcher-0.6.7/src/modules/module_main.c.orig	2009-05-20 11:40:37.000000000 +0100
+++ speech-dispatcher-0.6.7/src/modules/module_main.c	2009-05-20 11:40:46.000000000 +0100
@@ -22,7 +22,7 @@
  */
 
 /* So that gcc doesn't comply */
-int getline(char**, size_t*, FILE*);
+/*int getline(char**, size_t*, FILE*);*/
 
 #define PROCESS_CMD(command, function) \
 if (!strcmp(cmd_buf, #command"\n")){ \
--- speech-dispatcher-0.6.7/src/modules/module_utils.h.orig	2009-05-20 11:48:06.000000000 +0100
+++ speech-dispatcher-0.6.7/src/modules/module_utils.h	2009-05-20 11:48:14.000000000 +0100
@@ -421,7 +421,7 @@
 
 
 /* So that gcc doesn't complain */
-int getline(char**, size_t*, FILE*);
+/*int getline(char**, size_t*, FILE*);*/
 
 pthread_mutex_t module_stdout_mutex;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/speech-dispatcher/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Jun 2008 06:15:21 -0000	1.2
+++ .cvsignore	20 May 2009 11:49:27 -0000	1.3
@@ -1 +1 @@
-speech-dispatcher-0.6.6.tar.gz
+speech-dispatcher-0.6.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/speech-dispatcher/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Jun 2008 06:15:21 -0000	1.2
+++ sources	20 May 2009 11:49:27 -0000	1.3
@@ -1 +1 @@
-bbd7ebc5b0f1b3ec4d89ad66b20d5cea  speech-dispatcher-0.6.6.tar.gz
+67432ad655b50fd7c1f1f79e012cfe3f  speech-dispatcher-0.6.7.tar.gz


Index: speech-dispatcher.spec
===================================================================
RCS file: /cvs/pkgs/rpms/speech-dispatcher/F-10/speech-dispatcher.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- speech-dispatcher.spec	21 Sep 2008 08:42:43 -0000	1.8
+++ speech-dispatcher.spec	20 May 2009 11:49:27 -0000	1.9
@@ -11,8 +11,8 @@
 %endif
 
 Name:           speech-dispatcher
-Version:        0.6.6
-Release:        19%{?dist}
+Version:        0.6.7
+Release:        1%{?dist}
 Summary:        To provide a high-level device independent layer for speech synthesis
 Group:          System Environment/Libraries
 
@@ -22,39 +22,25 @@ Group:          System Environment/Libra
 License:        GPLv2+ and GPLv2
 URL:            http://www.freebsoft.org/pub/projects/speechd/
 Source0:        http://www.freebsoft.org/pub/projects/speechd/%{name}-%{version}.tar.gz
-Source1:	http://www.nsitonline.in/hemant/stuff/speechd-rpm/speech-dispatcherd
+Source1:        http://www.nsitonline.in/hemant/stuff/speechd-rpm/speech-dispatcherd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: 	http://www.nsitonline.in/hemant/stuff/speechd-rpm/speechd.patch
+Patch0:         http://www.nsitonline.in/hemant/stuff/speechd-rpm/speechd.patch
+Patch1:		speech-dispatcher-gcc44-0.6.7.patch
 
-%if 0%{?fedora} >= 8
 BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
-
-%if %{with_flite}
-BuildRequires:	flite-devel
-%endif
-
-BuildRequires:	espeak-devel
-
-%if %{with_nas}
-Buildrequires:	nas-devel
-%endif
-
-%if %{with_pulse}
-Buildrequires:	pulseaudio-lib-devel
-%else
+BuildRequires: espeak-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: dotconf-devel
+BuildRequires: texinfo
+BuildRequires: libraw1394
+Buildrequires: pulseaudio-lib-devel
 Buildrequires: glib2-devel
-%endif
 
-%if 0%{?fedora} >=10
-BuildRequires:  libraw1394
+%if 0%{?fedora}
+BuildRequires: flite-devel
+Buildrequires: nas-devel
 %endif
 
-BuildRequires:	alsa-lib-devel
-BuildRequires:  dotconf-devel
-BuildRequires:	texinfo
 Requires(post): /sbin/chkconfig /sbin/install-info
 Requires(preun): /sbin/chkconfig /sbin/service /sbin/install-info
 Requires(postun): /sbin/service
@@ -85,10 +71,10 @@ The %{name}-devel package contains libra
 developing applications that use %{name}.
 
 %package doc
-Summary:	Documentation for speech-dispatcher
-License:	GPLv2+
-Group:		Documentation
-Requires: 	speech-dispatcher = %{version}-%{release}
+Summary:        Documentation for speech-dispatcher
+License:        GPLv2+
+Group:          Documentation
+Requires:       speech-dispatcher = %{version}-%{release}
 Requires(post): /sbin/install-info
 Requires(preun):/sbin/install-info
 
@@ -96,36 +82,30 @@ Requires(preun):/sbin/install-info
 speechd documentation
 
 %package python
-Summary:	Python Client API for speech-dispatcher
-License:	GPLv2+
-Group:		Development/Libraries
-Requires: 	speech-dispatcher = %{version}-%{release}
+Summary:        Python Client API for speech-dispatcher
+License:        GPLv2+
+Group:          Development/Libraries
+Requires:       speech-dispatcher = %{version}-%{release}
 
 %description python
 speechd python module
 
 %prep
-
-cat << EOF
-Build options:
-nas support   :                             %{with_nas}
-pulse support :                             %{with_pulse}
-flite support :				    %{with_flite}
-Dist Status:
-olpc          :			            %{?olpc}
-fedora        :				    %{?fedora}
-EOF
-
-
 %setup -q
-%patch0 -p1
-
+# patch needs further review as it has olpc specific changes in it.
+#%patch0 -p1
+%patch1 -p1 -b .gcc44
 
 %build
 iconv -f ISO-8859-2 -t UTF-8 doc/speech-dispatcher-cs.texi -o doc/speech-dispatcher-cs_c.texi
 mv doc/speech-dispatcher-cs_c.texi doc/speech-dispatcher-cs.texi
 
-%configure --disable-static
+%configure --disable-static --with-alsa --with-pulse --without-flite --sysconfdir=%{_sysconfdir}
+
+# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 %install
@@ -165,6 +145,13 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 cd ../../
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
+# Move the config files from /usr/share to /etc
+%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/speech-dispatcher/clients
+%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/speech-dispatcher/modules
+mv $RPM_BUILD_ROOT%{_datadir}/speech-dispatcher/conf/speechd.conf $RPM_BUILD_ROOT%{_sysconfdir}/speech-dispatcher/
+mv $RPM_BUILD_ROOT%{_datadir}/speech-dispatcher/conf/clients/* $RPM_BUILD_ROOT%{_sysconfdir}/speech-dispatcher/clients
+mv $RPM_BUILD_ROOT%{_datadir}/speech-dispatcher/conf/modules/* $RPM_BUILD_ROOT%{_sysconfdir}/speech-dispatcher/modules
+
 # Now move the files, change ownerships, apply setuid settings incase build is for
 # olpc.
 
@@ -174,6 +161,11 @@ find $RPM_BUILD_ROOT -name '*.la' -exec 
  mv $RPM_BUILD_ROOT%{_sysconfdir}/speech-dispatcher/* $RPM_BUILD_ROOT/home/olpc/.speechd
 %endif
 
+# Remove dummy sound
+%{__rm} -rf $RPM_BUILD_ROOT/%{_datadir}/sounds/
+
+# Create log dir
+%{__mkdir} -p -m 0700 $RPM_BUILD_ROOT%{_localstatedir}/log/speech-dispatcher/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -232,12 +224,13 @@ fi
 %dir %{_libdir}/speech-dispatcher-modules
 
 %{_libdir}/libspeechd.so.2
-%{_libdir}/libspeechd.so.2.0.5
+%{_libdir}/libspeechd.so.2.1.1
+%dir %{_libdir}/speech-dispatcher
 %{_libdir}/speech-dispatcher/lib*.so
 %{_libdir}/speech-dispatcher/libsdaudio.so.2
 %{_libdir}/speech-dispatcher/libsdaudio.so.2.0.2
 
-%dir %{_libdir}/speech-dispatcher
+%dir %attr(0700, root, root) %{_localstatedir}/log/speech-dispatcher/
 
 %if 0%{?fedora}
  %attr(0755,root,root)%{_initrddir}/speech-dispatcherd
@@ -245,11 +238,9 @@ fi
 
 %files devel
 %defattr(-,root,root,-)
-
 %{_includedir}/*
 %{_libdir}/lib*.so
 
-
 %files doc
 %defattr(-,root,root,-)
 %{_infodir}/*
@@ -268,54 +259,45 @@ if [ $1 = 0 ]; then
  /sbin/install-info --delete %{_infodir}/%{name}-cs.info %{_infodir}/dir || :
 fi
 
-
-
 %files python
 %defattr(-,root,root,-)
-
 %{python_sitelib}/speechd*
 
+%changelog
+* Wed May 20 2009 Peter Robinson <pbrobinson at gmail.com> - 0.6.7-1
+- New upstream release, some spec file cleanups.
 
-#########################################################
-# CHANGELOGS
-#########################################################
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.6-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-%changelog
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.6.6-20
+- Rebuild for Python 2.6
 
 * Sun Sep 21 2008 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.6.6-19
-
 - Fix Patch0:/%%patch mismatch.
 
 * Wed Jul 16 2008    Hemant Goyal <goyal.hemant at gmail.com> 0.6.6-18
-
 - removed suid permission for speech-dispatcher binary.
 
 * Wed Jul 16 2008    Hemant Goyal <goyal.hemant at gmail.com> 0.6.6-17
-
 - changing permissions of speech-dispatcher to 6711 (setuid and setguid)
 - relocating configuration files in case of OLPC branch.
 - excluding init script in case of OLPC branch.
 
-
 * Wed Jul 16 2008    Hemant Goyal <goyal.hemant at gmail.com> 0.6.6-16
-
 - yet another release bump required :-/
 
 * Wed Jul 16 2008    Hemant Goyal <goyal.hemant at gmail.com> 0.6.6-15
-
 - release bump
 
 * Mon Jul 13 2008    Hemant Goyal <goyal.hemant at gmail.com> 0.6.6-14
-
 - conditional build required for OLPC Branch - Building without nas and 
   pulse-audio support.
 
 * Mon Jun 23 2008    Hemant Goyal <goyal.hemant at gmail.com> 0.6.6-13
-
 - changed permission of speech-dispatcherd to 0644 too.
 
 * Fri Jun 20 2008    Hemant Goyal <goyal.hemant at gmail.com> 0.6.6-12
-
 - added BuildRequires: texinfo (for makeinfo)
 - changed permissions of Sourcex to 0644
 - incorporated modified init script by mtasaka
@@ -323,7 +305,6 @@ fi
 - modified location of Source1 and Patch0 to point to online locations
 
 * Wed Jun 18 2008    Hemant Goyal <goyal.hemant at gmail.com> 0.6.6-11
-
 - fixed encoding of speech-dispatcher-cs.info file to UTF-8
 
 * Wed Jun 11 2008    Hemant Goyal <goyal.hemant at gmail.com> 0.6.6-10
@@ -337,7 +318,6 @@ fi
 - removed %%{_infodir}/dir file
 
 * Sat Jun 07 2008    Hemant Goyal <goyal.hemant at gmail.com> 0.6.6-8
-
 - converted speech-dispatcher-cs.info to UTF-8 encoding
 - removed multiple file listings of /usr/lib/python2.5/site-packages/speechd/_test.py
   and fixed its mode
@@ -348,7 +328,6 @@ fi
 - init script fixed
 
 * Tue Jun 03 2008    Hemant Goyal <goyal.hemant at gmail.com> 0.6.6-7
-
 - changed license of base package to GPLv2+ and GPL
 - changed license of all other packages to GPLv2+
 - fixed install sequence using cleaner for loop and pushd and popd commands
@@ -360,25 +339,19 @@ fi
 - reset mode of _test.py to 0755
 
 * Sun Apr 27 2008    Hemant Goyal <goyal.hemant at gmail.com> 0.6.6-6
-
 - changed BR to pulseaudio-lib-devel
 - removed dotconf BR
 - gave ownership of /%%{python_sitelib}/speechd-0.3-py2.5.egg-info to python package if package is built for Fedora 9 or above
 
-
 * Sun Apr 13 2008    Hemant Goyal <goyal.hemant at gmail.com> 0.6.6-5
-
 - Removed conitional building options
 - Added BuildRequires for dotconf-devel
 
-
 * Mon Feb 18 2008    Hemant Goyal <goyal.hemant at gmail.com> 0.6.6-4
-
 - Manually specyfying make install for each src directory to be installed
 - Installing python package seprately by by-passing make install
 
 * Sun Feb 17 2008   Hemant Goyal <goyal.hemant at gmail.com> 0.6.6-3
-
 - Added Requires(post), Requires(preun) for -doc package
 - Changed scriptlet from postun to preun for -doc package
 - Removed Epoch
@@ -387,14 +360,11 @@ fi
 - removed --prefix=$RPM_BUILD_ROOT/%%{_prefix}  against configure macro.
   -- -python subpackage does not build anymore.
 - removed python subpackag rules from SPEC file.
-	
 
 * Sat Feb 16 2008   Hemant Goyal <goyal.hemant at gmail.com> 0.6.6-2
-
 - fixed directory ownerships
 
 * Sat Feb 16 2008   Hemant Goyal <goyal.hemant at gmail.com> 0.6.6-1
-
 - using newest version of speech-dispatcher
 - updated %%{_libdir}/libspeechd.so.2.0.4 to %%{_libdir}/libspeechd.so.2.0.5
 - python packages are being generated correctly now
@@ -402,18 +372,15 @@ fi
 - finding and deleting .*la files in $RPM_BUILD_ROOT to avoid unpackaged files error.
 
 * Sat Feb 16 2008   Hemant Goyal <goyal.hemant at gmail.com> 0.6.5-4
-
 - updated build root
 
 * Sat Feb 16 2008   Hemant Goyal <goyal.hemant at gmail.com> 0.6.5-3
-
 - added macro to prevent error from stopping build for not including *.la files
 - added epoch to the SPEC
 - conditional build seems to be working correctly the old way only??
 - unified changelogs
 
 * Fri Feb 15 2008  Hemant Goyal <goyal.hemant at gmail.com> 0.6.5-2
-
 - Removed .la files
 - Removed doc-cs packages and merged it into doc package
 - Removed packaging of static files, and tested -without static_libs option for configure script


