SPECS: wxWidgets.spec - if "--with debug" passed %files section wa...

[maho]

Author: maho                         Date: Mon Aug  8 21:36:20 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- if "--with debug" passed %files section was incorrect: fixed

---- Files affected:
SPECS:
   wxWidgets.spec (1.38 -> 1.39) 

---- Diffs:

================================================================
Index: SPECS/wxWidgets.spec
diff -u SPECS/wxWidgets.spec:1.38 SPECS/wxWidgets.spec:1.39
--- SPECS/wxWidgets.spec:1.38	Tue Jun  7 05:28:30 2005
+++ SPECS/wxWidgets.spec	Mon Aug  8 23:36:14 2005
@@ -643,6 +643,10 @@
 %post	-n wxX11-unicode -p /sbin/ldconfig
 %postun -n wxX11-unicode -p /sbin/ldconfig
 
+%define _libf %{?with_debug:d}
+%define _configf %{?with_debug:-debug-2.6}
+
+
 %files -f wxstd.lang
 %defattr(644,root,root,755)
 %doc docs/{changes,licence,licendoc,preamble,readme,todo}.txt
@@ -670,70 +674,70 @@
 %if %{with ansi}
 %files -n wxBase
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwx_base-*.so.*.*
-%attr(755,root,root) %{_libdir}/libwx_base_*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_base%{_libf}-*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_base%{_libf}_*.so.*.*
 #%attr(755,root,root) %{_libdir}/wx/%{version}/sound_sdl-*.so
 
 %files -n wxBase-devel
 %defattr(644,root,root,755)
-%{_libdir}/libwx_base-*.so
-%{_libdir}/libwx_base_*.so
+%{_libdir}/libwx_base%{_libf}-*.so
+%{_libdir}/libwx_base%{_libf}_*.so
 %endif
 
 %files -n wxBase-unicode
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwx_baseu-*.so.*.*
-%attr(755,root,root) %{_libdir}/libwx_baseu_*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_baseu%{_libf}-*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_baseu%{_libf}_*.so.*.*
 #%attr(755,root,root) %{_libdir}/wx/%{version}/sound_sdlu-*.so
 
 %files -n wxBase-unicode-devel
 %defattr(644,root,root,755)
-%{_libdir}/libwx_baseu-*.so
-%{_libdir}/libwx_baseu_*.so
+%{_libdir}/libwx_baseu%{_libf}-*.so
+%{_libdir}/libwx_baseu%{_libf}_*.so
 
 %if %{with ansi}
 %files -n wxGTK2
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwx_gtk2_*.so.*.*
-%exclude %{_libdir}/libwx_gtk2_ogl-*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_gtk2%{_libf}_*.so.*.*
+%exclude %{_libdir}/libwx_gtk2%{_libf}_ogl-*.so.*.*
 
 %files -n wxGTK2-devel
 %defattr(644,root,root,755)
-%{_libdir}/libwx_gtk2_*-*.so
-%exclude %{_libdir}/libwx_gtk2_ogl-*.so
+%{_libdir}/libwx_gtk2%{_libf}_*-*.so
+%exclude %{_libdir}/libwx_gtk2%{_libf}_ogl-*.so
 %{_libdir}/wx/config/gtk2-ansi-*
 %{_libdir}/wx/include/gtk2-ansi-*
-%attr(755,root,root) %{_bindir}/wx-gtk2-ansi-config
+%attr(755,root,root) %{_bindir}/wx-gtk2-ansi%{_configf}-config
 
 %files -n wxGTK2-gl
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwx_gtk2_ogl-*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_gtk2%{_libf}_ogl-*.so.*.*
 
 %files -n wxGTK2-gl-devel
 %defattr(644,root,root,755)
-%{_libdir}/libwx_gtk2_ogl-*.so
+%{_libdir}/libwx_gtk2%{_libf}_ogl-*.so
 %endif
 
 %files -n wxGTK2-unicode
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwx_gtk2u_*-*.so.*.*
-%exclude %{_libdir}/libwx_gtk2u_ogl-*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_gtk2u%{_libf}_*-*.so.*.*
+%exclude %{_libdir}/libwx_gtk2u%{_libf}_ogl-*.so.*.*
 
 %files -n wxGTK2-unicode-devel
 %defattr(644,root,root,755)
