diff --git a/jq-1.7.tar.gz b/jq-1.7.tar.gz index 9996cbe..d5c3255 100644 --- a/jq-1.7.tar.gz +++ b/jq-1.7.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f755e813b88b494a5087502812cb35bc32e1544102345900707e8d71124caffc -size 1267139 +oid sha256:402a0d6975d946e6f4e484d1a84320414a0ff8eb6cf49d2c11d144d4d344db62 +size 1905863 diff --git a/jq.changes b/jq.changes index 949e9b2..aa3b7b5 100644 --- a/jq.changes +++ b/jq.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 27 04:32:39 UTC 2023 - Andreas Stieger + +- switch to bootstrapped upstream tarball to fix version output + [boo#1215737] + ------------------------------------------------------------------- Thu Sep 7 13:42:19 UTC 2023 - Martin Hauke diff --git a/jq.spec b/jq.spec index b173063..44308f5 100644 --- a/jq.spec +++ b/jq.spec @@ -16,6 +16,7 @@ # +%define jq_sover 1 Name: jq Version: 1.7 Release: 0 @@ -23,14 +24,12 @@ Summary: A lightweight and flexible command-line JSON processor License: CC-BY-3.0 AND MIT Group: Productivity/Text/Utilities URL: https://github.com/jqlang -Source: https://github.com/jqlang/jq/archive/refs/tags/jq-%{version}/jq-%{version}.tar.gz -BuildRequires: autoconf -BuildRequires: automake +Source: https://github.com/jqlang/jq/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRequires: chrpath -BuildRequires: libtool -#BuildRequires: flex -BuildRequires: oniguruma-devel -Requires: libjq1 = %{version} +BuildRequires: pkgconfig +BuildRequires: pkgconfig(oniguruma) +# https://github.com/stedolan/jq/issues/1904 +Requires: libjq%{jq_sover} = %{version} %ifnarch riscv64 BuildRequires: valgrind %endif @@ -41,32 +40,31 @@ 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. -%package -n libjq1 +%package -n libjq%{jq_sover} Summary: Library for a lightweight and flexible command-line JSON processor Group: System/Libraries -%description -n libjq1 +%description -n libjq%{jq_sover} Library for a lightweight and flexible command-line JSON processor. %package -n libjq-devel Summary: Development files for jq Group: Development/Languages/C and C++ -Requires: libjq1 = %{version} +Requires: libjq%{jq_sover} = %{version} %description -n libjq-devel Development files (headers and libraries for jq). %prep -%setup -q -n %{name}-%{name}-%{version} +%autosetup -p1 %build -autoreconf -fiv %configure \ --disable-static \ %ifarch riscv64 --disable-valgrind \ %endif - --disable-silent-rules +%{nil} %make_build %install @@ -86,8 +84,7 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name} %make_build check %endif -%post -n libjq1 -p /sbin/ldconfig -%postun -n libjq1 -p /sbin/ldconfig +%ldconfig_scriptlets -n libjq%{jq_sover} %files %license COPYING @@ -95,10 +92,12 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name} %{_bindir}/%{name} %{_mandir}/man1/%{name}.1%{?ext_man} -%files -n libjq1 -%{_libdir}/libjq.so.1* +%files -n libjq%{jq_sover} +%license COPYING +%{_libdir}/libjq.so.%{jq_sover}* %files -n libjq-devel +%license COPYING %{_includedir}/jq.h %{_includedir}/jv.h %{_libdir}/libjq.so