rpms/vips/F-13 vips.spec,1.31,1.32

[Adam Goode]

Author: agoode

Update of /cvs/pkgs/rpms/vips/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22611

Modified Files:
	vips.spec 
Log Message:
* Tue Jun 15 2010 Adam Goode <adam at spicenitz.org> - 7.20.7-3
- Don't require gtk-doc anymore (resolves #604421)



Index: vips.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vips/F-13/vips.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- vips.spec	2 Feb 2010 16:43:02 -0000	1.31
+++ vips.spec	16 Jun 2010 16:23:05 -0000	1.32
@@ -2,7 +2,7 @@
 
 Name:		vips
 Version:	7.20.7
-Release:	1%{?dist}
+Release:	3%{?dist}
 Summary:	C/C++ library for processing large images
 
 Group:		System Environment/Libraries
@@ -10,8 +10,6 @@ License:	LGPLv2+
 URL:		http://www.vips.ecs.soton.ac.uk/
 Source0:	http://www.vips.ecs.soton.ac.uk/supported/7.20/%{name}-%{version}.tar.gz
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 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)
@@ -36,7 +34,6 @@ Requires:	%{name} = %{version}-%{release
 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:	gtk-doc
 
 %description devel
 The %{name}-devel package contains the header files and
@@ -89,7 +86,6 @@ make %{?_smp_mflags} LIBTOOL=libtool
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT \( -name '*.la' -o -name '*.a' \) -exec rm -f {} ';'
 
@@ -105,10 +101,6 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/
 %postun -p /sbin/ldconfig
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files -f vips-7.20.lang
 %defattr(-,root,root,-)
 %doc AUTHORS NEWS THANKS TODO COPYING ChangeLog
@@ -121,7 +113,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 %{_mandir}/man3/*
-%{_datadir}/gtk-doc/html/*
+%{_datadir}/gtk-doc
 
 
 %files tools
@@ -142,6 +134,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 15 2010 Adam Goode <adam at spicenitz.org> - 7.20.7-3
+- Don't require gtk-doc anymore (resolves #604421)
+
+* Sun Mar  7 2010 Adam Goode <adam at spicenitz.org> - 7.20.7-2
+- Rebuild for imagemagick soname change
+- Remove some old RPM stuff
+
 * Tue Feb  2 2010 Adam Goode <adam at spicenitz.org> - 7.20.7-1
 - New upstream release
    + C++ and Python bindings now have support for deprecated functions