[q/f17] use new filtering macros, rebuild for new ImageMagick

[Tom Callaway]

commit 551626427249903c1f87ce7c7f3355098587559b
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Fri Apr 13 12:19:09 2012 -0400

    use new filtering macros, rebuild for new ImageMagick

 q.spec |   75 ++++++++++++++++++----------------------------------------------
 1 files changed, 21 insertions(+), 54 deletions(-)
---
diff --git a/q.spec b/q.spec
index ec91da8..bc79a97 100644
--- a/q.spec
+++ b/q.spec
@@ -1,40 +1,20 @@
 Name: 		q
 Version: 	7.11
-Release: 	12%{?dist}.2
+Release: 	13%{?dist}
 Summary: 	Equational programming language
-
 Group: 		Development/Languages
 License: 	GPLv2+
 Source: 	http://ovh.dl.sourceforge.net/sourceforge/q-lang/q-%{version}.tar.gz
 URL: 		http://q-lang.sourceforge.net
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	ImageMagick-devel
-BuildRequires:	bison
-BuildRequires:	curl-devel
-BuildRequires:  dx-devel
-BuildRequires:	flex
-BuildRequires:	freetype-devel
-BuildRequires:	gdbm-devel
-BuildRequires:	gmp-devel
-BuildRequires:	libxml2-devel
-BuildRequires:	libxslt-devel
-BuildRequires:	ncurses-devel
-BuildRequires:	readline-devel
-BuildRequires:	tcl-devel
-BuildRequires:	tk-devel
-BuildRequires:	unixODBC-devel
-BuildRequires:	which
-BuildRequires:	zlib-devel
-BuildRequires:  libtool-ltdl-devel
-BuildRequires:  automake
-BuildRequires:  autoconf
-BuildRequires:  libtool
-BuildRequires:  gettext-devel
+BuildRequires:	ImageMagick-devel, bison, curl-devel, dx-devel
+BuildRequires:	flex, freetype-devel, gdbm-devel, gmp-devel
+BuildRequires:	libxml2-devel, libxslt-devel, ncurses-devel
+BuildRequires:	readline-devel, tcl-devel, tk-devel, unixODBC-devel
+BuildRequires:	which, zlib-devel, libtool-ltdl-devel, automake
+BuildRequires:  autoconf, libtool, gettext-devel
 Requires(post): /sbin/ldconfig /sbin/install-info
 Requires(postun): /sbin/ldconfig /sbin/install-info
 
-#Patch0: q-7.11-AcquireOnePixel.patch
-
 
 %description
 Q is a powerful and extensible functional programming language based
@@ -50,7 +30,7 @@ ODBC, GNU Octave, ImageMagick, Tcl/Tk, XML/XSLT and an Emacs mode.
 %package dx
 Summary:        DX module for Q
 Group:          Development/Languages
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description dx
 %{summary}.
@@ -59,7 +39,7 @@ Requires:       %{name} = %{version}-%{release}
 %package curl
 Summary:        cURL module for Q
 Group:          Development/Languages
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description curl
 %{summary}.
@@ -68,7 +48,7 @@ Requires:       %{name} = %{version}-%{release}
 %package magick
 Summary:        ImageMagick module for Q
 Group:          Development/Languages
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description magick
 %{summary}.
@@ -77,7 +57,7 @@ Requires:       %{name} = %{version}-%{release}
 %package tk
 Summary:        Tk module for Q
 Group:          Development/Languages
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description tk
 %{summary}.
@@ -86,7 +66,7 @@ Requires:       %{name} = %{version}-%{release}
 %package devel
 Summary:        Headers and static library for developing programs using Q
 Group:		Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:	libtool
 
 
@@ -102,17 +82,11 @@ sed -i 's|@libtool@|libtool|' src/Makefile.in
 rm -fr libltdl* libtool
 ./autogen.sh
 
-%define _use_internal_dependency_generator 0
-
-# Filter unwanted Provides
-cat > %{name}-prov <<EOF
-#!/bin/sh
-%{__find_provides} $* |\
-  sed -e '/\.so[ \t]*$/d'
-EOF
-
-%define __find_provides %{_builddir}/%{name}-%{version}/%{name}-prov
-chmod +x %{__find_provides}
+# We do not want any provides for the Q modules.
+%{?filter_setup:
+%filter_provides_in %{_libdir}/q/.*\.so$
+%filter_setup
+}
 
 
 %build
@@ -124,7 +98,6 @@ make
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.{la,a}
@@ -136,10 +109,6 @@ mv $RPM_BUILD_ROOT%{_datadir}/q/etc $RPM_BUILD_ROOT%{_docdir}/q-%{version}
 mv $RPM_BUILD_ROOT%{_datadir}/q/examples $RPM_BUILD_ROOT%{_docdir}/q-%{version}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post
 /sbin/ldconfig
 /sbin/install-info %{_infodir}/qdoc.info %{_infodir}/dir 2>/dev/null || :
@@ -153,7 +122,6 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %{_bindir}/q
 %{_bindir}/qc
 %{_infodir}/*
@@ -174,7 +142,6 @@ fi
 
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/lib*.so
 %{_bindir}/qcc
@@ -182,29 +149,29 @@ fi
 
 
 %files dx
-%defattr(-,root,root,-)
 %{_libdir}/q/dxl.so
 %{_datadir}/q/lib/dxl.q
 
 
 %files curl
-%defattr(-,root,root,-)
 %{_libdir}/q/curl.so
 %{_datadir}/q/lib/curl.q
 
 %files magick
-%defattr(-,root,root,-)
 %{_libdir}/q/magick.so
 %{_datadir}/q/lib/magick.q
 
 
 %files tk
-%defattr(-,root,root,-)
 %{_libdir}/q/tk.so
 %{_datadir}/q/lib/tk.q
 
 
 %changelog
+* Fri Apr 13 2012 Tom Callaway <spot at fedoraproject.org> - 7.11-13
+- use new filtering macros
+- rebuild for new ImageMagick
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.11-12.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild