[pocketsphinx] Use RPM 4.9's new filter scheme to remove bogus provides. Minor spec file cleanups.

Jerry James jjames at fedoraproject.org
Fri Jul 15 18:02:15 UTC 2011


commit 7a5d96364d9bebf046651f0529024b58576aad87
Author: Jerry James <loganjerry at gmail.com>
Date:   Fri Jul 15 12:01:35 2011 -0600

    Use RPM 4.9's new filter scheme to remove bogus provides.
    Minor spec file cleanups.

 pocketsphinx.spec |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/pocketsphinx.spec b/pocketsphinx.spec
index 3904696..f907825 100644
--- a/pocketsphinx.spec
+++ b/pocketsphinx.spec
@@ -19,6 +19,8 @@ BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
 BuildRequires:  sphinxbase-devel
 
+%global __provides_exclude_from ^%{_libdir}/python.*\.so$
+
 %description
 PocketSphinx is a version of the open-source Sphinx-II speech recognition
 system which is able to recognize speech in real-time.  While it may be
@@ -28,7 +30,7 @@ enough to run on handheld and embedded devices.
 %package devel
 Summary:        Header files for developing with pocketsphinx
 Group:          Applications/Multimedia
-Requires:       %{name}-libs = %{version}-%{release}, pkgconfig
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}, pkgconfig
 Requires:       sphinxbase-devel
 
 %description devel
@@ -44,7 +46,8 @@ Shared libraries for pocketsphinx executables.
 %package plugin
 Summary:        Pocketsphinx gstreamer plugin
 Group:          Applications/Multimedia
-Requires:       %{name}-libs = %{version}-%{release}, gstreamer-plugins-base
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:       gstreamer-plugins-base
 
 %description plugin
 A gstreamer plugin for pocketsphinx.
@@ -52,7 +55,7 @@ A gstreamer plugin for pocketsphinx.
 %package python
 Summary:        Python interface to pocketsphinx
 Group:          Applications/Multimedia
-Requires:       %{name}-libs = %{version}-%{release}, sphinxbase-python
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}, sphinxbase-python
 
 %description python
 Python interface to pocketsphinx.
@@ -70,7 +73,7 @@ chmod a-x model/lm/en/tidigits.fsg model/lm/en_US/cmu07a.dic \
   test/unit/test_alignment.c test/unit/test_state_align.c
 
 %build
-%configure --disable-dependency-tracking --disable-static
+%configure --disable-static
 
 # Get rid of undesirable hardcoded runpaths
 sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
@@ -100,32 +103,31 @@ rm -f doc/html/installdox
 %postun libs -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %{_bindir}/*
 %{_datadir}/pocketsphinx
 %{_mandir}/man1/*
 
 %files devel
-%defattr(-,root,root,-)
 %doc doc/html
 %{_includedir}/pocketsphinx
 %{_libdir}/libpocketsphinx.so
 %{_libdir}/pkgconfig/pocketsphinx.pc
 
 %files libs
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/libpocketsphinx.so.*
 
 %files plugin
-%defattr(-,root,root,-)
 %{_libdir}/gstreamer-0.10/*
 
 %files python
-%defattr(-,root,root,-)
 %{python_sitearch}/*
 
 %changelog
+* Fri Jul 15 2011 Jerry James <loganjerry at gmail.com> - 0.7-2
+- Use RPM 4.9's new filter scheme to remove bogus provides
+- Minor spec file cleanups
+
 * Tue Apr 19 2011 Jerry James <loganjerry at gmail.com> - 0.7-1
 - New upstream release
 


More information about the scm-commits mailing list