Author: czarny                       Date: Sun Feb 25 15:04:42 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- shared + static build
- custom made .la file

---- Files affected:
SPECS:
   crossmingw32-libjpeg.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/crossmingw32-libjpeg.spec
diff -u SPECS/crossmingw32-libjpeg.spec:1.9 SPECS/crossmingw32-libjpeg.spec:1.10
--- SPECS/crossmingw32-libjpeg.spec:1.9 Mon Feb 12 22:23:51 2007
+++ SPECS/crossmingw32-libjpeg.spec     Sun Feb 25 16:04:36 2007
@@ -22,14 +22,17 @@
 
 %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
@@ -81,29 +84,67 @@
 %{__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
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -111,6 +152,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2007/02/25 15:04:36  czarny
+- shared + static build
+- custom made .la file
+
 Revision 1.9  2007/02/12 21:23:51  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/crossmingw32-libjpeg.spec?r1=1.9&r2=1.10&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to