Updates for 1.1.0b2...

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1615 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

4 files changed, 38 insertions, 35 deletions

diff --git a/fltk.list b/fltk.list
index 33e157713..0402d234b 100644
--- a/fltk.list
+++ b/fltk.list
@@ -1,5 +1,5 @@
 #
-# "$Id: fltk.list,v 1.1.2.6.2.2 2001/08/11 14:49:51 easysw Exp $"
+# "$Id: fltk.list,v 1.1.2.6.2.3 2001/09/29 21:17:17 easysw Exp $"
 #
 # EPM product list file for the Fast Light Tool Kit (FLTK).
 #
@@ -30,11 +30,12 @@
 %vendor LGPL
 %license COPYING
 %readme README
-%version 1.1.0
+%version 1.1.0b2
 %description FLTK is a cross-platform GUI toolkit for C++.
 
 # FLUID
 f 0555 root sys /usr/bin/fluid fluid/fluid
+f 0555 root sys /usr/bin/fltk-config fltk-config
 
 # Man pages
 %system irix
@@ -50,28 +51,28 @@ f 0444 root sys /usr/man/man3/fltk.3 documentation/fltk.man
 f 0444 root sys /usr/lib32/libfltk.a lib/libfltk.a
 f 0555 root sys /usr/lib32/libfltk.so.1.1 src/libfltk.so.1.1
 l 0000 root sys /usr/lib32/libfltk.so libfltk.so.1.1
-f 0444 root sys /usr/lib32/libfltkgl.a lib/libfltkgl.a
-f 0555 root sys /usr/lib32/libfltkgl.so.1.1 src/libfltkgl.so.1.1
-l 0000 root sys /usr/lib32/libfltkgl.so libfltkgl.so.1.1
+f 0444 root sys /usr/lib32/libfltk_gl.a lib/libfltk_gl.a
+f 0555 root sys /usr/lib32/libfltk_gl.so.1.1 src/libfltk_gl.so.1.1
+l 0000 root sys /usr/lib32/libfltk_gl.so libfltk_gl.so.1.1
 %system hpux
 f 0444 root sys /usr/lib32/libfltk.a lib/libfltk.a
 f 0555 root sys /usr/lib32/libfltk.sl.1.1 src/libfltk.sl.1.1
 l 0000 root sys /usr/lib32/libfltk.sl libfltk.sl.1.1
-f 0444 root sys /usr/lib32/libfltkgl.a lib/libfltkgl.a
-f 0555 root sys /usr/lib32/libfltkgl.sl.1.1 src/libfltkgl.sl.1.1
-l 0000 root sys /usr/lib32/libfltkgl.sl libfltkgl.sl.1.1
+f 0444 root sys /usr/lib32/libfltk_gl.a lib/libfltk_gl.a
+f 0555 root sys /usr/lib32/libfltk_gl.sl.1.1 src/libfltk_gl.sl.1.1
+l 0000 root sys /usr/lib32/libfltk_gl.sl libfltk_gl.sl.1.1
 %system aix
 f 0444 root sys /usr/lib32/libfltk.a lib/libfltk.a
 f 0555 root sys /usr/lib32/libfltk_s.a src/libfltk_s.a
-f 0444 root sys /usr/lib32/libfltkgl.a lib/libfltkgl.a
-f 0555 root sys /usr/lib32/libfltkgl_s.a src/libfltkgl_s.a
+f 0444 root sys /usr/lib32/libfltk_gl.a lib/libfltk_gl.a
+f 0555 root sys /usr/lib32/libfltk_gl_s.a src/libfltk_gl_s.a
 %system !irix-6.5 !hpux !aix
 f 0444 root sys /usr/lib/libfltk.a lib/libfltk.a
 f 0555 root sys /usr/lib/libfltk.so.1.1 src/libfltk.so.1.1
 l 0000 root sys /usr/lib/libfltk.so libfltk.so.1.1
-f 0444 root sys /usr/lib/libfltkgl.a lib/libfltkgl.a
-f 0555 root sys /usr/lib/libfltkgl.so.1.1 src/libfltkgl.so.1.1
-l 0000 root sys /usr/lib/libfltkgl.so libfltkgl.so.1.1
+f 0444 root sys /usr/lib/libfltk_gl.a lib/libfltk_gl.a
+f 0555 root sys /usr/lib/libfltk_gl.so.1.1 src/libfltk_gl.so.1.1
+l 0000 root sys /usr/lib/libfltk_gl.so libfltk_gl.so.1.1
 %system all
 
 # Header files
