fixes for wxBase RPM

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index acfa397aed25b48477f4fb47cf3c8d2489bf5bec..353b3a6faded6d1106e03005f6e7501a9468dc08 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -539,10 +539,13 @@ ALL_DIST: distclean
        cp $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB
        cp $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt
        cp $(DOCDIR)/symbols.txt $(DISTDIR)/SYMBOLS.txt
+       cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
+       cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
        mkdir $(DISTDIR)/lib
        cp $(WXDIR)/lib/vms.opt $(DISTDIR)/lib
        cp $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib
        mkdir $(DISTDIR)/src
+       cp $(SRCDIR)/files.lst $(DISTDIR)/src/
        mkdir $(DISTDIR)/src/zlib
        cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
        cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
@@ -564,9 +567,10 @@ ALL_DIST: distclean
 # but is not used when building wxBase distribution
 ALL_GUI_DIST: ALL_DIST
        cp $(WXDIR)/wxBase.spec $(DISTDIR)
-       cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
-       cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt
-       cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README.txt
+       cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt        
+       if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \
+         cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES-$(TOOLKIT).txt ; fi
+       cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README-$(TOOLKIT).txt
        cp $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt
        mkdir $(DISTDIR)/include
        mkdir $(DISTDIR)/include/wx
@@ -593,7 +597,6 @@ ALL_GUI_DIST: ALL_DIST
        mkdir $(DISTDIR)/src/tiff
        mkdir $(DISTDIR)/src/iodbc
        mkdir $(DISTDIR)/src/unix
