Upgrade jq to 1.7 (Debian/Ubuntu) untested. #1445

perfsonar · Jun 28, 2024 · 418ddb5 · 418ddb5
1 parent 5a35142
commit 418ddb5
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 118 deletions.
diff --git a/jq/jq-1.6.0.tar.gz b/jq/jq-1.6.0.tar.gz
diff --git a/jq/jq-1.6.tar.gz b/jq/jq-1.6.tar.gz
diff --git a/jq/jq-1.7.1.tar.gz b/jq/jq-1.7.1.tar.gz
diff --git a/jq/unibuild-packaging/deb/changelog b/jq/unibuild-packaging/deb/changelog
@@ -1,3 +1,9 @@
+jq (1.7.1-1~bpo8+3) perfsonar-5.2-staging; urgency=medium
+
+  * New upstream version
+
+ -- Lætitia Delvaux <adelvaux@man.poznan.pl>  Tue, 23 Apr 2024 01:02:58 +0200 
+
 jq (1.6.0-1~bpo8+3) perfsonar-5.1-staging; urgency=medium
 
   * Building on Ubuntu 20.

diff --git a/jq/unibuild-packaging/deb/compat b/jq/unibuild-packaging/deb/compat
@@ -1 +1 @@
-9
+10
diff --git a/jq/unibuild-packaging/deb/patches/jv_is_integer_large.patch b/jq/unibuild-packaging/deb/patches/jv_is_integer_large.patch
diff --git a/jq/unibuild-packaging/deb/patches/series b/jq/unibuild-packaging/deb/patches/series
@@ -2,4 +2,3 @@ enable-manpages.patch
 patch-version-into-build.patch
 dont-distribute-duplicate-docs.patch
 disable-static-libtool.patch
-jv_is_integer_large.patch
diff --git a/jq/unibuild-packaging/jq-1.6-00-jv_is_integer_large.patch b/jq/unibuild-packaging/jq-1.6-00-jv_is_integer_large.patch
diff --git a/jq/unibuild-packaging/rpm/jq.spec b/jq/unibuild-packaging/rpm/jq.spec
@@ -5,20 +5,8 @@
 # https://github.com/stedolan/jq/blob/master/jq.spec
 #
 
-
-# This is the version of jq we build, plus our patches
-# TODO: Set Release: back to 1 when a new version is released.
-%define actual_version 1.6
-
-# The jq developers don't do bugfix releases, so our is numbered with
-# a bugfix release number to force our patched version to be
-# considered newer and installed.  This is because of the integer
-# patch, which has been accepted into jq but not yet released.
-%define release_version %{actual_version}.10
-
-%define short	jq
-Name:		%{short}
-Version:	%{release_version}
+Name:		jq
+Version:	1.7.1
 # There was no real difference between -2 and -3, but this bump will
 # force some older systems to upgrade properly.
 Release:	3%{?dist}
@@ -31,12 +19,9 @@ Provides:	%{name} = %{version}-%{release}
 Prefix:		%{_prefix}
 
 Vendor:		Stephen Dolan <mu@netsoc.tcd.ie>
-URL:		https://stedolan.github.io/jq
-
-Source:		%{short}-%{actual_version}.tar.gz
-
-Patch0:		%{short}-%{actual_version}-00-jv_is_integer_large.patch
+URL:		https://jqlang.github.io
 
+Source:		%{name}-%{version}.tar.gz
 
 
 Requires:	oniguruma
@@ -55,10 +40,6 @@ jq is like sed for JSON data - you can use it to slice and filter and
 map and transform structured data with the same ease that sed, awk,
 grep and friends let you play with text.
 
-NOTE:  This version contains a bugfix patch that the jq maintainers
-       have not yet released.  Its version number was bumped to %{release_version}
-       to keep it ahead of EPEL and the jq developers (%{actual_version}).
-
 %package devel
 Summary:	Development files for %{name}
 Requires:	%{name} = %{version}-%{release}
@@ -72,17 +53,14 @@ Development files for %{name}
 
 
 %prep
-%setup -q -n %{name}-%{actual_version}
+%setup -q -n %{name}-%{version}
 
 # Replace the version generator with one that doesn't depend on git
 cat > scripts/version <<EOF
 #!/bin/sh
-echo "%{version}+pscheduler-patches"
+echo "%{version}"
 EOF
 
-%patch0 -p1
-
-
 
 %build
 autoreconf -fi

diff --git a/unibuild-order b/unibuild-order
@@ -52,7 +52,7 @@ postgresql-load
 # jq and friends
 ifelse(DISTRO/MAJOR,ol/8,oniguruma)
 ifelse(DISTRO/eval(MAJOR < 20),Ubuntu/1,oniguruma)		# Ubuntu 20 and up are good.
-jq							# Ours has patches.
+ifelse(DISTRO/eval(MAJOR >= 24),Ubuntu/1,,jq)
 
 
 # Python Modules