Index: cgicc/ChangeLog
diff -c cgicc/ChangeLog:1.50 cgicc/ChangeLog:1.52
*** cgicc/ChangeLog:1.50	Mon Apr 10 18:39:24 2000
--- cgicc/ChangeLog	Sun Jul  2 19:54:34 2000
***************
*** 1,3 ****
--- 1,13 ----
+ 2000-07-02  Stephen F. Booth  <sbooth@gnu.org>
+ 
+ 	* cgicc/HTMLElements.h: Fix operator< for HTMLElement
+ 	(reported by as@globalplastics.com)
+ 
+ 2000-04-15  Stephen F. Booth  <sbooth@gnu.org>
+ 
+ 	* cgicc/CgiEnvironment.cpp: Fix typo, fctrl.h -> fcntl.h
+ 	(reported by cdanzl@cosy.sbg.ac.at)
+ 
  2000-04-10  Stephen F. Booth  <sbooth@gnu.org>
  
  	* Makefile.am: Added new dist-bzip2 target
Index: cgicc/NEWS
diff -c cgicc/NEWS:1.16 cgicc/NEWS:1.17
*** cgicc/NEWS:1.16	Fri Apr  7 21:49:28 2000
--- cgicc/NEWS	Sun Jul  2 20:22:01 2000
***************
*** 5,10 ****
--- 5,18 ----
          <bug-cgicc@gnu.org>
  ======================================================================
  
+         Major changes between versions 3.1.2 and 3.1.3
+         ----------------------------------------------
+ 
+ * Incorrect #includes fixed
+ 
+ * Other minor esthetic fixes
+ 
+ 
          Major changes between versions 3.1.1 and 3.1.2
          ----------------------------------------------
  
Index: cgicc/configure.in
diff -c cgicc/configure.in:1.23 cgicc/configure.in:1.24
*** cgicc/configure.in:1.23	Fri Apr  7 21:43:54 2000
--- cgicc/configure.in	Sun Jul  2 20:22:01 2000
***************
*** 1,11 ****
  dnl -*-m4-*-
! dnl $Id: configure.in,v 1.23 2000/04/08 04:43:54 sbooth Exp $
  
  dnl Process this file with autoconf to produce a configure script.
! AC_REVISION($Revision: 1.23 $)
  AC_INIT(cgicc/Cgicc.cpp)
  AC_CONFIG_AUX_DIR(support)
! AM_INIT_AUTOMAKE(cgicc, 3.1.2)
  AM_CONFIG_HEADER(cgicc/config.h)
  AM_MAINTAINER_MODE
  
--- 1,11 ----
  dnl -*-m4-*-
! dnl $Id: configure.in,v 1.24 2000/07/03 03:22:01 sbooth Exp $
  
  dnl Process this file with autoconf to produce a configure script.
! AC_REVISION($Revision: 1.24 $)
  AC_INIT(cgicc/Cgicc.cpp)
  AC_CONFIG_AUX_DIR(support)
! AM_INIT_AUTOMAKE(cgicc, 3.1.3)
  AM_CONFIG_HEADER(cgicc/config.h)
  AM_MAINTAINER_MODE
  
Index: cgicc/cgicc/CgiEnvironment.cpp
diff -c cgicc/cgicc/CgiEnvironment.cpp:1.2 cgicc/cgicc/CgiEnvironment.cpp:1.3
*** cgicc/cgicc/CgiEnvironment.cpp:1.2	Fri Apr  7 21:43:19 2000
--- cgicc/cgicc/CgiEnvironment.cpp	Sat Apr 15 00:57:00 2000
***************
*** 1,5 ****
  /*
!  *  $Id: CgiEnvironment.cpp,v 1.2 2000/04/08 04:43:19 sbooth Exp $
   *
   *  Copyright (C) 1996, 1997, 1998, 1999 Stephen F. Booth
   *
--- 1,5 ----
  /*
!  *  $Id: CgiEnvironment.cpp,v 1.3 2000/04/15 07:57:00 sbooth Exp $
   *
   *  Copyright (C) 1996, 1997, 1998, 1999 Stephen F. Booth
   *
***************
*** 29,35 ****
  
  #ifdef WIN32
  #include <io.h>
! #include <fctrl.h>
  #endif
  
  #include "cgicc/CgiEnvironment.h"
--- 29,35 ----
  
  #ifdef WIN32
  #include <io.h>
! #include <fcntl.h>
  #endif
  
  #include "cgicc/CgiEnvironment.h"
Index: cgicc/cgicc/HTMLElements.h
diff -c cgicc/cgicc/HTMLElements.h:1.5 cgicc/cgicc/HTMLElements.h:1.6
*** cgicc/cgicc/HTMLElements.h:1.5	Tue Aug 17 10:29:31 1999
--- cgicc/cgicc/HTMLElements.h	Sun Jul  2 19:54:03 2000
***************
*** 1,6 ****
  /* -*-c++-*- */
  /*
!  *  $Id: HTMLElements.h,v 1.5 1999/08/17 17:29:31 sbooth Exp $
   *
   *  Copyright (C) 1996, 1997, 1998, 1999 Stephen F. Booth
   *
--- 1,6 ----
  /* -*-c++-*- */
  /*
!  *  $Id: HTMLElements.h,v 1.6 2000/07/03 02:54:03 sbooth Exp $
   *
   *  Copyright (C) 1996, 1997, 1998, 1999 Stephen F. Booth
   *
***************
*** 83,89 ****
  #ifdef WIN32
    /** Dummy operator for MSVC++ */
    inline bool
