Hello community, here is the log from the commit of package festival for openSUSE:Factory checked in at 2014-07-15 08:00:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/festival (Old) and /work/SRC/openSUSE:Factory/.festival.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "festival" Changes: -------- --- /work/SRC/openSUSE:Factory/festival/festival.changes 2013-04-12 20:30:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.festival.new/festival.changes 2014-07-15 08:01:03.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Jul 13 01:15:46 UTC 2014 - [email protected] + +- Spec-file cleanup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ festival.spec ++++++ --- /var/tmp/diff_new_pack.Eo7J4i/_old 2014-07-15 08:01:04.000000000 +0200 +++ /var/tmp/diff_new_pack.Eo7J4i/_new 2014-07-15 08:01:04.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package festival # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,27 +19,27 @@ Name: festival Version: 2.1 Release: 0 -Summary: The Festival Speech Synthesis System +Summary: The Speech Synthesis System License: BSD-3-Clause Group: Productivity/Text/Convertors -Url: http://www.cstr.ed.ac.uk/projects/festival/ -Source0: http://www.cstr.ed.ac.uk/downloads/festival/2.1/festival-%{version}-release.tar.gz -Source1: http://www.cstr.ed.ac.uk/downloads/festival/2.1/speech_tools-%{version}-release.tar.gz -Source2: http://www.cstr.ed.ac.uk/downloads/festival/2.1/festlex_CMU.tar.gz -Source3: http://www.cstr.ed.ac.uk/downloads/festival/2.1/festvox_kallpc16k.tar.gz -Source4: http://www.cstr.ed.ac.uk/downloads/festival/2.1/festlex_POSLEX.tar.gz -Source5: sysconfig.festival -Source6: rcfestival +Url: http://www.cstr.ed.ac.uk/projects/%{name}/ +Source0: http://www.cstr.ed.ac.uk/downloads/%{name}/2.1/%{name}-%{version}-release.tar.gz +Source1: http://www.cstr.ed.ac.uk/downloads/%{name}/2.1/speech_tools-%{version}-release.tar.gz +Source2: http://www.cstr.ed.ac.uk/downloads/%{name}/2.1/festlex_CMU.tar.gz +Source3: http://www.cstr.ed.ac.uk/downloads/%{name}/2.1/festvox_kallpc16k.tar.gz +Source4: http://www.cstr.ed.ac.uk/downloads/%{name}/2.1/festlex_POSLEX.tar.gz +Source5: sysconfig.%{name} +Source6: rc%{name} # festival patches -Patch2: festival-1.95-examples.patch -Patch3: festival-text2wave-manpage.patch -Patch4: festival-1.95-libdir.patch -Patch7: festival-1.95-audsp.patch -Patch8: festival-1.96-chroot.patch +Patch2: %{name}-1.95-examples.patch +Patch3: %{name}-text2wave-manpage.patch +Patch4: %{name}-1.95-libdir.patch +Patch7: %{name}-1.95-audsp.patch +Patch8: %{name}-1.96-chroot.patch # PATCH-FIX-UPSTREAM festival-no-LD_LIBRARY_PATH-extension.patch bnc#642507 [email protected] -- Do not change LD_LIBRARY_PATH in binaries, to avoid any risks -Patch9: festival-no-LD_LIBRARY_PATH-extension.patch +Patch9: %{name}-no-LD_LIBRARY_PATH-extension.patch # PATCH-FIX-UPSTREAM festival-safe-temp-file.patch bnc#642507 [email protected] -- Create temporary files in a safe way -Patch10: festival-safe-temp-file.patch +Patch10: %{name}-safe-temp-file.patch # speech-tools patches # PATCH-FIX-UPSTREAM speech_tools-undefined-operation.patch [email protected] -- Avoid a undefined-operation warning with gcc (sending mail upstream) Patch11: speech_tools-undefined-operation.patch @@ -51,7 +51,9 @@ BuildRequires: gcc-c++ BuildRequires: ncurses-devel BuildRequires: pkgconfig -PreReq: %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd +PreReq: %{fillup_prereq} +PreReq: /usr/sbin/useradd +PreReq: /usr/sbin/groupadd BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -64,14 +66,14 @@ %package devel Summary: Development Package for Festival License: MIT -Group: Productivity/Text/Convertors +Group: Development/Libraries/Other Requires: %{name} = %{version} %description devel Files needed for developing software that uses Festival. %prep -%setup -q -b 1 -b 2 -b 3 -b 4 -q -n festival +%setup -q -b 1 -b 2 -b 3 -b 4 -n %{name} %patch2 -p1 %patch3 -p1 %patch4 @@ -86,118 +88,112 @@ %patch18 -p1 %build -# festival -./configure --prefix=%_prefix \ - --libdir=%_libdir \ - --datadir=%_datadir/festival \ - --sysconfdir=%_sysconfdir -# speech tools +# configure festival +./configure --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --datadir=%{_datadir}/%{name} \ + --sysconfdir=%{_sysconfdir} +# configure speech tools cp config.guess config.sub ../speech_tools cd ../speech_tools -./configure --prefix=%_prefix \ - --libdir=%_libdir \ - --datadir=%_datadir/festival \ - --sysconfdir=%_sysconfdir -make CC="gcc -fPIC $RPM_OPT_FLAGS" CXX="g++ $RPM_OPT_FLAGS -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing" -cd ../festival -make CC="gcc -fPIC $RPM_OPT_FLAGS" CXX="g++ $RPM_OPT_FLAGS -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing" +./configure --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --datadir=%{_datadir}/%{name} \ + --sysconfdir=%{_sysconfdir} +make CC="gcc -fPIC %{optflags}" CXX="g++ %{optflags} -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing" +cd ../%{name} +make CC="gcc -fPIC %{optflags}" CXX="g++ %{optflags} -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing" make doc %install %make_install cd ../speech_tools %make_install -cd ../festival -# install binarys -install -D bin/text2wave $RPM_BUILD_ROOT%_bindir/text2wave -install -m 755 bin/festival* $RPM_BUILD_ROOT%_bindir/ -install -m 755 examples/saytime $RPM_BUILD_ROOT%_bindir/ +cd ../%{name} +# install binaries +install -D bin/text2wave %{buildroot}%{_bindir}/text2wave +install -m 755 bin/%{name}* %{buildroot}%{_bindir}/ +install -m 755 examples/saytime %{buildroot}%{_bindir}/ # install manpages -install -D -m 644 doc/festival.1 $RPM_BUILD_ROOT%_mandir/man1/festival.1 -install -m 644 doc/festival_client.1 $RPM_BUILD_ROOT%_mandir/man1/ -install -m 644 doc/text2wave.1 $RPM_BUILD_ROOT%_mandir/man1/ +install -Dm 644 doc/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 +install -m 644 doc/%{name}_client.1 %{buildroot}%{_mandir}/man1/ +install -m 644 doc/text2wave.1 %{buildroot}%{_mandir}/man1/ # install configs -install -D lib/festival.scm $RPM_BUILD_ROOT%_sysconfdir/festival.scm +install -Dm 644 lib/%{name}.scm %{buildroot}%{_sysconfdir}/%{name}.scm # install dictionarys -install -D lib/dicts/cmu/cmudict-0.4.out $RPM_BUILD_ROOT%_datadir/%name/dicts/cmu/cmudict-0.4.out -install -m 644 lib/dicts/cmu/*.scm $RPM_BUILD_ROOT%_datadir/%name/dicts/cmu/ -install -m 644 lib/dicts/wsj.wp39.poslexR $RPM_BUILD_ROOT%_datadir/%name/dicts/ -install -m 644 lib/dicts/wsj.wp39.tri.ngrambin $RPM_BUILD_ROOT%_datadir/%name/dicts/ +install -Dm 644 lib/dicts/cmu/cmudict-0.4.out %{buildroot}%{_datadir}/%{name}/dicts/cmu/cmudict-0.4.out +install -m 644 lib/dicts/cmu/*.scm %{buildroot}%{_datadir}/%{name}/dicts/cmu/ +install -m 644 lib/dicts/wsj.wp39.poslexR %{buildroot}%{_datadir}/%{name}/dicts/ +install -m 644 lib/dicts/wsj.wp39.tri.ngrambin %{buildroot}%{_datadir}/%{name}/dicts/ # install voices -mkdir -p $RPM_BUILD_ROOT/usr/share/festival/voices/english/kal_diphone/festvox -mkdir -p $RPM_BUILD_ROOT/usr/share/festival/voices/english/kal_diphone/group -cp lib/voices/english/kal_diphone/group/* $RPM_BUILD_ROOT/usr/share/festival/voices/english/kal_diphone/group/ -cp lib/voices/english/kal_diphone/festvox/*.scm $RPM_BUILD_ROOT/usr/share/festival/voices/english/kal_diphone/festvox +mkdir -p %{buildroot}%{_datadir}/%{name}/voices/english/kal_diphone/{group,festvox} +cp lib/voices/english/kal_diphone/group/* %{buildroot}%{_datadir}/%{name}/voices/english/kal_diphone/group/ +cp lib/voices/english/kal_diphone/festvox/*.scm %{buildroot}%{_datadir}/%{name}/voices/english/kal_diphone/festvox # install data -cp lib/*.scm $RPM_BUILD_ROOT/usr/share/festival/ -cp lib/*.ngrambin $RPM_BUILD_ROOT/usr/share/festival/ -cp lib/*.gram $RPM_BUILD_ROOT/usr/share/festival/ -cp lib/*.el $RPM_BUILD_ROOT/usr/share/festival/ -install -D lib/etc/unknown_Linux/audsp $RPM_BUILD_ROOT/usr/lib/festival/audsp -# install libs -install -D src/lib/libFestival.a $RPM_BUILD_ROOT/%_libdir/libFestival.a +cp lib/*.scm %{buildroot}%{_datadir}/%{name}/ +cp lib/*.ngrambin %{buildroot}%{_datadir}/%{name}/ +cp lib/*.gram %{buildroot}%{_datadir}/%{name}/ +cp lib/*.el %{buildroot}%{_datadir}/%{name}/ +install -D lib%{_sysconfdir}/unknown_Linux/audsp %{buildroot}%{_libexecdir}/%{name}/audsp # install includes -mkdir -p $RPM_BUILD_ROOT%_includedir/ -install -m 644 src/include/*.h $RPM_BUILD_ROOT%_includedir/ +mkdir -p %{buildroot}%{_includedir}/ +install -m 644 src/include/*.h %{buildroot}%{_includedir}/ cd ../speech_tools -# install includes -mkdir -p $RPM_BUILD_ROOT%_includedir/instantiate -mkdir -p $RPM_BUILD_ROOT%_includedir/ling_class -mkdir -p $RPM_BUILD_ROOT%_includedir/rxp -mkdir -p $RPM_BUILD_ROOT%_includedir/sigpr -mkdir -p $RPM_BUILD_ROOT%_includedir/unix -install -m 644 include/*h $RPM_BUILD_ROOT%_includedir -install -m 644 include/instantiate/*h $RPM_BUILD_ROOT%_includedir/instantiate -install -m 644 include/ling_class/*h $RPM_BUILD_ROOT%_includedir/ling_class -install -m 644 include/rxp/*h $RPM_BUILD_ROOT%_includedir/rxp -install -m 644 include/sigpr/*h $RPM_BUILD_ROOT%_includedir/sigpr -install -m 644 include/unix/*h $RPM_BUILD_ROOT%_includedir/unix + +mkdir -p %{buildroot}%{_includedir}/{instantiate,ling_class,rxp,sigpr,unix} +install -m 644 include/*h %{buildroot}%{_includedir} +install -m 644 include/instantiate/*h %{buildroot}%{_includedir}/instantiate +install -m 644 include/ling_class/*h %{buildroot}%{_includedir}/ling_class +install -m 644 include/rxp/*h %{buildroot}%{_includedir}/rxp +install -m 644 include/sigpr/*h %{buildroot}%{_includedir}/sigpr +install -m 644 include/unix/*h %{buildroot}%{_includedir}/unix # install libs -install -m 644 lib/lib*.a $RPM_BUILD_ROOT%_libdir +install -Dm 644 ../%{name}/src/lib/libFestival.a %{buildroot}/%{_libdir}/libFestival.a +install -m 644 lib/lib*.a %{buildroot}%{_libdir} # install init script -install -m 755 -D %{S:6} $RPM_BUILD_ROOT/etc/init.d/%name -install -d $RPM_BUILD_ROOT%_sbindir -ln -sf ../../etc/init.d/%name $RPM_BUILD_ROOT/usr/sbin/rc%name +install -m 755 -D %{SOURCE6} %{buildroot}%{_initddir}/%{name} +install -d %{buildroot}%{_sbindir} +ln -sf ../..%{_initddir}/%{name} %{buildroot}%{_sbindir}/rc%{name} # installl sysconfig file -install -m 644 -D %{S:5} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.%name +install -m 644 -D %{SOURCE5} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} -%clean -rm -rf $RPM_BUILD_ROOT +# remove instalation instructions +rm -f %{buildroot}%{_docdir}/%{name}/INSTALL %pre -/usr/sbin/groupadd -r festival 2> /dev/null || : -/usr/sbin/useradd -r -g festival -s /bin/false -c "Festival daemon" -d /usr/share/festival/ festival 2> /dev/null || : +%{_sbindir}/groupadd -r %{name} 2> /dev/null || : +%{_sbindir}/useradd -r -g %{name} -s /bin/false -c "Festival daemon" -d %{_datadir}/%{name}/ %{name} 2> /dev/null || : %post -%{fillup_only} +%fillup_only %preun -%stop_on_removal %name +%stop_on_removal %{name} %postun -%restart_on_update %name +%restart_on_update %{name} %insserv_cleanup %files %defattr(-,root,root) -%doc COPYING README INSTALL examples/*.text examples/ex1.* examples/*.scm examples/*.dtd -%_sysconfdir/festival.scm -%_sysconfdir/init.d/%name -%_bindir/festival -%_bindir/festival_client -%_bindir/festival_server -%_bindir/festival_server_control -%_bindir/text2wave -%_bindir/saytime -%_sbindir/rc%name -%_prefix/lib/festival -%_datadir/festival -%_mandir/man1/* -/var/adm/fillup-templates/* +%doc COPYING README examples/*.text examples/ex1.* examples/*.scm examples/*.dtd +%config(noreplace) %{_sysconfdir}/%{name}.scm +%{_sysconfdir}/init.d/%{name} +%{_bindir}/%{name} +%{_bindir}/%{name}_client +%{_bindir}/%{name}_server +%{_bindir}/%{name}_server_control +%{_bindir}/text2wave +%{_bindir}/saytime +%{_sbindir}/rc%{name} +%{_libexecdir}/%{name} +%{_datadir}/%{name} +%{_mandir}/man1/* +%{_localstatedir}/adm/fillup-templates/* %files devel %defattr(-,root,root) -%_includedir/* -%_libdir/lib*.a +%{_includedir}/* +%{_libdir}/lib*.a %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
