[festival] tighter inter-subpackage deps
Matthias Clasen
mclasen at fedoraproject.org
Mon Jan 7 21:14:57 UTC 2013
commit f8d7e408c976f6076f30002d2e2b8c6335707dbf
Author: Matthias Clasen <mclasen at redhat.com>
Date: Mon Jan 7 16:15:26 2013 -0500
tighter inter-subpackage deps
festival.spec | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
---
diff --git a/festival.spec b/festival.spec
index bf4adec..aab2e84 100644
--- a/festival.spec
+++ b/festival.spec
@@ -6,7 +6,7 @@
Name: festival
Summary: Speech synthesis and text-to-speech system
Version: %{festivalversion}
-Release: 22%{?dist}
+Release: 23%{?dist}
URL: http://www.cstr.ed.ac.uk/projects/festival/
Group: Applications/Multimedia
@@ -164,6 +164,9 @@ BuildRequires: ncurses-devel
# default, there's the answer. :)
Requires: festvox-slt-arctic-hts
+Requires: festival-lib = %{version}-%{release}
+Requires: festival-speechtools-libs = %{speechtoolsversion}-%{release}
+
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{festivalversion}-%{release}-XXXXXX)
@@ -172,7 +175,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{festivalversion}-%{release}-XXXXXX
Summary: Library for the Festival speech synthesis system
# this is here to make sure upgrades go cleanly. In other cases,
# the auto-deps should handle this just fine.
-Requires: festival-speechtools-libs
+Requires: festival-speechtools-libs = %{speechtoolsversion}-%{release}
Group: System Environment/Libraries
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
@@ -193,7 +196,7 @@ Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
%package speechtools-utils
-Summary: Miscellaneous utilities from the Edinburgh Speech Tools
+Summary: Miscellaneous utilities from the Edinburgh Speech Tools
Group: Applications/Multimedia
Version: %{speechtoolsversion}
@@ -203,7 +206,7 @@ Version: %{speechtoolsversion}
Group: Development/Libraries
# Note: rpmlint complains incorrectly about
# "no-dependency-on festival-speechtools".
-Requires: festival-speechtools-libs = %{speechtoolsversion}
+Requires: festival-speechtools-libs = %{speechtoolsversion}-%{release}
%package -n festvox-kal-diphone
Group: Applications/Multimedia
@@ -294,7 +297,8 @@ Version: %{festivalversion}
Group: Development/Libraries
# Note: rpmlint complains incorrectly about
# "no-dependency-on festival"
-Requires: festival-speechtools-devel = %{speechtoolsversion}
+Requires: festival-speechtools-devel = %{speechtoolsversion}-%{release}
+Requires: festival-lib = %{version}-%{release}
Requires: festival-lib
@@ -515,9 +519,9 @@ for f in speech_tools/main/siod_main.cc src/arch/festival/festival.cc; do
sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"%{_libdir}",' $f
done
-# no backups for these patches because
+# no backups for these patches because
# the voice directories are copied wholesale
-%patch90 -p1
+%patch90 -p1
%patch91 -p1
%patch92 -p1
%patch93 -p1 -b .gcc43
@@ -592,7 +596,7 @@ pushd speech_tools
pushd include
for d in $( find . -type d | grep -v win32 ); do
make -w -C $d INCDIR=$RPM_BUILD_ROOT%{_includedir}/speech_tools/$d install_incs
- done
+ done
# Um, yeah, so, "EST" is not a very meaningful name for the include dir.
# The Red Hat / Fedora package has traditionally put this stuff under
# "speech_tools", and that's what we're gonna do here too.
@@ -647,7 +651,7 @@ pushd lib/voices
n=$( echo $f | sed 's/.*\/\(.*\)\/COPYING/COPYING.\1/' )
mv $f $OLDPWD/$n
done
- # ditch the readme files -- these aren't very useful.
+ # ditch the readme files -- these aren't very useful.
# Except keep a README.htsvoice, because it contains license information.
cp us/nitech_us_awb_arctic_hts/hts/README.htsvoice $OLDPWD/README.htsvoice
find . -name 'README*' -exec rm {} \;
@@ -685,7 +689,7 @@ pushd lib
done
mkdir -p $RPM_BUILD_ROOT%{_datadir}/festival/lib/multisyn/
install -m 644 multisyn/*.scm $RPM_BUILD_ROOT%{_datadir}/festival/lib/multisyn/
-popd
+popd
# "etc" -- not in the configuration sense, but in the sense of "extra helper
# binaries".
@@ -701,7 +705,7 @@ popd
# the actual /etc. :)
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/festival
# use our version of this file
-rm $RPM_BUILD_ROOT%{_datadir}/festival/lib/siteinit.scm
+rm $RPM_BUILD_ROOT%{_datadir}/festival/lib/siteinit.scm
install -m 644 %{SOURCE50} $RPM_BUILD_ROOT%{_sysconfdir}/festival/siteinit.scm
install -m 644 %{SOURCE51} $RPM_BUILD_ROOT%{_sysconfdir}/festival/sitevars.scm
@@ -827,7 +831,7 @@ fi
%files -n festvox-ked-diphone
%defattr(-,root,root)
-%doc COPYING.ked_diphone
+%doc COPYING.ked_diphone
%dir %{_datadir}/festival/lib/voices
%dir %{_datadir}/festival/lib/voices/english
%{_datadir}/festival/lib/voices/english/ked_diphone
@@ -899,6 +903,9 @@ fi
%changelog
+* Mon Jan 7 2013 Matthias Clasen <mclasen at redhat.com> - 1.96-23
+- Add tighter inter-subpackage deps (recommended by rpmdiff)
+
* Mon Jan 7 2013 Matthias Clasen <mclasen at redhat.com> - 1.96-22
- Fix directory ownership for /usr/share/festival/lib/voices/es
More information about the scm-commits
mailing list