be explicit

[wxWidgets.git] / wxMotif.spec

diff --git a/wxMotif.spec b/wxMotif.spec
index 4e30e050dac7c778dede9dea143cd1f6dfecc8ec..ec8b0fb890234f3348220071608344cff0341e81 100644 (file)
--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -3,7 +3,7 @@
 
 # Note that this is NOT a relocatable package
 %define pref /usr
 
 # Note that this is NOT a relocatable package
 %define pref /usr

-%define ver 2.5.1
+%define ver 2.5.2

 %define ver2 2.5
 %define rel 1
 
 %define ver2 2.5
 %define rel 1
 


@@ -113,6 +113,7 @@ wx/dde.h
 wx/debug.h
 wx/defs.h
 wx/dir.h
 wx/debug.h
 wx/defs.h
 wx/dir.h

+wx/dlimpexp.h

 wx/dynarray.h
 wx/dynlib.h
 wx/dynload.h
 wx/dynarray.h
 wx/dynlib.h
 wx/dynload.h


@@ -130,7 +131,6 @@ wx/fontenc.h
 wx/fontmap.h
 wx/fs_mem.h
 wx/fs_zip.h
 wx/fontmap.h
 wx/fs_mem.h
 wx/fs_zip.h

-wx/gzstream.h

 wx/hash.h
 wx/hashmap.h
 wx/hashset.h
 wx/hash.h
 wx/hashmap.h
 wx/hashset.h


@@ -220,12 +220,17 @@ wx/dbtable.h
 EOF
 # --- wxBase headers list ends here ---
 for f in `cat wxbase-headers-list` ; do
 EOF
 # --- wxBase headers list ends here ---
 for f in `cat wxbase-headers-list` ; do

-  rm -f $RPM_BUILD_ROOT%{_includedir}/$f
+  rm -f $RPM_BUILD_ROOT%{_includedir}/wx-*/$f

 done
 
 # list of all core headers:
 find $RPM_BUILD_ROOT/usr/include/wx -type f | sed -e "s,$RPM_BUILD_ROOT,,g" >core-headers.files
 
 done
 
 # list of all core headers:
 find $RPM_BUILD_ROOT/usr/include/wx -type f | sed -e "s,$RPM_BUILD_ROOT,,g" >core-headers.files
 

+# remove wxBase files so that RPM doesn't complain about unpackaged files:
+rm -f $RPM_BUILD_ROOT%{_libdir}/libwx_base*
+rm -f $RPM_BUILD_ROOT%{_datadir}/aclocal/*
+rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*/*/*
+

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT


@@ -242,22 +247,6 @@ rm -rf $RPM_BUILD_ROOT
 %postun gl
 /sbin/ldconfig
 
 %postun gl
 /sbin/ldconfig
 

-%post devel
-# Install wx-config if there isn't any
-if test ! -f %{_bindir}/wx-config ; then
-    ln -sf %{wxconfigname} %{_bindir}/wx-config
-fi
-
-%preun devel
-# Remove wx-config if it points to this package
-if test -f %{_bindir}/wx-config -a -f /usr/bin/md5sum ; then
-  SUM1=`md5sum %{_bindir}/%{wxconfigname} | cut -c 0-32`
-  SUM2=`md5sum %{_bindir}/wx-config | cut -c 0-32`
-  if test "x$SUM1" = "x$SUM2" ; then
-    rm -f %{_bindir}/wx-config
-  fi
-fi
-

 
 %files
 %defattr(-,root,root)
 
 %files
 %defattr(-,root,root)