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

diff --git a/libjpeg/mingw-libjpeg.spec b/libjpeg/mingw-libjpeg.spec
index d863778..65fb352 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:        3%{?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.gz
+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.
@@ -65,13 +69,15 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_mingw_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_mingw_includedir}
 mkdir -p $RPM_BUILD_ROOT%{_mingw_libdir}
-mkdir -p $RPM_BUILD_ROOT%{_mingw_mandir}/man1
 mkdir -p $RPM_BUILD_ROOT%{_mingw_prefix}/man/man1
 
 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
+
+# Remove manual pages which duplicate Fedora native.
+rm -rf $RPM_BUILD_ROOT%{_mingw_prefix}/man
 
 
 %clean
@@ -90,15 +96,18 @@ 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*
-%{_mingw_mandir}/man1/djpeg.1*
-%{_mingw_mandir}/man1/jpegtran.1*
-%{_mingw_mandir}/man1/rdjpgcom.1*
-%{_mingw_mandir}/man1/wrjpgcom.1*
+
 
 %changelog
-* Tue Sep  9 2008 Daniel P. Berrange <berrange@redhat.com> - 2.18.0-1
+* Sun Sep 21 2008 Daniel P. Berrange <berrange@redhat.com> - 6b-3
+- Fix URL.
+- Remove manpages which duplicate Fedora native.
+
+* 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