[vips] Clean up Requires/BuildRequires

Adam Goode agoode at fedoraproject.org
Fri Aug 12 18:03:26 UTC 2011


commit 4466c5c2334b57180cbf1b004a6c9709ed55d7b2
Author: Adam Goode <adam at spicenitz.org>
Date:   Fri Aug 12 14:02:57 2011 -0400

    Clean up Requires/BuildRequires

 vips.spec |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)
---
diff --git a/vips.spec b/vips.spec
index 4c5471d..5064654 100644
--- a/vips.spec
+++ b/vips.spec
@@ -10,12 +10,24 @@ License:	LGPLv2+
 URL:		http://www.vips.ecs.soton.ac.uk/
 Source0:	http://www.vips.ecs.soton.ac.uk/supported/7.24/%{name}-%{version}.tar.gz
 
-BuildRequires:	libjpeg-devel libtiff-devel zlib-devel fftw-devel lcms-devel
-BuildRequires:	libpng-devel glib2-devel ImageMagick-devel pango-devel
-BuildRequires:	pkgconfig gettext perl(XML::Parser)
-BuildRequires:	libtool python-devel libxml2-devel liboil-devel
-BuildRequires:	OpenEXR-devel libexif-devel swig matio-devel gtk-doc
-BuildRequires:	cfitsio-devel orc-devel
+BuildRequires:	pkgconfig(glib-2.0)
+BuildRequires:	pkgconfig(libxml-2.0)
+BuildRequires:	pkgconfig(fftw3)
+BuildRequires:	pkgconfig(MagickWand)
+BuildRequires:	pkgconfig(orc-0.4)
+BuildRequires:	pkgconfig(lcms2)
+BuildRequires:	pkgconfig(OpenEXR)
+BuildRequires:	pkgconfig(matio)
+BuildRequires:	pkgconfig(cfitsio)
+BuildRequires:	pkgconfig(pangoft2)
+BuildRequires:	pkgconfig(libpng)
+BuildRequires:	pkgconfig(libexif)
+
+BuildRequires:	libjpeg-devel libtiff-devel zlib-devel
+
+BuildRequires:	pkgconfig gettext
+BuildRequires:	libtool python-devel
+BuildRequires:	swig gtk-doc
 #Requires:
 
 
@@ -31,10 +43,7 @@ against VIPS.
 %package devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}, pkgconfig
-Requires:	libjpeg-devel libtiff-devel zlib-devel fftw-devel lcms-devel
-Requires:	libpng-devel glib2-devel ImageMagick-devel pango-devel
-Requires:	libxml2-devel liboil-devel OpenEXR-devel libexif-devel
+Requires:	libjpeg-devel%{?_isa} libtiff-devel%{?_isa} zlib-devel%{?_isa}
 
 %description devel
 The %{name}-devel package contains the header files and
@@ -45,7 +54,6 @@ contains a C++ API and development man pages.
 %package tools
 Summary:	Command-line tools for %{name}
 Group:		Applications/Multimedia
-Requires:	%{name} = %{version}-%{release}
 
 %description tools
 The %{name}-tools package contains command-line tools for working with VIPS.
@@ -54,7 +62,6 @@ The %{name}-tools package contains command-line tools for working with VIPS.
 %package python
 Summary:	Python support for %{name}
 Group:		Development/Languages
-Requires:	%{name} = %{version}-%{release}
 
 %description python
 The %{name}-python package contains Python support for VIPS.
@@ -128,7 +135,6 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/vips
 %doc doc/html doc/pdf COPYING
 
 
-
 %changelog
 * Wed Aug 10 2011 Adam Goode <adam at spicenitz.org> - 7.24.7-1
 - New upstream release


More information about the scm-commits mailing list