!   operator< (const HTMLAttribute& att) 			const
    { return false; }
  #endif
  
--- 83,89 ----
  #ifdef WIN32
    /** Dummy operator for MSVC++ */
    inline bool
!   operator< (const HTMLElement& element)		const
    { return false; }
  #endif
  
Index: cgicc/cgicc/Makefile.am
diff -c cgicc/cgicc/Makefile.am:1.9 cgicc/cgicc/Makefile.am:1.10
*** cgicc/cgicc/Makefile.am:1.9	Fri Apr  7 21:46:46 2000
--- cgicc/cgicc/Makefile.am	Sun Jul  2 20:19:52 2000
***************
*** 1,4 ****
! ## $Id: Makefile.am,v 1.9 2000/04/08 04:46:46 sbooth Exp $
  
  CLEANFILES = *~
  
--- 1,4 ----
! ## $Id: Makefile.am,v 1.10 2000/07/03 03:19:52 sbooth Exp $
  
  CLEANFILES = *~
  
***************
*** 8,14 ****
  libcgicc_la_SOURCES = CgiEnvironment.cpp CgiUtils.cpp Cgicc.cpp	\
  FormEntry.cpp FormFile.cpp HTMLAttributes.cpp HTMLElements.cpp	\
  HTTPHeaders.cpp MStreamable.cpp
! libcgicc_la_LDFLAGS = -version-info 2:1:1
  
  pkginclude_HEADERS = CgiDefs.h CgiEnvironment.h CgiUtils.h Cgicc.h	\
  FormEntry.h FormFile.h HTMLAttributes.h HTMLClasses.h HTMLElements.h	\
--- 8,14 ----
  libcgicc_la_SOURCES = CgiEnvironment.cpp CgiUtils.cpp Cgicc.cpp	\
  FormEntry.cpp FormFile.cpp HTMLAttributes.cpp HTMLElements.cpp	\
  HTTPHeaders.cpp MStreamable.cpp
! libcgicc_la_LDFLAGS = -version-info 2:2:1
  
  pkginclude_HEADERS = CgiDefs.h CgiEnvironment.h CgiUtils.h Cgicc.h	\
  FormEntry.h FormFile.h HTMLAttributes.h HTMLClasses.h HTMLElements.h	\
Index: cgicc/info/version.texi
diff -c cgicc/info/version.texi:1.14 cgicc/info/version.texi:1.16
*** cgicc/info/version.texi:1.14	Fri Apr  7 21:47:15 2000
--- cgicc/info/version.texi	Mon Jul  3 07:09:22 2000
***************
*** 1,3 ****
! @set UPDATED 30 September 1999
! @set EDITION 3.1.2
! @set VERSION 3.1.2
--- 1,3 ----
! @set UPDATED 3 July 2000
! @set EDITION 3.1.3
! @set VERSION 3.1.3
Index: cgicc/support/cgicc.spec.in
diff -c cgicc/support/cgicc.spec.in:1.2 cgicc/support/cgicc.spec.in:1.3
*** cgicc/support/cgicc.spec.in:1.2	Mon Apr 10 18:27:29 2000
--- cgicc/support/cgicc.spec.in	Sun Jul  2 20:21:09 2000
***************
*** 1,5 ****
  ## -*-sh-*-
! ## $Id: cgicc.spec.in,v 1.2 2000/04/11 01:27:29 sbooth Exp $
  
  ## Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  ## This file is free software; the Free Software Foundation