@@ -96,9 +97,9 @@ l 0000 root sys /usr/include/FL/Fl_Color_Chooser.h Fl_Color_Chooser.H
 l 0000 root sys /usr/include/FL/Fl_Counter.h Fl_Counter.H
 l 0000 root sys /usr/include/FL/Fl_Dial.h Fl_Dial.H
 l 0000 root sys /usr/include/FL/Fl_Double_Window.h Fl_Double_Window.H
-l 0000 root sys /usr/include/FL/Fl_FileBrowser.h Fl_FileBrowser.H
-l 0000 root sys /usr/include/FL/Fl_FileChooser.h Fl_FileChooser.H
-l 0000 root sys /usr/include/FL/Fl_FileIcon.h Fl_FileIcon.H
+l 0000 root sys /usr/include/FL/Fl_File_Browser.h Fl_File_Browser.H
+l 0000 root sys /usr/include/FL/Fl_File_Chooser.h Fl_File_Chooser.H
+l 0000 root sys /usr/include/FL/Fl_File_Icon.h Fl_File_Icon.H
 l 0000 root sys /usr/include/FL/Fl_Fill_Dial.h Fl_Fill_Dial.H
 l 0000 root sys /usr/include/FL/Fl_Fill_Slider.h Fl_Fill_Slider.H
 l 0000 root sys /usr/include/FL/Fl_Float_Input.h Fl_Float_Input.H
@@ -107,6 +108,8 @@ l 0000 root sys /usr/include/FL/Fl_FormsPixmap.h Fl_FormsPixmap.H
 l 0000 root sys /usr/include/FL/Fl_Free.h Fl_Free.H
 l 0000 root sys /usr/include/FL/Fl_Gl_Window.h Fl_Gl_Window.H
 l 0000 root sys /usr/include/FL/Fl_Group.h Fl_Group.H
+l 0000 root sys /usr/include/FL/Fl_Help_Dialog.h Fl_Help_Dialog.H
+l 0000 root sys /usr/include/FL/Fl_Help_View.h Fl_Help_View.H
 l 0000 root sys /usr/include/FL/Fl_Hold_Browser.h Fl_Hold_Browser.H
 l 0000 root sys /usr/include/FL/Fl_Hor_Fill_Slider.h Fl_Hor_Fill_Slider.H
 l 0000 root sys /usr/include/FL/Fl_Hor_Nice_Slider.h Fl_Hor_Nice_Slider.H
@@ -185,5 +188,5 @@ f 0444 root sys /usr/share/doc/fltk/COPYING COPYING
 f 0444 root sys /usr/share/doc/fltk/CHANGES CHANGES
 
 #
-# End of "$Id: fltk.list,v 1.1.2.6.2.2 2001/08/11 14:49:51 easysw Exp $".
+# End of "$Id: fltk.list,v 1.1.2.6.2.3 2001/09/29 21:17:17 easysw Exp $".
 #
diff --git a/fltk.spec b/fltk.spec
index 9f7705e68..51fb0cf54 100644
--- a/fltk.spec
+++ b/fltk.spec
@@ -1,5 +1,5 @@
 #
-# "$Id: fltk.spec,v 1.1.2.9.2.1 2001/08/02 18:08:36 easysw Exp $"
+# "$Id: fltk.spec,v 1.1.2.9.2.2 2001/09/29 21:17:17 easysw Exp $"
 #
 # RPM spec file for FLTK.
 #
@@ -23,7 +23,7 @@
 # Please report all bugs and problems to "fltk-bugs@fltk.org".
 #
 
-%define version 1.1.0
+%define version 1.1.0b2
 %define release 0
 %define prefix /usr
 
