rpms/plplot/devel plplot-5.7.4-svn.patch,1.1,1.2

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25358

Modified Files:
	plplot-5.7.4-svn.patch 
Log Message:
Keep version at 5.7.4


plplot-5.7.4-svn.patch:

Index: plplot-5.7.4-svn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot-5.7.4-svn.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plplot-5.7.4-svn.patch	9 Nov 2007 17:00:53 -0000	1.1
+++ plplot-5.7.4-svn.patch	9 Nov 2007 17:54:43 -0000	1.2
@@ -14094,29 +14094,6 @@
    endif(
     NUMERICAL_OCTAVE_VERSION
     LESS
-diff -ru --unidirectional-new-file --exclude=.svn plplot-5.7.4/cmake/modules/plplot_version.cmake plplot/cmake/modules/plplot_version.cmake
---- plplot-5.7.4/cmake/modules/plplot_version.cmake	2007-08-13 18:37:10.000000000 -0600
-+++ plplot/cmake/modules/plplot_version.cmake	2007-11-05 10:06:55.000000000 -0700
-@@ -1,15 +1,15 @@
- # For now, must set this by hand before each release.  This value affects
- # at least the documentation build and perhaps other parts of the release.
--set(RELEASE_DATE "2007-08-13")
-+set(RELEASE_DATE "2007-10-21")
- 
- # Version data that need review and possible modification for each release.
- 
--set(VERSION 5.7.4)
-+set(VERSION 5.8.0-RC1)
- 
- # CPack version numbers for release tarball name.
- set(CPACK_PACKAGE_VERSION_MAJOR 5)
--set(CPACK_PACKAGE_VERSION_MINOR 7)
--set(CPACK_PACKAGE_VERSION_PATCH 4)
-+set(CPACK_PACKAGE_VERSION_MINOR 8)
-+set(CPACK_PACKAGE_VERSION_PATCH 0)
- 
- # PLplot library version information.
- 
 diff -ru --unidirectional-new-file --exclude=.svn plplot-5.7.4/cmake/modules/python.cmake plplot/cmake/modules/python.cmake
 --- plplot-5.7.4/cmake/modules/python.cmake	2007-08-13 18:37:10.000000000 -0600
 +++ plplot/cmake/modules/python.cmake	2007-11-09 09:38:15.000000000 -0700
@@ -14326,30 +14303,6 @@
  )
  #message("CPACK_SOURCE_IGNORE_FILES = ${CPACK_SOURCE_IGNORE_FILES}")
  include(CPack)
-Only in plplot-5.7.4: config.h.in
-Only in plplot-5.7.4: configure
-diff -ru --unidirectional-new-file --exclude=.svn plplot-5.7.4/configure.ac plplot/configure.ac
---- plplot-5.7.4/configure.ac	2007-08-13 18:37:15.000000000 -0600
-+++ plplot/configure.ac	2007-11-05 10:06:58.000000000 -0700
-@@ -41,15 +41,15 @@
- dnl   bootstrap.sh script.  By the way, the line below can be changed using
- dnl   options --version and --date-version of that script. ]
- 
--AC_INIT(plplot, 5.7.4, plplot-devel at lists.sourceforge.net)
-+AC_INIT(plplot, 5.8.0-RC1, plplot-devel at lists.sourceforge.net)
- AC_PREREQ(2.50)
--AC_REVISION($Revision$)
-+AC_REVISION($Revision$)
- 
- dnl Date of release.  This can be set by hand, but the prefered method
- dnl is by specifying one of the option --version of --date-version to
- dnl bootstrap.sh
- 
--RELEASE_DATE=2007-08-13
-+RELEASE_DATE=2007-10-21
- AC_SUBST(RELEASE_DATE)
- 
- dnl Check if we are in the right directory (this used to be done by
 Only in plplot-5.7.4/data: Makefile.in
 diff -ru --unidirectional-new-file --exclude=.svn plplot-5.7.4/debian/changelog plplot/debian/changelog
 --- plplot-5.7.4/debian/changelog	1969-12-31 17:00:00.000000000 -0700
@@ -34369,10 +34322,8 @@
 @@ -0,0 +1,437 @@
 +/* $Id$
 +   $Log$
-+   Revision 1.1  2007/11/09 17:00:53  orion
-+   * Fri Nov  9 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.4-5
-+   - Update to latest svn
-+   - Rebuild for new octave api
++   Revision 1.2  2007/11/09 17:54:43  orion
++   Keep version at 5.7.4
 +
 +   Revision 1.3  2000/12/18 21:01:50  airwin
 +   Change to new style plplot/*.h header file locations.
@@ -38457,10 +38408,8 @@
 @@ -0,0 +1,845 @@
 +/* $Id$
 +   $Log$
-+   Revision 1.1  2007/11/09 17:00:53  orion
-+   * Fri Nov  9 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.4-5
-+   - Update to latest svn
-+   - Rebuild for new octave api
++   Revision 1.2  2007/11/09 17:54:43  orion
++   Keep version at 5.7.4
 +
 +   Revision 1.3  2000/12/18 21:01:50  airwin
 +   Change to new style plplot/*.h header file locations.
@@ -39543,10 +39492,8 @@
 +/* -*-C-*-
 +/* $Id$
 + * $Log$
-+ * Revision 1.1  2007/11/09 17:00:53  orion
-+ * * Fri Nov  9 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.4-5
-+ * - Update to latest svn
-+ * - Rebuild for new octave api
++ * Revision 1.2  2007/11/09 17:54:43  orion
++ * Keep version at 5.7.4
 + *
 + * Revision 1.1  2000/05/12 18:05:32  furnish
 + * Imported latest Mac port work by Rob Managan.
@@ -40793,10 +40740,8 @@
 @@ -0,0 +1,390 @@
 +/* $Id$
 + * $Log$
-+ * Revision 1.1  2007/11/09 17:00:53  orion
-+ * * Fri Nov  9 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.4-5
-+ * - Update to latest svn
-+ * - Rebuild for new octave api
++ * Revision 1.2  2007/11/09 17:54:43  orion
++ * Keep version at 5.7.4
 + *
 + * Revision 1.3  2000/12/18 21:01:50  airwin
 + * Change to new style plplot/*.h header file locations.
@@ -41400,10 +41345,8 @@
 @@ -0,0 +1,93 @@
 +/* $Id$
 + * $Log$
-+ * Revision 1.1  2007/11/09 17:00:53  orion
-+ * * Fri Nov  9 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.4-5
-+ * - Update to latest svn
-+ * - Rebuild for new octave api
++ * Revision 1.2  2007/11/09 17:54:43  orion
++ * Keep version at 5.7.4
 + *
 + * Revision 1.1  1996/10/22 18:22:09  furnish
 + * Update the OS/2 driver with fixes supplied by Thorsten Feiweier.
@@ -43807,10 +43750,8 @@
 +/* -*-C-*- */
 +/* $Id$
 + * $Log$
-+ * Revision 1.1  2007/11/09 17:00:53  orion
-+ * * Fri Nov  9 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.4-5
-+ * - Update to latest svn
-+ * - Rebuild for new octave api
++ * Revision 1.2  2007/11/09 17:54:43  orion
++ * Keep version at 5.7.4
 + *
 + * Revision 1.2  2002/07/04 15:17:15  vincentdarley
 + * win-tk build