From: czarny <czarny@pld-linux.org>
Date: Sun, 25 Feb 2007 15:04:36 +0000 (+0000)
Subject: - shared + static build
X-Git-Tag: auto/th/crossmingw32-libjpeg-6b-6~7
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcrossmingw32-libjpeg.git;a=commitdiff_plain;h=d6a8eeeff61cce77318df65781dae422fd8765de;hp=908fb225970b5ca3cd3b53d7acb9c62edac7992b

- shared + static build
- custom made .la file

Changed files:
    crossmingw32-libjpeg.spec -> 1.10
---

diff --git a/crossmingw32-libjpeg.spec b/crossmingw32-libjpeg.spec
index 5a25ccf..09e4026 100644
--- a/crossmingw32-libjpeg.spec
+++ b/crossmingw32-libjpeg.spec
@@ -21,14 +21,17 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		no_install_post_strip	1
 
-%define		target		i386-mingw32
-%define		target_platform	i386-pc-mingw32
-%define		arch		%{_prefix}/%{target}
-%define		gccarch		%{_prefix}/lib/gcc-lib/%{target}
-%define		gcclib		%{_prefix}/lib/gcc-lib/%{target}/%{version}
-
-%define		__cc		%{target}-gcc
-%define		__cxx		%{target}-g++
+%define		target			i386-mingw32
+%define		target_platform 	i386-pc-mingw32
+%define		arch			%{_prefix}/%{target}
+%define		gccarch			%{_prefix}/lib/gcc-lib/%{target}
+%define		gcclib			%{_prefix}/lib/gcc-lib/%{target}/%{version}
+
+%define		_sysprefix		/usr
+%define		_prefix			%{_sysprefix}/%{target}
+%define		_pkgconfigdir		%{_prefix}/lib/pkgconfig
+%define		__cc			%{target}-gcc
+%define		__cxx			%{target}-g++
 
 %ifarch alpha sparc sparc64 sparcv9
 %define		optflags	-O2
@@ -80,26 +83,64 @@ TARGET="%{target}" ; export TARGET
 %{__make}
 %{__make} jpeg.dll
 
+cat << "EOF" >> libjpeg.la
+# libjpeg.la - a libtool library file
+# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06)
+# ^^^^ This line needs to stay
+# Made by czarny czarny at pld-linux.org
+
+# The name that we can dlopen(3).
+dlname='../bin/libjpeg.dll'
+
+# Names of this library.
+library_names='libjpeg.dll.a'
+
+# The name of the static archive.
+old_library='libjpeg.a'
+
+# Libraries that this one depends upon.
+dependency_libs=''
+
+# Version information for libz.
+current=0
+age=0
+revision=0
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=no
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='%{_libdir}'
+EOF
+
 %{target}-strip jpeg.dll
 %{target}-strip -g -R.comment -R.note *.a
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{arch}/{include,lib}
-install -d $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
+install -d $RPM_BUILD_ROOT%{_prefix}/{include,lib,bin}
 
-install jconfig.h jerror.h jmorecfg.h jpeglib.h jversion.h $RPM_BUILD_ROOT%{arch}/include
-install *.a $RPM_BUILD_ROOT%{arch}/lib
-install jpeg.dll $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
+install jconfig.h jerror.h jmorecfg.h jpeglib.h jversion.h $RPM_BUILD_ROOT%{_includedir}
+install *.a $RPM_BUILD_ROOT%{_libdir}
+install jpeg.dll $RPM_BUILD_ROOT%{_bindir}/libjpeg.dll
+install libjpeg.la $RPM_BUILD_ROOT%{_libdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{arch}/include/*
-%{arch}/lib/*
+%{_includedir}/*.h
+%{_libdir}/*.la
+%{_libdir}/*.a
 
 %files dll
 %defattr(644,root,root,755)
-%{_datadir}/wine/windows/system/*
+%{_bindir}/*.dll