From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Mon, 2 Nov 2020 16:32:25 +0000 (-0500)
Subject: Bump configure version to 2.3.3op1, update makesrcdist script.
X-Git-Tag: v2.3.3op1~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=428b1d28c0f275c62a7791c2a12021b1d68674ff;p=thirdparty%2Fcups.git

Bump configure version to 2.3.3op1, update makesrcdist script.
---

diff --git a/configure b/configure
index a8eef68cae..73ad68ec38 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for CUPS 2.3.3.
+# Generated by GNU Autoconf 2.69 for CUPS 2.3.3op1.
 #
 # Report bugs to <https://github.com/apple/cups/issues>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='CUPS'
 PACKAGE_TARNAME='cups'
-PACKAGE_VERSION='2.3.3'
-PACKAGE_STRING='CUPS 2.3.3'
+PACKAGE_VERSION='2.3.3op1'
+PACKAGE_STRING='CUPS 2.3.3op1'
 PACKAGE_BUGREPORT='https://github.com/apple/cups/issues'
 PACKAGE_URL='https://www.cups.org/'
 
@@ -1467,7 +1467,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures CUPS 2.3.3 to adapt to many kinds of systems.
+\`configure' configures CUPS 2.3.3op1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1532,7 +1532,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of CUPS 2.3.3:";;
+     short | recursive ) echo "Configuration of CUPS 2.3.3op1:";;
    esac
   cat <<\_ACEOF
 
@@ -1713,7 +1713,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-CUPS configure 2.3.3
+CUPS configure 2.3.3op1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2177,7 +2177,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by CUPS $as_me 2.3.3, which was
+It was created by CUPS $as_me 2.3.3op1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2694,7 +2694,7 @@ done
 ac_config_headers="$ac_config_headers config.h"
 
 
-CUPS_VERSION="2.3.3"
+CUPS_VERSION="2.3.3op1"
 CUPS_REVISION=""
 CUPS_BUILD="cups-$CUPS_VERSION"
 
@@ -10385,7 +10385,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by CUPS $as_me 2.3.3, which was
+This file was extended by CUPS $as_me 2.3.3op1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10448,7 +10448,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-CUPS config.status 2.3.3
+CUPS config.status 2.3.3op1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index dbf3bda385..1f75f72f6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ dnl We need at least autoconf 2.60...
 AC_PREREQ(2.60)
 
 dnl Package name and version...
-AC_INIT([CUPS], [2.3.3], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/])
+AC_INIT([CUPS], [2.3.3op1], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/])
 
 sinclude(config-scripts/cups-opsys.m4)
 sinclude(config-scripts/cups-common.m4)
diff --git a/scripts/makesrcdist b/scripts/makesrcdist
index 33b2f37cc6..4e803175e6 100755
--- a/scripts/makesrcdist
+++ b/scripts/makesrcdist
@@ -34,11 +34,11 @@ else
 	rev="1"
 	version=$1
 	fileversion=$1
-	fileurl="https://github.com/apple/cups/releases/download/v$fileversion/cups-${fileversion}-source.tar.gz"
+	fileurl="https://github.com/openprinting/cups/releases/download/v$fileversion/cups-${fileversion}-source.tar.gz"
 	SIGNFILES=yes
 
 	echo Validating sources...
-	cupsversionpatch=`echo $version | awk -F. '{if (NF == 3) { print $3 } else { print "0" } }'`
+	cupsversionpatch=`echo $version | awk -F. '{if (NF == 3) { print int $3 } else { print "0" } }'`
 	cupsversion=`printf "2.03%02d" $cupsversionpatch`
 
         temp=`grep AC_INIT configure.ac | awk '{print $2}' | sed -e '1,$s/^\[//' -e '1,$s/\],$//'`
@@ -71,9 +71,9 @@ else
 		exit 1
 	fi
 
-	temp=`head -6 CHANGES.md | grep "Changes in" | awk '{print $4}'`
+	temp=`head -6 CHANGES-OPENPRINTING.md | grep "Changes in" | awk '{print $4}'`
 	if test "$temp" != "v$version"; then
-		echo "Still need to add Changes in v$version in CHANGES.md (saw $temp)"
+		echo "Still need to add Changes in v$version in CHANGES-OPENPRINTING.md (saw $temp)"
 		exit 1
 	fi