Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for wxBase RPM

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-11-20 23:50:32 +00:00
parent 31e39e3c51
commit 32037c4ed9
21 changed files with 79 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile.in
View File

@@ -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
@@ -565,8 +568,9 @@ ALL_DIST: distclean
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
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

6
distrib/msw/tmake/filelist.txt
View File

@@ -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

6
src/files.lst
View File

@@ -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 \

2
src/gtk/files.lst
View File

@@ -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 \

2
src/gtk1/files.lst
View File

@@ -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 \

2
src/mac/carbon/files.lst
View File

@@ -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 \

2
src/mac/files.lst
View File

@@ -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 \

2
src/mgl/files.lst
View File

@@ -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 \

2
src/motif/files.lst
View File

@@ -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 \

2
src/msw/files.lst
View File

@@ -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 \

2
src/msw/makefile.b32
View File

@@ -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!
#

2
src/msw/makefile.bcc
View File

@@ -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!
#

2
src/msw/makefile.dos
View File

@@ -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!
#

2
src/msw/makefile.g95
View File

@@ -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!
#

2
src/msw/makefile.sc
View File

@@ -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

2
src/msw/makefile.vc
View File

@@ -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

2
src/msw/makefile.wat
View File

@@ -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!
#

2
src/rpmfiles.lst
View File

@@ -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

2
src/univ/files.lst
View File

@@ -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 \

12
src/wxBase.dsp
View File

@@ -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

43
wxBase.spec
View File

@@ -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