--- libjpeg.spec.orig	2008-11-24 12:51:50.000000000 +0100
+++ libjpeg.spec	2008-12-22 23:11:15.663309369 +0100
@@ -1,18 +1,19 @@
-Summary: A library for manipulating JPEG image format files
+Summary: Library for manipulating JPEG image format files
 Name: libjpeg
 Version: 6b
-Release: 43%{?dist}
+Release: 44%{?dist}
 License: IJG
 Group: System Environment/Libraries
 URL: http://www.ijg.org/
 
-Source0: ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz
+Source0: http://www.ijg.org/files/jpegsrc.v6b.tar.gz
 Source1: configure.in
 
 Patch1: jpeg-c++.patch
 Patch4: libjpeg-cflags.patch
 Patch5: libjpeg-buf-oflo.patch
 Patch6: libjpeg-autoconf.patch
+Patch7: libjpeg-install.patch
 
 BuildRequires: autoconf libtool
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -58,6 +59,7 @@
 %patch4 -p1 -b .cflags
 %patch5 -p1 -b .oflo
 %patch6 -p1
+%patch7 -p1 -b .install
 
 # For long-obsolete reasons, libjpeg 6b doesn't ship with a configure.in.
 # We need to re-autoconf though, in order to update libtool support,
@@ -73,25 +75,18 @@
 
 %build
 %configure --enable-shared --enable-static
-
-make libdir=%{_libdir} %{?_smp_mflags}
-
-LD_LIBRARY_PATH=$PWD:$LD_LIBRARY_PATH make test
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+make install install-lib DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
-mkdir -p $RPM_BUILD_ROOT/usr/{include,bin}
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-
-%makeinstall
-
-# Work around the broken makefiles...
-mv $RPM_BUILD_ROOT%{_mandir}/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
+%check
+LD_LIBRARY_PATH=$PWD:$LD_LIBRARY_PATH make test
 
-# We don't ship .la files.
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
@@ -100,24 +95,26 @@
 %files
 %defattr(-,root,root)
 %doc usage.doc README
-%{_libdir}/libjpeg.so.*
 %{_bindir}/*
-%{_mandir}/*/*
+%{_libdir}/libjpeg.so.*
+%{_mandir}/man1/*
 
 %files devel
 %defattr(-,root,root)
 %doc libjpeg.doc coderules.doc structure.doc wizard.doc example.c
+%{_includedir}/*.h
 %{_libdir}/*.so
-/usr/include/*.h
 
 %files static
 %defattr(-,root,root)
 %{_libdir}/*.a
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %changelog
+* Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 6b-44
+- Use original IJG source URL.
+- Move "make test" to %%check section.
+- Include install patch to support DESTDIR and fix man pages location.
+
 * Thu Sep 25 2008 Tom Lane <tgl@redhat.com> - 6b-43
 - Revert to using .gz instead of .bz2 tarball
 Resolves: #463903