rpms/vips/F-12 vips.spec,1.30,1.31

[Adam Goode]

Author: agoode

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

Modified Files:
	vips.spec 
Log Message:
Oops, revert F-13 stuff


Index: vips.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vips/F-12/vips.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- vips.spec	19 Jun 2010 17:14:13 -0000	1.30
+++ vips.spec	19 Jun 2010 23:45:46 -0000	1.31
@@ -1,20 +1,22 @@
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		vips
-Version:	7.20.7
-Release:	3%{?dist}.1
+Version:	7.18.2
+Release:	1%{?dist}
 Summary:	C/C++ library for processing large images
 
 Group:		System Environment/Libraries
 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
+Source0:	http://www.vips.ecs.soton.ac.uk/supported/7.16/%{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)
 BuildRequires:	libtool python-devel libxml2-devel liboil-devel
-BuildRequires:	OpenEXR-devel libexif-devel swig matio-devel gtk-doc
+BuildRequires:	OpenEXR-devel libexif-devel swig
 #Requires:
 
 
@@ -81,23 +83,23 @@ unset FAKE_BUILD_DATE
 
 
 %build
-%configure --disable-static --enable-gtk-doc
+%configure --disable-static
 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 {} ';'
 
 # delete doc (we will get it later with %doc)
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/vips
 
-# locale stuff
-%find_lang vips-7.20
+# malkovich??
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/locale/malkovich
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+# locale stuff
+%find_lang vips7
 
 
 %post -p /sbin/ldconfig
@@ -105,10 +107,15 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 
-%files -f vips-7.20.lang
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files -f vips7.lang
 %defattr(-,root,root,-)
 %doc AUTHORS NEWS THANKS TODO COPYING ChangeLog
 %{_libdir}/*.so.*
+%{_datadir}/vips
 
 
 %files devel
@@ -117,7 +124,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 %{_mandir}/man3/*
-%{_datadir}/gtk-doc
 
 
 %files tools
@@ -138,30 +144,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Jun 19 2010 Adam Goode <adam at spicenitz.org> - 7.20.7-3.1
-- Restore missing clean section
-
-* 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
-   + Bugfixes for YCbCr JPEG TIFF files
-
-* Wed Jan  6 2010 Adam Goode <adam at spicenitz.org> - 7.20.6-1
-- New upstream release
-   + About half of the VIPS library has been revised
-   + Now using gtk-doc
-   + Better image file support
-   + MATLAB file read supported
-   + New interpolation system
-   + Support for Radiance files
-
 * Fri Sep  4 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 7.18.2-1
 - Update to 7.18.2 to sync with fixed nip2 FTBFS.