-       cp $(SRCDIR)/files.lst $(DISTDIR)/src/
        cp $(SRCDIR)/*.in $(DISTDIR)/src
        cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
        cp $(COMMDIR)/*.c $(DISTDIR)/src/common
@@ -636,11 +639,11 @@ BASE_DIST: ALL_DIST
        mkdir $(DISTDIR)/include/wx/unix
        mkdir $(DISTDIR)/src/common
        mkdir $(DISTDIR)/src/unix
+       mkdir $(DISTDIR)/src/msw
        cp $(WXDIR)/wxBase.spec $(DISTDIR)
        cp @PORT_FILES@ $(DISTDIR)
-       cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@
-       cp $(WXDIR)/wxBase*.dsp $(DISTDIR)
-       cp $(WXDIR)/wxBase*.dsw $(DISTDIR)
+       cp $(WXDIR)/src/wxBase*.dsp $(DISTDIR)
+       cp $(WXDIR)/src/wxBase*.dsw $(DISTDIR)
        cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
        cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
        cp $(SRCDIR)/*.in $(DISTDIR)/src
@@ -678,10 +681,11 @@ GTK_DIST: ALL_GUI_DIST
        cp -R $(WXDIR)/contrib $(DISTDIR)
 
 MOTIF_DIST: ALL_GUI_DIST
-       cp $(WXDIR)/wxMOTIF.spec $(DISTDIR)
+       cp $(WXDIR)/wxMotif.spec $(DISTDIR)
        cp $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif
        cp $(MOTIFDIR)/files.lst $(DISTDIR)/src/motif
        cp $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif
+       cp $(MOTIFDIR)/*.c $(DISTDIR)/src/motif
        cp $(MOTIFDIR)/*.xbm $(DISTDIR)/src/motif
        mkdir $(DISTDIR)/src/motif/xmcombo
        cp $(MOTIFDIR)/xmcombo/*.c $(DISTDIR)/src/motif/xmcombo

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index c11d7d337bd3fb0f1568e628f4b81d188af66843..1bd11aa65f710c2f58f9cca7c4cd169cd6cfd06f 100644 (file)
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -115,7 +115,7 @@ wizard.cpp  Generic
 appcmn.cpp     Common  Base
 choiccmn.cpp   Common
 clipcmn.cpp    Common
-clntdata.cpp   Common
+clntdata.cpp   Common  Base
 cmdline.cpp    Common  Base
 cmdproc.cpp    Common
 cmndata.cpp    Common
@@ -711,7 +711,7 @@ chkconf.h   WXH     Base
 choicdlg.h     WXH
 choice.h       WXH
 clipbrd.h      WXH
-clntdata.h     WXH
+clntdata.h     WXH     Base
 cmdline.h      WXH     Base
 cmdproc.h      WXH
 cmndata.h      WXH
@@ -836,7 +836,7 @@ palette.h   WXH
 panel.h        WXH
 paper.h        WXH
 pen.h  WXH
-platform.h     WXH
+platform.h     WXH     Base
 popupwin.h     WXH
 print.h        WXH
 printdlg.h     WXH

diff --git a/src/files.lst b/src/files.lst
index 0fd33b50043c5e61e94ce9942d5bd6d3a95bb739..1c9f01c6091b73c5ed38a204ab7d2b01bf558ecf 100644 (file)
--- a/src/files.lst
+++ b/src/files.lst
@@ -1,8 +1,9 @@
-# This file was automatically generated by tmake at 18:55, 2001/11/17
+# This file was automatically generated by tmake at 16:36, 2001/11/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASE.T!
 ALL_SOURCES = \
                common/init.cpp \
                common/appcmn.cpp \
+               common/clntdata.cpp \
                common/cmdline.cpp \
                common/config.cpp \
                common/datetime.cpp \
@@ -89,6 +90,7 @@ ALL_HEADERS = \
                arrimpl.cpp \
                buffer.h \
                chkconf.h \
+               clntdata.h \
                cmdline.h \
                confbase.h \
                config.h \
@@ -134,6 +136,7 @@ ALL_HEADERS = \
                mstream.h \
                object.h \
                objstrm.h \
+               platform.h \
                process.h \
                regex.h \
                sckaddr.h \
@@ -176,6 +179,7 @@ ALL_HEADERS = \
 BASE_OBJS = \
                init.o \
                appcmn.o \
+               clntdata.o \
                cmdline.o \
                config.o \
                datetime.o \

diff --git a/src/gtk/files.lst b/src/gtk/files.lst
index 7e4b464936fdb756955d717656c064d7a1d1304a..43b7446982441f2722bfbe64c5623937baa11f07 100644 (file)
--- a/src/gtk/files.lst
+++ b/src/gtk/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 18:55, 2001/11/17
+# This file was automatically generated by tmake at 16:36, 2001/11/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/accel.cpp \

diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst
index 7e4b464936fdb756955d717656c064d7a1d1304a..43b7446982441f2722bfbe64c5623937baa11f07 100644 (file)
--- a/src/gtk1/files.lst
+++ b/src/gtk1/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 18:55, 2001/11/17
+# This file was automatically generated by tmake at 16:36, 2001/11/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/accel.cpp \

diff --git a/src/mac/carbon/files.lst b/src/mac/carbon/files.lst
index b57595d1725b8d5b6371b736f6cd530c436bde84..90b18fe90a3f2661b8cb462b9046774276fb43a3 100644 (file)
--- a/src/mac/carbon/files.lst
+++ b/src/mac/carbon/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 08:59, 2001/11/18
+# This file was automatically generated by tmake at 16:36, 2001/11/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MAC.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \

diff --git a/src/mac/files.lst b/src/mac/files.lst
index b57595d1725b8d5b6371b736f6cd530c436bde84..90b18fe90a3f2661b8cb462b9046774276fb43a3 100644 (file)
--- a/src/mac/files.lst
+++ b/src/mac/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 08:59, 2001/11/18
+# This file was automatically generated by tmake at 16:36, 2001/11/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MAC.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \

diff --git a/src/mgl/files.lst b/src/mgl/files.lst
index 43b17e49bf482cad75a6cb54dd51f9dd67b88674..d8553477d070ca1192a78fdeff162040de20d0d6 100644 (file)
--- a/src/mgl/files.lst
+++ b/src/mgl/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 18:55, 2001/11/17
+# This file was automatically generated by tmake at 16:36, 2001/11/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/accel.cpp \

diff --git a/src/motif/files.lst b/src/motif/files.lst
index 809f366ce66a7a7e4d625f77a229ae1831394849..35f35a684c1cd7b9b2ebbc2b6747959fe3d57732 100644 (file)
--- a/src/motif/files.lst
+++ b/src/motif/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 18:55, 2001/11/17
+# This file was automatically generated by tmake at 16:36, 2001/11/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \

diff --git a/src/msw/files.lst b/src/msw/files.lst
index fee98d4b620a8bb8e6d2edf5cd62a26b9cd0df02..f4cb9ad31b513b42a84f2732ffa5454596b91577 100644 (file)
--- a/src/msw/files.lst
+++ b/src/msw/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 18:55, 2001/11/17
+# This file was automatically generated by tmake at 16:36, 2001/11/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 353f570ac23e49f72a52acb81750643e56538553..d21dfab1f79c9eba137da8c139c29db5ecab9b20 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 18:55, 2001/11/17
+# This file was automatically generated by tmake at 16:36, 2001/11/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index a703ac6c7e8c118cd272624781d17cc4667f3bc9..c57a10877af839b8668976e28de7b0e20b843177 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 18:55, 2001/11/17
+# This file was automatically generated by tmake at 16:36, 2001/11/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index 548cd495dd4d0afa04e5178686d2a694618dd9b0..0a7dd00d0a799103e47fc6009e989746ea34afcb 100644 (file)
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 18:55, 2001/11/17
+# This file was automatically generated by tmake at 16:36, 2001/11/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 6ba93376d946fc04bd4b5411e99756e37b3e999e..5fe109c698a72bd909b6dc521134895c2f0cf5e2 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 18:55, 2001/11/17
+# This file was automatically generated by tmake at 16:36, 2001/11/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index fe2e63b4e8972b82970ca0bb83d4b749ab6aeefe..cbef35cd65120760633b4be7e55cdfd8018a9974 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 18:55, 2001/11/17
+# This file was automatically generated by tmake at 16:36, 2001/11/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 9649065ef2af597a561a42e372d199d09e80d372..54fea319ff9b3995fe32fda5b7f1eb354ae2d7f5 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 18:55, 2001/11/17
+# This file was automatically generated by tmake at 16:36, 2001/11/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index e57e1465f9518ff2f4d114461f425e6a46947326..a8671665e6bd8b77f79d71d849c94de467ba3b47 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,6 +1,6 @@
 #!/binb/wmake.exe
 
-# This file was automatically generated by tmake at 18:55, 2001/11/17
+# This file was automatically generated by tmake at 16:36, 2001/11/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #

diff --git a/src/rpmfiles.lst b/src/rpmfiles.lst
index f8e2027addb325786bad4fd168f2b87e0f9ce675..b13f59fd911e8570a4dc71b33882f592169a0064 100644 (file)
--- a/src/rpmfiles.lst
+++ b/src/rpmfiles.lst
@@ -2,6 +2,7 @@
 /usr/include/wx/arrimpl.cpp
 /usr/include/wx/buffer.h
 /usr/include/wx/chkconf.h
+/usr/include/wx/clntdata.h
 /usr/include/wx/cmdline.h
 /usr/include/wx/confbase.h
 /usr/include/wx/config.h
@@ -47,6 +48,7 @@
 /usr/include/wx/mstream.h
 /usr/include/wx/object.h
 /usr/include/wx/objstrm.h
+/usr/include/wx/platform.h
 /usr/include/wx/process.h
 /usr/include/wx/regex.h
 /usr/include/wx/sckaddr.h

diff --git a/src/univ/files.lst b/src/univ/files.lst
index e26b9846095b62dc887a0be52009210ccc163e80..c2f6dd09f740b54dc3157185b2c31b226667e239 100644 (file)
--- a/src/univ/files.lst
+++ b/src/univ/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 18:55, 2001/11/17
+# This file was automatically generated by tmake at 16:36, 2001/11/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNIV.T!
 UNIVOBJS = \
                bmpbuttn.o \

diff --git a/src/wxBase.dsp b/src/wxBase.dsp
index eb7431b27d4d59fe45969182be672c995980d447..2f3ff02cb69fce497fcaaa1cf2da9bb3f16ee78e 100644 (file)
--- a/src/wxBase.dsp
+++ b/src/wxBase.dsp
@@ -253,6 +253,10 @@ SOURCE=.\common\appcmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\clntdata.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\cmdline.cpp
 # End Source File
 # Begin Source File
@@ -661,6 +665,10 @@ SOURCE=..\include\wx\chkconf.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\clntdata.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\cmdline.h
 # End Source File
 # Begin Source File
@@ -837,6 +845,10 @@ SOURCE=..\include\wx\objstrm.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\platform.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\process.h
 # End Source File
 # Begin Source File

diff --git a/wxBase.spec b/wxBase.spec
index 1f7219c174a6dea71d7ae252083621f0a99457d2..938201a416f445a555e0f80cd5131eecf20ebf2f 100644 (file)
--- a/wxBase.spec
+++ b/wxBase.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver 2.3.1
+%define ver 2.3.2
 %define ver2 2.3
 %define rel 1
 
@@ -43,6 +43,7 @@ else
   export MAKE="make"
 fi
 $MAKE
+(cd locale; make allmo)
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -57,18 +58,34 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 /sbin/ldconfig
 
+%post devel
+# Install wx-config if there isn't any
+if test ! -f %{_bindir}/wx-config ; then
+    ln -sf wxbase-%{ver2}-config %{_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}/wxbase-%{ver2}-config | 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 (644, root, root, 755)
-%doc COPYING.LIB LICENCE.txt README.txt SYMBOLS.txt
-%attr(755, -, -) %{pref}/lib/libwx_base*
+%defattr (-,root,root)
+%doc COPYING.LIB *.txt
+%{_libdir}/libwx_base*so.*
+%{_datadir}/locale/*/*/*.mo
 
-%files devel -f src/rpmfiles.lst
-%dir %{pref}/lib/wx
-%dir %{pref}/lib/wx/include
-%dir %{pref}/lib/wx/include/wx
-%dir %{pref}/lib/wx/include/wx/base
-%{pref}/lib/wx/include/wx/base/setup.h
-%defattr (644, root, root, 755)
-%attr(755, -, -) %{pref}/bin/wxbase-%{ver2}-config
-%attr(755, -, -) %{pref}/bin/wx-config
+%files devel
+%defattr (-,root,root)
+%dir %{_includedir}/wx
+%{_includedir}/wx/*
+%{_libdir}/libwx_base*.so
+%dir %{_libdir}/wx
+%{_libdir}/wx/*
+%{_bindir}/wxbase-%{ver2}-config