X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libjpeg%2Fmingw-libjpeg.spec;h=72ba20553b2d0cdc97423005b6ae4fbc27b25aba;hb=b928f8d086a402f5a220d1b0a90f9b4558eb7cd5;hp=d863778eb890e0ca77298bd13af8bd2e5ee63f80;hpb=c4ba57addef6ed38edd70d80825c5434afb39930;p=fedora-mingw.git

diff --git a/libjpeg/mingw-libjpeg.spec b/libjpeg/mingw-libjpeg.spec
index d863778..72ba205 100644
--- a/libjpeg/mingw-libjpeg.spec
+++ b/libjpeg/mingw-libjpeg.spec
@@ -1,32 +1,36 @@
-%include /usr/lib/rpm/mingw-defs
+%define __strip %{_mingw_strip}
+%define __objdump %{_mingw_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw_findrequires}
+%define __find_provides %{_mingw_findprovides}
 
 Name:           mingw-libjpeg
 Version:        6b
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows Libjpeg library
 
-License: IJG
-URL: http://www.ijg.org/
+License:        IJG
+URL:            http://www.ijg.org/
 Group:          Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.bz2
-Source1: configure.in
+Source0:        ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v%{version}.tar.bz2
+Source1:        libjpeg-configure.in
 
-Patch1: jpeg-c++.patch
-Patch4: libjpeg-cflags.patch
-Patch5: libjpeg-buf-oflo.patch
-Patch6: libjpeg-autoconf.patch
+Patch1:         jpeg-c++.patch
+Patch4:         libjpeg-cflags.patch
+Patch5:         libjpeg-buf-oflo.patch
+Patch6:         libjpeg-autoconf.patch
 
-Patch100: jpeg-mingw.patch
+Patch100:       jpeg-mingw.patch
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
-BuildRequires: mingw-libpng
-BuildRequires: mingw-zlib
-BuildRequires: autoconf libtool
+BuildRequires:  mingw-libpng
+BuildRequires:  mingw-zlib
+BuildRequires:  autoconf, libtool
 
 %description
 MinGW Windows Libjpeg library.
@@ -73,6 +77,9 @@ make prefix=$RPM_BUILD_ROOT%{_mingw_prefix} install
 # Work around the broken makefiles...
 mv $RPM_BUILD_ROOT%{_mingw_prefix}/man/man1/*.1 $RPM_BUILD_ROOT%{_mingw_mandir}/man1
 
+# Remove static library.
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libjpeg.a
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -90,7 +97,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_includedir}/jerror.h
 %{_mingw_includedir}/jmorecfg.h
 %{_mingw_includedir}/jpeglib.h
-%{_mingw_libdir}/libjpeg.a
 %{_mingw_libdir}/libjpeg.dll.a
 %{_mingw_libdir}/libjpeg.la
 %{_mingw_mandir}/man1/cjpeg.1*
@@ -100,5 +106,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_mandir}/man1/wrjpgcom.1*
 
 %changelog
-* Tue Sep  9 2008 Daniel P. Berrange <berrange@redhat.com> - 2.18.0-1
+* Wed Sep 10 2008 Daniel P. Berrange <berrange@redhat.com> - 6b-2
+- Rename configure.in with a prefix.
+- Remove static library.
+
+* Tue Sep  9 2008 Daniel P. Berrange <berrange@redhat.com> - 6b-1
 - Initial RPM release