--- 1,5 ----
  ## -*-sh-*-
! ## $Id: cgicc.spec.in,v 1.3 2000/07/03 03:21:09 sbooth Exp $
  
  ## Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  ## This file is free software; the Free Software Foundation
***************
*** 14,29 ****
  ## Macros defined by autoconf
  %define name @PACKAGE@
  %define version @VERSION@
  
! Summary: A C++ class library for developing CGI applications
  Name: %{name}
  Version: %{version}
! Release: 1
  Copyright: GPL
  Group: Development/Libraries
  Source: ftp://ftp.gnu.org:/gnu/software/cgicc/%{name}-%{version}.tar.gz
  URL: http://www.lmi.net/~sbooth/cgicc/
  Vendor: Stephen F. Booth
  
  %description
  GNU Cgicc is an ANSI C++ compliant class library that greatly
--- 14,38 ----
  ## Macros defined by autoconf
  %define name @PACKAGE@
  %define version @VERSION@
+ %define release @RPM_RELEASE@
+ $%define prefix /usr
  
! %define lt_release @LT_RELEASE@
! %define lt_version @LT_CURRENT@.@LT_REVISION@.@LT_AGE@
! 
  Name: %{name}
  Version: %{version}
! Release: %{release}
! 
! BuildRoot: /tmp/%{name}-root
! #Prefix: %{prefix}
! 
  Copyright: GPL
  Group: Development/Libraries
  Source: ftp://ftp.gnu.org:/gnu/software/cgicc/%{name}-%{version}.tar.gz
  URL: http://www.lmi.net/~sbooth/cgicc/
  Vendor: Stephen F. Booth
+ Summary: A C++ class library for developing CGI applications
  
  %description
  GNU Cgicc is an ANSI C++ compliant class library that greatly
***************
*** 39,67 ****
     for cookies.
   - Supports HTTP file upload. 
  
  %prep
  %setup
  
  %build
! %configure
  make
  
  %install
! make install
  
  #%post
  #/sbin/ldconfig
  
  %files
  
  ## Documenation
  #%{_prefix}/doc/%{name}-%{version}/INSTALL 
! %{_prefix}/doc/%{name}-%{version}/README 
! %{_prefix}/doc/%{name}-%{version}/AUTHORS
! %{_prefix}/doc/%{name}-%{version}/COPYING
! %{_prefix}/doc/%{name}-%{version}/NEWS
! %{_prefix}/doc/%{name}-%{version}/ChangeLog
! %{_prefix}/doc/%{name}-%{version}/THANKS
  
  ## Info files
  %{_prefix}/info/cgicc.info
--- 48,96 ----
     for cookies.
   - Supports HTTP file upload. 
  
+ %changelog
+ 
  %prep
  %setup
  
  %build
! %GNUconfigure
  make
  
  %install
! if [ "$RPM_BUILD_ROOT" != "/tmp/%{name}-root" ]; then
!     echo "RPM_BUILD_ROOT didn't match expected; won't be cleaned"
! else
!     echo "Cleaning RPM_BUILD_ROOT: $RPM_BUILD_ROOT"
!     rm -rf "$RPM_BUILD_ROOT"
! fi
! make DESTDIR="$RPM_BUILD_ROOT" install
! 
! %clean
! if [ "$RPM_BUILD_ROOT" != "/tmp/%{name}-root" ]; then
!     echo "RPM_BUILD_ROOT didn't match expected; won't be cleaned"
! else
!     echo "Cleaning RPM_BUILD_ROOT: $RPM_BUILD_ROOT"
!     rm -rf "$RPM_BUILD_ROOT"
! fi
  
  #%post
  #/sbin/ldconfig
  
+ #%postun
+ #/sbin/ldconfig
+ 
  %files
  
  ## Documenation
+ %doc README AUTHORS COPYING NEWS ChangeLog THANKS
  #%{_prefix}/doc/%{name}-%{version}/INSTALL 
! #%{_prefix}/doc/%{name}-%{version}/README 
! #%{_prefix}/doc/%{name}-%{version}/AUTHORS
! #%{_prefix}/doc/%{name}-%{version}/COPYING
! #%{_prefix}/doc/%{name}-%{version}/NEWS
! #%{_prefix}/doc/%{name}-%{version}/ChangeLog
! #%{_prefix}/doc/%{name}-%{version}/THANKS
  
  ## Info files
  %{_prefix}/info/cgicc.info
