SPECS: crossmingw32-libjpeg.spec - use _dlldir, no strip if debug

qboosh qboosh at pld-linux.org
Wed Mar 7 01:09:19 CET 2007


Author: qboosh                       Date: Wed Mar  7 00:09:19 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use _dlldir, no strip if debug

---- Files affected:
SPECS:
   crossmingw32-libjpeg.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/crossmingw32-libjpeg.spec
diff -u SPECS/crossmingw32-libjpeg.spec:1.11 SPECS/crossmingw32-libjpeg.spec:1.12
--- SPECS/crossmingw32-libjpeg.spec:1.11	Wed Mar  7 01:04:07 2007
+++ SPECS/crossmingw32-libjpeg.spec	Wed Mar  7 01:09:13 2007
@@ -134,16 +134,18 @@
 libdir='%{_libdir}'
 EOF
 
+%if 0%{!?debug:1}
 %{target}-strip jpeg.dll
 %{target}-strip -g -R.comment -R.note *.a
+%endif
 
 %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 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
@@ -161,7 +163,7 @@
 
 %files dll
 %defattr(644,root,root,755)
-%{_bindir}/libjpeg.dll
+%{_dlldir}/libjpeg.dll
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -169,6 +171,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2007/03/07 00:09:13  qboosh
+- use _dlldir, no strip if debug
+
 Revision 1.11  2007/03/07 00:04:07  qboosh
 - cleanup, separated -static
 
================================================================

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



More information about the pld-cvs-commit mailing list