Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qore-json-module for
openSUSE:Factory checked in at 2022-06-16 18:19:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qore-json-module (Old)
and /work/SRC/openSUSE:Factory/.qore-json-module.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qore-json-module"
Thu Jun 16 18:19:46 2022 rev:9 rq:982701 version:1.8.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/qore-json-module/qore-json-module.changes
2021-11-23 22:12:44.382447458 +0100
+++
/work/SRC/openSUSE:Factory/.qore-json-module.new.1548/qore-json-module.changes
2022-06-16 18:19:57.964058967 +0200
@@ -1,0 +2,7 @@
+Tue Jun 14 11:12:55 UTC 2022 - Sarah Kriesch <[email protected]>
+
+- Update to 1.8.1 becoause of qore-doc requirement
+ * eliminated excess whitespace from compact JSON
+ serialization (refs qorelanguage/qore#4459)
+
+-------------------------------------------------------------------
Old:
----
module-json-release-1.0.10.tar.gz
New:
----
qore-json-module-1.8.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qore-json-module.spec ++++++
--- /var/tmp/diff_new_pack.nubJBe/_old 2022-06-16 18:19:58.428059627 +0200
+++ /var/tmp/diff_new_pack.nubJBe/_new 2022-06-16 18:19:58.436059638 +0200
@@ -1,7 +1,7 @@
#
# spec file for package qore-json-module
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,55 +16,103 @@
#
-%define qore_version 1.0.10
+%define mod_ver 1.8.1
+
+%{?_datarootdir: %global mydatarootdir %_datarootdir}
+%{!?_datarootdir: %global mydatarootdir /usr/share}
+
%define module_api %(qore --latest-module-api 2>/dev/null)
-%define src_name module-json-release-%{qore_version}
-Name: qore-json-module
-Version: 1.8+qore%{qore_version}
-Release: 0
+%define module_dir %{_libdir}/qore-modules
+%global user_module_dir %{mydatarootdir}/qore-modules/
+
+%if 0%{?sles_version}
+
+%define dist .sles%{?sles_version}
+
+%else
+%if 0%{?suse_version}
+
+# get *suse release major version
+%define os_maj %(echo %suse_version|rev|cut -b3-|rev)
+# get *suse release minor version without trailing zeros
+%define os_min %(echo %suse_version|rev|cut -b-2|rev|sed s/0*$//)
+
+%if %suse_version > 1010
+%define dist .opensuse%{os_maj}_%{os_min}
+%else
+%define dist .suse%{os_maj}_%{os_min}
+%endif
+
+%endif
+%endif
+
+# see if we can determine the distribution type
+%if 0%{!?dist:1}
+%define rh_dist %(if [ -f /etc/redhat-release ];then cat
/etc/redhat-release|sed "s/[^0-9.]*//"|cut -f1 -d.;fi)
+%if 0%{?rh_dist}
+%define dist .rhel%{rh_dist}
+%else
+%define dist .unknown
+%endif
+%endif
+
Summary: JSON module for Qore
-License: LGPL-2.0-or-later OR GPL-2.0-or-later OR MIT
-URL: https://qore.org
-Source:
https://github.com/qorelanguage/module-json/archive/refs/tags/release-%{qore_version}.tar.gz#/%{src_name}.tar.gz
-BuildRequires: cmake
-BuildRequires: doxygen
-BuildRequires: fdupes
+Name: qore-json-module
+Version: %{mod_ver}
+Release: 1%{dist}
+License: GPL-2.0-or-later OR LGPL-2.0-or-later OR MIT
+Group: Development/Languages
+URL: http://qore.org
+Source:
https://github.com/qorelanguage/module-json/releases/download/v%{version}/%{name}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires: /usr/bin/env
+Requires: qore-module(abi)%{?_isa} = %{module_api}
BuildRequires: gcc-c++
-BuildRequires: graphviz
BuildRequires: openssl-devel
BuildRequires: qore
-BuildRequires: qore-devel >= %{qore_version}
-Requires: qore-module(abi)%{?_isa} = %{module_api}
+BuildRequires: qore-devel >= 0.9
%description
This package contains the json module for the Qore Programming Language.
JSON is a concise human-readable data serialization format.
-%package doc
-Summary: JSON module for Qore
-
-%description doc
-This package contains the HTML documentation and example programs for the Qore
-json module.
+%if 0%{?suse_version}
+%endif
%prep
-%setup -q -n %{src_name}
+%setup -q
+./configure RPM_OPT_FLAGS="$RPM_OPT_FLAGS" --prefix=/usr --disable-debug
%build
-%cmake
-%make_build docs
+%{__make}
%install
-%cmake_install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/%{module_dir}
+mkdir -p $RPM_BUILD_ROOT/%{user_module_dir}
+mkdir -p $RPM_BUILD_ROOT/usr/share/doc/qore-json-module
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
%files
-%license COPYING.LGPL COPYING.MIT
-%{_datadir}/qore-modules/*
-%{_libdir}/qore-modules/*
+%defattr(-,root,root,-)
+%{module_dir}
+%{user_module_dir}
+%doc COPYING.LGPL COPYING.MIT README RELEASE-NOTES AUTHORS
+
+%package doc
+Summary: JSON module for Qore
+Group: Development/Languages
+
+%description doc
+This package contains the HTML documentation and example programs for the Qore
+json module.
%files doc
-%doc README RELEASE-NOTES
-%doc build/html/*
+%defattr(-,root,root,-)
+%doc docs/json/html docs/JsonRpcHandler/html examples/ test/
%changelog