@@ -81,14 +81,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root)
-%{prefix}/bin/fluid
-%{prefix}/include/FL
-%{prefix}/include/Fl
+%{prefix}/bin/*
+%{prefix}/include/FL/*
+%{prefix}/include/Fl/*
 %{prefix}/lib/libfltk*.so
 %{prefix}/lib/libfltk*.a
 %{prefix}/man/*
 %{prefix}/share/doc/fltk/*
 
 #
-# End of "$Id: fltk.spec,v 1.1.2.9.2.1 2001/08/02 18:08:36 easysw Exp $".
+# End of "$Id: fltk.spec,v 1.1.2.9.2.2 2001/09/29 21:17:17 easysw Exp $".
 #
diff --git a/visualc/fltk.lib.dsp b/visualc/fltk.lib.dsp
index fa1f8a7e3..b1d93fda9 100644
--- a/visualc/fltk.lib.dsp
+++ b/visualc/fltk.lib.dsp
@@ -259,19 +259,19 @@ SOURCE=..\src\fl_file_chooser.cxx
 # End Source File

 # Begin Source File

 

-SOURCE=..\src\Fl_FileBrowser.cxx

+SOURCE=..\src\Fl_File_Browser.cxx

 # End Source File

 # Begin Source File

 

-SOURCE=..\src\Fl_FileChooser.cxx

+SOURCE=..\src\Fl_File_Chooser.cxx

 # End Source File

 # Begin Source File

 

-SOURCE=..\src\Fl_FileChooser2.cxx

+SOURCE=..\src\Fl_File_Chooser2.cxx

 # End Source File

 # Begin Source File

 

-SOURCE=..\src\Fl_FileIcon.cxx

+SOURCE=..\src\Fl_File_Icon.cxx

 # End Source File

 # Begin Source File

 

@@ -295,11 +295,11 @@ SOURCE=..\src\Fl_Group.cxx
 # End Source File

 # Begin Source File

 

-SOURCE=..\src\Fl_HelpDialog.cxx

+SOURCE=..\src\Fl_Help_Dialog.cxx

 # End Source File

 # Begin Source File

 

-SOURCE=..\src\Fl_HelpView.cxx

+SOURCE=..\src\Fl_Help_View.cxx

 # End Source File

 # Begin Source File

 

diff --git a/visualc/fltkdll.dsp b/visualc/fltkdll.dsp
index 1c878dd2a..70db67840 100644
--- a/visualc/fltkdll.dsp
+++ b/visualc/fltkdll.dsp
@@ -675,7 +675,7 @@ DEP_CPP_FL_FI=\
 # End Source File

 # Begin Source File

 

-SOURCE=..\src\Fl_FileBrowser.cxx

+SOURCE=..\src\Fl_File_Browser.cxx

 DEP_CPP_FL_FIL=\

 	"..\fl\enumerations.h"\

 	"..\fl\filename.h"\

@@ -696,7 +696,7 @@ DEP_CPP_FL_FIL=\
 # End Source File

 # Begin Source File

 

-SOURCE=..\src\Fl_FileChooser.cxx

+SOURCE=..\src\Fl_File_Chooser.cxx

 DEP_CPP_FL_FILE=\

 	"..\fl\enumerations.h"\

 	"..\fl\fl.h"\

@@ -726,7 +726,7 @@ DEP_CPP_FL_FILE=\
 # End Source File

 # Begin Source File

 

-SOURCE=..\src\Fl_FileChooser2.cxx

+SOURCE=..\src\Fl_File_Chooser2.cxx

 DEP_CPP_FL_FILEC=\

 	"..\fl\enumerations.h"\

 	"..\fl\filename.h"\

@@ -757,7 +757,7 @@ DEP_CPP_FL_FILEC=\
 # End Source File

 # Begin Source File

 

-SOURCE=..\src\Fl_FileIcon.cxx

+SOURCE=..\src\Fl_File_Icon.cxx

 DEP_CPP_FL_FILEI=\

 	"..\fl\enumerations.h"\

 	"..\fl\filename.h"\

@@ -848,7 +848,7 @@ DEP_CPP_FL_GRO=\
 # End Source File

 # Begin Source File

 

-SOURCE=..\src\Fl_HelpDialog.cxx

+SOURCE=..\src\Fl_Help_Dialog.cxx

 DEP_CPP_FL_HE=\

 	"..\fl\enumerations.h"\

 	"..\fl\fl.h"\

@@ -868,7 +868,7 @@ DEP_CPP_FL_HE=\
 # End Source File

 # Begin Source File

 

-SOURCE=..\src\Fl_HelpView.cxx

+SOURCE=..\src\Fl_Help_View.cxx

 DEP_CPP_FL_HEL=\

 	"..\fl\enumerations.h"\

 	"..\fl\fl.h"\