]> git.saurik.com Git - wxWidgets.git/commitdiff
remove odbc lib to prevent rpm errors about unpackaged files (patch 1151783)
authorVadim Zeitlin <vadim@wxwidgets.org>
Mon, 21 Mar 2005 22:46:37 +0000 (22:46 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Mon, 21 Mar 2005 22:46:37 +0000 (22:46 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxGTK.spec

index 275dc5b5269d156f4c413a87dac37f2718a0c190..b2df2658278e82aa9f75c0688d2c45e53a96a38a 100644 (file)
@@ -23,7 +23,7 @@
 %if %{unicode}
 %define name        wx-%{portname}-unicode
 %define wxbasename  wx-base-unicode
-%else 
+%else
 %define name        wx-%{portname}
 %define wxbasename  wx-base
 %endif
@@ -312,6 +312,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libwx_base*
 rm -f $RPM_BUILD_ROOT%{_libdir}/libwxregexu-%{ver2}.a
 rm -f $RPM_BUILD_ROOT%{_datadir}/aclocal/*
 rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*/*/*
+%if !%{unicode}
+rm -f $RPM_BUILD_ROOT%{_libdir}/libwxodbc-2.5.a
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -333,7 +336,7 @@ rm -rf $RPM_BUILD_ROOT
 ln -sf %{_libdir}/wx/config/%{wxconfigname} %{_bindir}/wx-config
 # link wx-config with explicit name.
 ln -sf %{_libdir}/wx/config/%{wxconfigname} %{_bindir}/%{wxconfiglinkname}
-                                                                                   
+
 %preun devel
 if test -f %{_bindir}/wx-config -a -f /usr/bin/md5sum ; then
   SUM1=`md5sum %{_libdir}/wx/config/%{wxconfigname} | cut -c 0-32`
@@ -342,7 +345,7 @@ if test -f %{_bindir}/wx-config -a -f /usr/bin/md5sum ; then
     rm -f %{_bindir}/wx-config
   fi
 fi
-                                                                                   
+
 rm -f %{_bindir}/%{wxconfiglinkname}
 
 %files