[cmusphinx3] 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 15:59:06 UTC 2011


commit 3f3cafbfe20af522e2de2d955376e808c88212e2
Author: Jerry James <loganjerry at gmail.com>
Date:   Fri Jul 15 09:58:09 2011 -0600

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

 cmusphinx3.spec |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/cmusphinx3.spec b/cmusphinx3.spec
index 23307f6..b5508c6 100644
--- a/cmusphinx3.spec
+++ b/cmusphinx3.spec
@@ -1,6 +1,6 @@
 Name:           cmusphinx3
 Version:        0.8
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Large vocabulary speech recognition in C
 
 Group:          Applications/Multimedia
@@ -23,8 +23,13 @@ Patch2:         sphinx3-python.patch
 # undefined weak symbols in one library.
 Patch3:         sphinx3-link.patch
 
-BuildRequires:  alsa-lib-devel, doxygen, pkgconfig
-BuildRequires:  python2-devel, sphinxbase-devel
+BuildRequires:  alsa-lib-devel
+BuildRequires:  doxygen
+BuildRequires:  pkgconfig
+BuildRequires:  python2-devel
+BuildRequires:  sphinxbase-devel
+
+%global __provides_exclude_from ^%{_libdir}/python.*\.so$
 
 %description
 Sphinx-3 is CMU's state-of-the-art large vocabulary speech recognition system.
@@ -90,12 +95,12 @@ touch -r master03_stylesheet.css x.css
 mv -f x.css master03_stylesheet.css
 
 %build
-%configure --disable-dependency-tracking --disable-static
+%configure --disable-static
 
 # Get rid of undesirable hardcoded runpaths
-sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
-       -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
-    libtool
+sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
+    -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
+    -i libtool
 
 # Build the C code and its documentation
 make %{?_smp_mflags}
@@ -124,32 +129,31 @@ rm -f doc/images/Makefile doc/s3/*.fig
 %postun libs -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %{_bindir}/*
 %{_datadir}/sphinx3
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/sphinx3
 %{_libdir}/libs3decoder.so
 %{_libdir}/pkgconfig/sphinx3.pc
 
 %files libs
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/libs3decoder.so.*
 
 %files python
-%defattr(-,root,root,-)
 %{python_sitearch}/Sphinx3*.egg-info
 %{python_sitearch}/_sphinx3.so
 
 %files doc
-%defattr(-,root,root,-)
 %doc doc/images doc/s3 doc/s3-2_files doc/*.doc doc/*.htm* doc/*.pdf doc/*.ppt
 %doc doc/*.txt doc/sphinx3.4.code.tracing doc/sphinx3.5_refactoring.note html
 
 %changelog
+* Fri Jul 15 2011 Jerry James <loganjerry at gmail.com> - 0.8-8
+- 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.8-7
 - Rebuild for sphinxbase 0.7
 


More information about the scm-commits mailing list