-%{_libdir}/libwx_gtk2u_*-*.so
-%exclude %{_libdir}/libwx_gtk2u_ogl-*.so
+%{_libdir}/libwx_gtk2u%{_libf}_*-*.so
+%exclude %{_libdir}/libwx_gtk2u%{_libf}_ogl-*.so
 %{_libdir}/wx/config/gtk2-unicode-*
 %{_libdir}/wx/include/gtk2-unicode-*
-%attr(755,root,root) %{_bindir}/wx-gtk2-unicode-config
+%attr(755,root,root) %{_bindir}/wx-gtk2-unicode%{_configf}-config
 
 %files -n wxGTK2-unicode-gl
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwx_gtk2u_ogl-*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_gtk2u%{_libf}_ogl-*.so.*.*
 
 %files -n wxGTK2-unicode-gl-devel
 %defattr(644,root,root,755)
-%{_libdir}/libwx_gtk2u_ogl-*.so
+%{_libdir}/libwx_gtk2u%{_libf}_ogl-*.so
 
 %if %{with x11}
 %if %{with ansi}
@@ -746,46 +750,46 @@
 %files -n wxX11
 %defattr(644,root,root,755)
 %doc docs/wxX11-readme.txt
-%attr(755,root,root) %{_libdir}/libwx_x11univ_*-*.so.*.*
-%exclude %{_libdir}/libwx_x11univ_ogl-*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_x11univ%{_libf}_*-*.so.*.*
+%exclude %{_libdir}/libwx_x11univ%{_libf}_ogl-*.so.*.*
 
 %files -n wxX11-devel
 %defattr(644,root,root,755)
-%{_libdir}/libwx_x11univ_*-*.so
-%exclude %{_libdir}/libwx_x11univ_ogl-*.so
+%{_libdir}/libwx_x11univ%{_libf}_*-*.so
+%exclude %{_libdir}/libwx_x11univ%{_libf}_ogl-*.so
 %{_libdir}/wx/config/x11univ-ansi-*
 %{_libdir}/wx/include/x11univ-ansi-*
-%attr(755,root,root) %{_bindir}/wx-x11univ-ansi-config
+%attr(755,root,root) %{_bindir}/wx-x11univ-ansi%{_configf}-config
 
 %files -n wxX11-gl
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwx_x11univ_ogl-*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_x11univ%{_libf}_ogl-*.so.*.*
 
 %files -n wxX11-gl-devel
 %defattr(644,root,root,755)
-%{_libdir}/libwx_x11univ_ogl-*.so
+%{_libdir}/libwx_x11univ%{_libf}_ogl-*.so
 %endif
 
 %files -n wxX11-unicode
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwx_x11univu_*-*.so.*.*
-%exclude %{_libdir}/libwx_x11univu_ogl-*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_x11univu%{_libf}_*-*.so.*.*
+%exclude %{_libdir}/libwx_x11univu%{_libf}_ogl-*.so.*.*
 
 %files -n wxX11-unicode-devel
 %defattr(644,root,root,755)
-%{_libdir}/libwx_x11univu_*-*.so
-%exclude %{_libdir}/libwx_x11univu_ogl-*.so
+%{_libdir}/libwx_x11univu%{_libf}_*-*.so
+%exclude %{_libdir}/libwx_x11univu%{_libf}_ogl-*.so
 %{_libdir}/wx/config/x11univ-unicode-*
 %{_libdir}/wx/include/x11univ-unicode-*
-%attr(755,root,root) %{_bindir}/wx-x11univ-unicode-config
+%attr(755,root,root) %{_bindir}/wx-x11univ-unicode%{_configf}-config
 
 %files -n wxX11-unicode-gl
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwx_x11univu_ogl-*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_x11univu%{_libf}_ogl-*.so.*.*
 
 %files -n wxX11-unicode-gl-devel
 %defattr(644,root,root,755)
-%{_libdir}/libwx_x11univu_ogl-*.so
+%{_libdir}/libwx_x11univu%{_libf}_ogl-*.so
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -794,6 +798,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39  2005/08/08 21:36:14  maho
+- if "--with debug" passed %files section was incorrect: fixed
+
 Revision 1.38  2005/06/07 03:28:30  jareq
 
 - 'AC_DEFUN([AM_PATH_GTK]' back. My fault.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/wxWidgets.spec?r1=1.38&r2=1.39&f=u