- use _dlldir, no strip if debug

Changed files:
    crossmingw32-libjpeg.spec -> 1.12

diff --git a/crossmingw32-libjpeg.spec b/crossmingw32-libjpeg.spec
index 9fe2b4d3f130f359611099953eb16d5fdc7114c1..6ac76c55a47ca357388261a53c619f56fbe08758 100644 (file)
--- a/crossmingw32-libjpeg.spec
+++ b/crossmingw32-libjpeg.spec
@@ -133,16 +133,18 @@ dlpreopen=''
 libdir='%{_libdir}'
 EOF
 
 libdir='%{_libdir}'
 EOF
 

+%if 0%{!?debug:1}

 %{target}-strip jpeg.dll
 %{target}-strip -g -R.comment -R.note *.a
 %{target}-strip jpeg.dll
 %{target}-strip -g -R.comment -R.note *.a

+%endif

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT%{_prefix}/{include,lib,bin}
+install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir},%{_dlldir}}

 
 install jconfig.h jerror.h jmorecfg.h jpeglib.h jversion.h $RPM_BUILD_ROOT%{_includedir}
 install *.a $RPM_BUILD_ROOT%{_libdir}
 
 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 jpeg.dll $RPM_BUILD_ROOT%{_dlldir}/libjpeg.dll

 install libjpeg.la $RPM_BUILD_ROOT%{_libdir}
 
 %clean
 install libjpeg.la $RPM_BUILD_ROOT%{_libdir}
 
 %clean


@@ -160,4 +162,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files dll
 %defattr(644,root,root,755)
 
 %files dll
 %defattr(644,root,root,755)

-%{_bindir}/libjpeg.dll
+%{_dlldir}/libjpeg.dll