[libextractor] Fix FTBFS.
Jon Ciesla
limb at fedoraproject.org
Thu Mar 7 18:08:06 UTC 2013
commit 7479ac0b1406b7d9f2cc1a7f4e8cc16071a5323d
Author: Jon Ciesla <limburgher at gmail.com>
Date: Thu Mar 7 12:04:57 2013 -0600
Fix FTBFS.
libextractor.spec | 42 ++++++++++++++++++------------------------
1 files changed, 18 insertions(+), 24 deletions(-)
---
diff --git a/libextractor.spec b/libextractor.spec
index a8f46ed..4531654 100644
--- a/libextractor.spec
+++ b/libextractor.spec
@@ -1,18 +1,9 @@
-%bcond_with mpeg
-%bcond_without flac
-%bcond_without noarch
-
%global plugindir %_libdir/%name
%global gtkver 3
-%{?with_noarch:%global noarch BuildArch: noarch}
-%{!?release_func:%global release_func() %1%{?dist}}
-%{!?apply:%global apply(p:n:b:) %patch%%{-n:%%{-n*}} %%{-p:-p%%{-p*}} %%{-b:-b%%{-b*}} \
-%nil}
-
Name: libextractor
Version: 1.0.1
-Release: %release_func 1901
+Release: 1902%{?dist}
Summary: Simple library for keyword extraction
Group: System Environment/Libraries
@@ -49,9 +40,8 @@ Requires: %name-plugins-rpm
Requires: %name-plugins-tiff
Requires: %name-plugins-gif
Requires: %name-plugins-mime
-%{?with_flac:Requires: %name-plugins-flac}
-%{?with_mpeg:Requires: %name-plugins-mpeg}
-%{?noarch}
+Requires: %name-plugins-flac
+BuildArch: noarch
%global pluginpkg(B:R:P:u) \
@@ -82,8 +72,7 @@ Summary: Base plugins for libextractor
Group: System Environment/Libraries
Requires: %name%{?_isa} = %version-%release
-%{?with_mpeg:%pluginpkg mpeg -B mpeg2dec-devel}
-%{?with_flac:%pluginpkg flac -B flac-devel}
+%pluginpkg flac -B flac-devel
%pluginpkg exiv2 -B exiv2-devel
%pluginpkg ogg -B libvorbis-devel
%pluginpkg ole2 -B libgsf-devel,glib2-devel
@@ -146,7 +135,7 @@ sed -i 's!\(-L\(/usr\|\$with_qt\)/lib\|-I/usr/include\) !!g' configure
%build
-%{!?with_mpeg:export ac_cv_lib_mpeg2_mpeg2_init=no}
+export ac_cv_lib_mpeg2_mpeg2_init=no
export lt_cv_sys_dlsearch_path='/%_lib:%_prefix/%_lib:%plugindir'
%configure --disable-static \
--disable-rpath \
@@ -241,10 +230,10 @@ test $1 != 0 || /sbin/install-info --info-dir %_infodir --delete %_infodir/extra
%files -f libextractor.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README* TODO
-%_bindir/*
-%_libdir/*.so.*
-%_infodir/*info*
-%_mandir/man1/*
+%{_bindir}/*
+%{_libdir}/*.so.*
+%{_infodir}/*info*
+%{_mandir}/man1/*
%dir %plugindir
%files plugins
@@ -252,13 +241,18 @@ test $1 != 0 || /sbin/install-info --info-dir %_infodir --delete %_infodir/extra
%files devel
%defattr(-,root,root,-)
-%_includedir/*
-%_libdir/*.so
-%_mandir/man3/*
-%_libdir/pkgconfig/*
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/libextractor/*.so
+%{_mandir}/man3/*
+%{_libdir}/pkgconfig/*
%changelog
+* Thu Feb 28 2013 Jon Ciesla <limburgher at gmail.com> - 1.0.1-1902
+- Fix macros.
+- Fix FTBFS.
+
* Wed Feb 13 2013 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.0.1-1901
- workaround buildproblems in rawhide
More information about the scm-commits
mailing list