Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qore-uuid-module for
openSUSE:Factory checked in at 2023-02-11 21:57:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qore-uuid-module (Old)
and /work/SRC/openSUSE:Factory/.qore-uuid-module.new.1848 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qore-uuid-module"
Sat Feb 11 21:57:18 2023 rev:6 rq:1064353 version:1.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/qore-uuid-module/qore-uuid-module.changes
2021-11-23 22:12:42.858452499 +0100
+++
/work/SRC/openSUSE:Factory/.qore-uuid-module.new.1848/qore-uuid-module.changes
2023-02-11 21:57:53.819836806 +0100
@@ -1,0 +2,6 @@
+Sat Feb 11 01:38:38 UTC 2023 - Ferdinand Thiessen <r...@fthiessen.de>
+
+- Update to version 1.4.1
+ * Support Qore 1.12.4+
+
+-------------------------------------------------------------------
Old:
----
module-uuid-release-1.0.10.tar.gz
New:
----
module-uuid-1.4.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qore-uuid-module.spec ++++++
--- /var/tmp/diff_new_pack.pZT5U9/_old 2023-02-11 21:57:54.147838847 +0100
+++ /var/tmp/diff_new_pack.pZT5U9/_new 2023-02-11 21:57:54.155838897 +0100
@@ -1,7 +1,7 @@
#
# spec file for package qore-uuid-module
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,29 +12,29 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-%define qore_version 1.0.10
%define module_api %(qore --latest-module-api 2>/dev/null)
-%define src_name module-uuid-release-%{qore_version}
+%define src_name module-uuid-%{version}
Name: qore-uuid-module
-Version: 1.4.0+qore%{qore_version}
+Version: 1.4.1
Release: 0
Summary: UUID module for Qore
-License: LGPL-2.1+ or MIT
+License: LGPL-2.1-or-later OR MIT
Group: Development/Languages
URL: https://qore.org
-Source:
https://github.com/qorelanguage/module-uuid/archive/refs/tags/release-%{qore_version}.tar.gz#/%{src_name}.tar.gz
+Source:
https://github.com/qorelanguage/module-uuid/archive/refs/tags/v%{version}.tar.gz#/%{src_name}.tar.gz
BuildRequires: cmake
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: graphviz
BuildRequires: libuuid-devel
-BuildRequires: qore
-BuildRequires: qore-devel >= %{qore_version}
+BuildRequires: qore >= 1.12.4
+BuildRequires: qore-stdlib >= 1.12.4
+BuildRequires: qore-devel >= 1.12.4
Requires: qore-module(abi)%{?_isa} = %{module_api}
%description
@@ -67,6 +67,6 @@
%{_libdir}/qore-modules
%files doc
-%doc %{__builddir}/html
+%doc %{__builddir}/docs/uuid/html
%changelog
++++++ module-uuid-release-1.0.10.tar.gz -> module-uuid-1.4.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/module-uuid-release-1.0.10/CMakeLists.txt
new/module-uuid-1.4.1/CMakeLists.txt
--- old/module-uuid-release-1.0.10/CMakeLists.txt 2021-07-31
17:17:10.000000000 +0200
+++ new/module-uuid-1.4.1/CMakeLists.txt 2022-12-19 19:03:40.000000000
+0100
@@ -1,13 +1,12 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 2.8.12)
project(qore-uuid-module)
set (VERSION_MAJOR 1)
set (VERSION_MINOR 4)
-set (VERSION_PATCH 0)
+set (VERSION_PATCH 1)
-
-find_package(Qore 0.9 REQUIRED)
+find_package(Qore 1.0 REQUIRED)
include_directories( ${CMAKE_SOURCE_DIR}/src )
@@ -23,18 +22,25 @@
find_path(UUID_INCLUDE_DIR uuid.h PATH_SUFFIXES uuid ossp)
include(CheckFunctionExists)
-# Some systems include uuid automatically (OS X), others need the
includes/library
-check_function_exists (uuid_unparse_lower HAVE_UUID)
-if (NOT HAVE_UUID)
- message ("-- Looking for libuuid")
- find_library(UUID_LIBRARY NAMES uuid)
- if (UUID_INCLUDE_DIR AND UUID_LIBRARY)
- message ("-- Found libuuid: ${UUID_LIBRARY}")
- set (HAVE_UUID true)
- else (UUID_INCLUDE_DIR AND UUID_LIBRARY)
- message(FATAL_ERROR "no libuuid found")
- endif (UUID_INCLUDE_DIR AND UUID_LIBRARY)
-endif (NOT HAVE_UUID)
+
+if (WIN32 OR MSYS OR MINGW)
+ set(CMAKE_REQUIRED_LINK_OPTIONS -lrpcrt4)
+ set(CMAKE_REQUIRED_HEADERS "windows.h")
+ set(CMAKE_SYSTEM_NAME Generic)
+else()
+ # Some systems include uuid automatically (OS X), others need the
includes/library
+ check_function_exists(uuid_unparse_lower HAVE_UUID)
+ if (NOT HAVE_UUID)
+ message ("-- Looking for libuuid")
+ find_library(UUID_LIBRARY NAMES uuid)
+ if (UUID_INCLUDE_DIR AND UUID_LIBRARY)
+ message ("-- Found libuuid: ${UUID_LIBRARY}")
+ set (HAVE_UUID true)
+ else (UUID_INCLUDE_DIR AND UUID_LIBRARY)
+ message(FATAL_ERROR "no libuuid found")
+ endif (UUID_INCLUDE_DIR AND UUID_LIBRARY)
+ endif (NOT HAVE_UUID)
+endif()
include_directories(${UUID_INCLUDE_DIR})
@@ -59,16 +65,19 @@
add_library(${module_name} MODULE ${QPP_SOURCES} ${CPP_SRC})
-qore_binary_module(${module_name}
"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ${UUID_LIBRARY})
+if (DEFINED ENV{DOXYGEN_EXECUTABLE})
+ set(DOXYGEN_EXECUTABLE $ENV{DOXYGEN_EXECUTABLE})
+endif()
+
+qore_external_binary_module(${module_name}
"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ${UUID_LIBRARY})
qore_user_modules("${QMOD}")
qore_dist("${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
qore_config_info()
-FIND_PACKAGE(Doxygen)
if (DOXYGEN_FOUND)
qore_wrap_dox(QORE_DOX_SRC ${QORE_DOX_TMPL_SRC})
add_custom_target(QORE_MOD_DOX_FILES DEPENDS ${QORE_DOX_SRC})
- add_dependencies(docs QORE_MOD_DOX_FILES)
+ add_dependencies(docs-module QORE_MOD_DOX_FILES)
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/module-uuid-release-1.0.10/configure.ac
new/module-uuid-1.4.1/configure.ac
--- old/module-uuid-release-1.0.10/configure.ac 2021-07-31 17:17:10.000000000
+0200
+++ new/module-uuid-1.4.1/configure.ac 2022-12-19 19:03:40.000000000 +0100
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
# AC_PREREQ(2.59)
-AC_INIT([qore-uuid-module], [1.4],
+AC_INIT([qore-uuid-module], [1.4.1],
[David Nichols <da...@qore.org>],
[qore-uuid-module])
AM_INIT_AUTOMAKE([no-dist-gzip dist-bzip2])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/module-uuid-release-1.0.10/docs/mainpage.doxygen.tmpl
new/module-uuid-1.4.1/docs/mainpage.doxygen.tmpl
--- old/module-uuid-release-1.0.10/docs/mainpage.doxygen.tmpl 2021-07-31
17:17:10.000000000 +0200
+++ new/module-uuid-1.4.1/docs/mainpage.doxygen.tmpl 2022-12-19
19:03:40.000000000 +0100
@@ -30,6 +30,14 @@
@section uuidreleasenotes Release Notes
+ @subsection uuid_v_1_4_1 Version 1.4.1
+
+ - updated to build with \c qpp from %Qore 1.12.4+
+
+ @subsection uuid_v_1_4 Version 1.4
+
+ - updated to build with the latest %Qore APIs
+
@subsection uuid_v_1_3 Version 1.3
- minor build and packaging fixes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/module-uuid-release-1.0.10/qore-uuid-module.spec
new/module-uuid-1.4.1/qore-uuid-module.spec
--- old/module-uuid-release-1.0.10/qore-uuid-module.spec 2021-07-31
17:17:10.000000000 +0200
+++ new/module-uuid-1.4.1/qore-uuid-module.spec 2022-12-19 19:03:40.000000000
+0100
@@ -1,4 +1,4 @@
-%define mod_ver 1.4
+%define mod_ver 1.4.1
%define module_api %(qore --latest-module-api 2>/dev/null)
%define module_dir %{_libdir}/qore-modules
@@ -14,10 +14,8 @@
# 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
+%if %suse_version
%define dist .opensuse%{os_maj}_%{os_min}
-%else
-%define dist .suse%{os_maj}_%{os_min}
%endif
%endif
@@ -37,18 +35,23 @@
Name: qore-uuid-module
Version: %{mod_ver}
Release: 1%{dist}
-License: LGPL
-Group: Development/Languages
+License: LGPL-2.1-or-later
+Group: Development/Languages/Other
URL: http://qore.org
Source: http://prdownloads.sourceforge.net/qore/%{name}-%{version}.tar.bz2
-#Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: /usr/bin/env
Requires: qore-module(abi)%{?_isa} = %{module_api}
+%if 0%{?el7}
+BuildRequires: devtoolset-7-gcc-c++
+%endif
+BuildRequires: cmake >= 3.5
BuildRequires: gcc-c++
-BuildRequires: qore-devel >= 0.9
+BuildRequires: qore-devel >= 1.12.4
+BuildRequires: qore-stdlib >= 1.12.4
+BuildRequires: qore >= 1.12.4
BuildRequires: libuuid-devel
-BuildRequires: qore
+BuildRequires: doxygen
%description
This package contains the uuid module for the Qore Programming Language.
@@ -61,7 +64,7 @@
%package doc
Summary: Documentation and examples for the Qore UUID module
-Group: Development/Languages
+Group: Development/Languages/Other
%description doc
This package contains the HTML documentation and example programs for the Qore
@@ -73,16 +76,20 @@
%prep
%setup -q
-./configure RPM_OPT_FLAGS="$RPM_OPT_FLAGS" --prefix=/usr --disable-debug
%build
-%{__make}
+%if 0%{?el7}
+# enable devtoolset7
+. /opt/rh/devtoolset-7/enable
+%endif
+export CXXFLAGS="%{?optflags}"
+cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_BUILD_TYPE=RELWITHDEBINFO
-DCMAKE_SKIP_RPATH=1 -DCMAKE_SKIP_INSTALL_RPATH=1 -DCMAKE_SKIP_BUILD_RPATH=1
-DCMAKE_PREFIX_PATH=${_prefix}/lib64/cmake/Qore .
+make %{?_smp_mflags}
+make %{?_smp_mflags} docs
+sed -i 's/#!\/usr\/bin\/env qore/#!\/usr\/bin\/qore/' test/*.qtest
%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{module_dir}
-mkdir -p $RPM_BUILD_ROOT/usr/share/doc/qore-uuid-module
-make install DESTDIR=$RPM_BUILD_ROOT
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -92,7 +99,14 @@
%{module_dir}
%doc COPYING.MIT COPYING.LGPL README RELEASE-NOTES AUTHORS
+%check
+qore -l ./uuid-api-1.3.qmod test/uuid-test.qtest -v
+
%changelog
+* Mon Dec 19 2022 David Nichols <da...@qore.org> 1.4.1
+- updated version to 1.4.1
+- use cmake instead of autotools for the build
+
* Tue May 1 2018 David Nichols <da...@qore.org> 1.4
- updated version to 1.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/module-uuid-release-1.0.10/src/QC_UUID.qpp
new/module-uuid-1.4.1/src/QC_UUID.qpp
--- old/module-uuid-release-1.0.10/src/QC_UUID.qpp 2021-07-31
17:17:10.000000000 +0200
+++ new/module-uuid-1.4.1/src/QC_UUID.qpp 2022-12-19 19:03:40.000000000
+0100
@@ -24,7 +24,7 @@
/** @defgroup uuid_generation_constants UUID Generation Constants
*/
-//@{
+///@{
namespace Qore::UUID;
//! No value; this is the default
const None = QUF_NONE;
@@ -40,18 +40,18 @@
//! If case is supported in the UUID::toString() method; this is always True
const HAVE_UNPARSE_CASE = True;
-//@}
+///@}
/** @defgroup uuid_formatting_constants UUID Formatting Constants
*/
namespace Qore::UUID;
-//@{
+///@{
//! All alphebetic hexadecimal characters will be in upper case
const UpperCase = QUF_UPPER_CASE;
//! All alphebetic hexadecimal characters will be in lower case; this is the
default
const LowerCase = QUF_LOWER_CASE;
-//@}
+///@}
//! The UUID class provides methods that allow UUIDs to be created,
manipulated, and parsed
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/module-uuid-release-1.0.10/test/uuid-test.q
new/module-uuid-1.4.1/test/uuid-test.q
--- old/module-uuid-release-1.0.10/test/uuid-test.q 2021-07-31
17:17:10.000000000 +0200
+++ new/module-uuid-1.4.1/test/uuid-test.q 1970-01-01 01:00:00.000000000
+0100
@@ -1,75 +0,0 @@
-#!/usr/bin/env qore
-
-%requires uuid >= 1.1
-
-# the uuid module requires qore 0.8.0+, so we know we have types
-%require-types
-%new-style
-%strict-args
-%enable-all-warnings
-
-%requires QUnit
-
-%exec-class uuid_test
-
-class uuid_test inherits QUnit::Test {
- constructor() : Test("uuid", "1.0") {
- addTestCase("default", \defaultTest());
- addTestCase("random", \randomTest());
- addTestCase("time", \timeTest());
- addTestCase("literal", \literalTest());
- addTestCase("parsed", \parsedTest());
-
- set_return_value(main());
- }
-
- defaultTest() {
- UUID uuid();
- doTests(uuid, "default");
- }
-
- randomTest() {
- UUID uuid();
- uuid.generate(UUID::Random);
- doTests(uuid, "random");
- }
-
- timeTest() {
- UUID uuid();
- uuid.generate(UUID::Time);
- doTests(uuid, "time");
- }
-
- literalTest() {
- UUID uuid("1b4e28ba-2fa1-11d2-883f-b9a761bde3fb");
- doTests(uuid, "literal");
- }
-
- parsedTest() {
- UUID uuid("1b4e28ba-2fa1-11d2-883f-b9a761bde3fb");
- string str = UUID::get();
- uuid = new UUID(str);
- string str2 = uuid.toString();
- assertEq(str, str2, sprintf("static UUID::get(), type: %s", "parsed"));
- doTests(uuid, "parsed");
- }
-
- doTests(UUID uuid, string type) {
- assertFalse(uuid.isNull(), sprintf("UUID::isNull, type: %s", type));
-
- if (UUID::HAVE_UNPARSE_CASE) {
- assertTrue(uuid.toString(UUID::LowerCase) =~ /^[\-0-9a-f]+$/,
sprintf("UUID::toString(LowerCase), type: %s", type));
- assertTrue(uuid.toString(UUID::UpperCase) =~ /^[\-0-9A-F]+$/,
sprintf("UUID::toString(UpperCase), type: %s", type));
- }
-
- UUID other = uuid.copy();
- assertEq(0, uuid.compare(other), sprintf("UUID::copy(), type: %s",
type));
-
- uuid.clear();
- assertTrue(uuid.isNull(), sprintf("UUID::clear(), type: %s", type));
- assertEq(-1, uuid.compare(other), sprintf("UUID::compare(), type: %s",
type));
-
- uuid.set("ffffffff-ffff-ffff-ffff-ffffffffffff");
- assertEq(1, uuid.compare(other), sprintf("UUID::set(), type: %s",
type));
- }
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/module-uuid-release-1.0.10/test/uuid-test.qtest
new/module-uuid-1.4.1/test/uuid-test.qtest
--- old/module-uuid-release-1.0.10/test/uuid-test.qtest 1970-01-01
01:00:00.000000000 +0100
+++ new/module-uuid-1.4.1/test/uuid-test.qtest 2022-12-19 19:03:40.000000000
+0100
@@ -0,0 +1,74 @@
+#!/usr/bin/env qore
+
+%requires uuid >= 1.1
+
+%require-types
+%new-style
+%strict-args
+%enable-all-warnings
+
+%requires QUnit
+
+%exec-class UuidTestd
+
+class UuidTestd inherits QUnit::Test {
+ constructor() : Test("uuid", "1.0") {
+ addTestCase("default", \defaultTest());
+ addTestCase("random", \randomTest());
+ addTestCase("time", \timeTest());
+ addTestCase("literal", \literalTest());
+ addTestCase("parsed", \parsedTest());
+
+ set_return_value(main());
+ }
+
+ defaultTest() {
+ UUID uuid();
+ doTests(uuid, "default");
+ }
+
+ randomTest() {
+ UUID uuid();
+ uuid.generate(UUID::Random);
+ doTests(uuid, "random");
+ }
+
+ timeTest() {
+ UUID uuid();
+ uuid.generate(UUID::Time);
+ doTests(uuid, "time");
+ }
+
+ literalTest() {
+ UUID uuid("1b4e28ba-2fa1-11d2-883f-b9a761bde3fb");
+ doTests(uuid, "literal");
+ }
+
+ parsedTest() {
+ UUID uuid("1b4e28ba-2fa1-11d2-883f-b9a761bde3fb");
+ string str = UUID::get();
+ uuid = new UUID(str);
+ string str2 = uuid.toString();
+ assertEq(str, str2, sprintf("static UUID::get(), type: %s", "parsed"));
+ doTests(uuid, "parsed");
+ }
+
+ doTests(UUID uuid, string type) {
+ assertFalse(uuid.isNull(), sprintf("UUID::isNull, type: %s", type));
+
+ if (UUID::HAVE_UNPARSE_CASE) {
+ assertTrue(uuid.toString(UUID::LowerCase) =~ /^[\-0-9a-f]+$/,
sprintf("UUID::toString(LowerCase), type: %s", type));
+ assertTrue(uuid.toString(UUID::UpperCase) =~ /^[\-0-9A-F]+$/,
sprintf("UUID::toString(UpperCase), type: %s", type));
+ }
+
+ UUID other = uuid.copy();
+ assertEq(0, uuid.compare(other), sprintf("UUID::copy(), type: %s",
type));
+
+ uuid.clear();
+ assertTrue(uuid.isNull(), sprintf("UUID::clear(), type: %s", type));
+ assertEq(-1, uuid.compare(other), sprintf("UUID::compare(), type: %s",
type));
+
+ uuid.set("ffffffff-ffff-ffff-ffff-ffffffffffff");
+ assertEq(1, uuid.compare(other), sprintf("UUID::set(), type: %s",
type));
+ }
+}
