From: Jakub Bogusz Date: Sun, 27 Aug 2023 10:37:30 +0000 (+0200) Subject: - updated to 0.9.14 (new sonames, python2 and gi bindings are gone, added io-ev binding) X-Git-Tag: auto/th/elektra-0.11.0-1~3 X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=58b803e9cc614d560965f95f8083bc8f62b9f9fd;p=packages%2Felektra.git - updated to 0.9.14 (new sonames, python2 and gi bindings are gone, added io-ev binding) --- diff --git a/disable-broken-tests.patch b/disable-broken-tests.patch deleted file mode 100644 index ad90c99..0000000 --- a/disable-broken-tests.patch +++ /dev/null @@ -1,105 +0,0 @@ ---- elektra-0.8.26/src/bindings/io/uv/CMakeLists.txt.orig 2022-07-03 17:26:38.128916142 +0200 -+++ elektra-0.8.26/src/bindings/io/uv/CMakeLists.txt 2022-07-03 17:29:36.067952163 +0200 -@@ -56,47 +56,5 @@ else () - - install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${IO_UV_LIBRARY}.pc" DESTINATION lib${LIB_SUFFIX}/${TARGET_PKGCONFIG_FOLDER}) - -- # Build test -- set (TESTEXENAME testio_${BINDING_VARIANT}) -- -- set (TEST_SOURCES $) -- add_headers (TEST_SOURCES) -- file (GLOB IO_TEST_SRC_FILES -- "${CMAKE_SOURCE_DIR}/src/bindings/io/test/test*.c") -- list (APPEND TEST_SOURCES -- ${IO_TEST_SRC_FILES}) -- list (APPEND TEST_SOURCES -- "${CMAKE_CURRENT_SOURCE_DIR}/testio_${BINDING_VARIANT}.c") -- -- if (BUILD_FULL OR BUILD_STATIC) -- list (APPEND TEST_SOURCES -- $) # add sources for elektra-io-uv for static and full builds -- endif () -- -- add_executable (${TESTEXENAME} ${TEST_SOURCES}) -- add_dependencies (${TESTEXENAME} kdberrors_generated elektra_error_codes_generated) -- -- target_include_directories (${TESTEXENAME} -- PUBLIC "${CMAKE_SOURCE_DIR}/tests/cframework" -- "${libuv_INCLUDE_DIRS}") -- -- target_link_elektra (${TESTEXENAME} elektra-kdb elektra-plugin elektra-io ${IO_UV_LIBRARY} m) -- if (BUILD_FULL OR BUILD_STATIC) -- target_link_libraries (${TESTEXENAME} "${libuv_LIBRARIES}" m) -- endif () -- -- if (libuv_VERSION VERSION_LESS "1.0") -- target_compile_definitions (${TESTEXENAME} PRIVATE "HAVE_LIBUV0") -- else () -- target_compile_definitions (${TESTEXENAME} PRIVATE "HAVE_LIBUV1") -- endif () -- -- add_test (NAME ${TESTEXENAME} -- COMMAND "${CMAKE_BINARY_DIR}/bin/${TESTEXENAME}" "${CMAKE_CURRENT_SOURCE_DIR}" -- WORKING_DIRECTORY "${WORKING_DIRECTORY}") -- set_property (TEST ${TESTEXENAME} -- PROPERTY ENVIRONMENT -- "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib") -- - add_subdirectory (example) - endif () ---- elektra-0.8.26/src/bindings/io/glib/CMakeLists.txt.orig 2022-07-03 17:26:38.128916142 +0200 -+++ elektra-0.8.26/src/bindings/io/glib/CMakeLists.txt 2022-07-03 17:29:56.374508820 +0200 -@@ -39,42 +39,5 @@ else () - - install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${IO_VARIANT_LIBRARY}.pc" DESTINATION lib${LIB_SUFFIX}/${TARGET_PKGCONFIG_FOLDER}) - -- # Build test -- set (testexename testio_${BINDING_VARIANT}) -- -- set (TEST_SOURCES $) -- add_headers (TEST_SOURCES) -- file (GLOB IO_TEST_SRC_FILES -- "${CMAKE_SOURCE_DIR}/src/bindings/io/test/test*.c") -- list (APPEND TEST_SOURCES -- ${IO_TEST_SRC_FILES}) -- list (APPEND TEST_SOURCES -- "${CMAKE_CURRENT_SOURCE_DIR}/testio_${BINDING_VARIANT}.c") -- -- if (BUILD_FULL OR BUILD_STATIC) # add sources for elektra-io-glib for static and full builds -- list (APPEND TEST_SOURCES -- $) -- endif () -- -- add_executable (${testexename} ${TEST_SOURCES}) -- add_dependencies (${testexename} kdberrors_generated elektra_error_codes_generated) -- -- target_include_directories (${testexename} PUBLIC "${CMAKE_SOURCE_DIR}/tests/cframework") -- target_include_directories (${testexename} -- PUBLIC SYSTEM -- ${GLib_INCLUDE_DIRS}) -- -- target_link_elektra (${testexename} elektra-kdb elektra-plugin elektra-io ${IO_VARIANT_LIBRARY} m) -- if (BUILD_FULL OR BUILD_STATIC) -- target_link_libraries (${testexename} ${GLib_LIBRARY}) -- endif () -- -- add_test (NAME ${testexename} -- COMMAND "${CMAKE_BINARY_DIR}/bin/${testexename}" "${CMAKE_CURRENT_SOURCE_DIR}" -- WORKING_DIRECTORY "${WORKING_DIRECTORY}") -- set_property (TEST ${testexename} -- PROPERTY ENVIRONMENT -- "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib") -- - add_subdirectory (example) - endif () ---- elektra-0.8.23/CMakeLists.txt~ 2018-05-13 18:57:57.000000000 +0200 -+++ elektra-0.8.23/CMakeLists.txt 2021-03-04 23:21:10.222371932 +0100 -@@ -85,7 +85,6 @@ - - add_subdirectory (src) - add_subdirectory (examples) -- add_subdirectory (benchmarks) - - if (BUILD_TESTING) - add_subdirectory (tests) diff --git a/elektra-gpgme.patch b/elektra-gpgme.patch index 76abc97..15f2083 100644 --- a/elektra-gpgme.patch +++ b/elektra-gpgme.patch @@ -5,28 +5,59 @@ CMake Error in src/plugins/gpgme/CMakeLists.txt: "-D_FILE_OFFSET_BITS=64" ---- elektra-0.8.26/cmake/Modules/FindLibGpgme.cmake.orig 2019-02-26 12:45:46.000000000 +0100 -+++ elektra-0.8.26/cmake/Modules/FindLibGpgme.cmake 2022-07-03 17:45:45.536033437 +0200 -@@ -52,10 +52,13 @@ if (LIBGPGME_FOUND) - string (LENGTH "${LIBGPGME_CFLAGS}" - LIBGPGME_CFLAGS_LEN) +--- elektra-0.9.14/scripts/cmake/Modules/FindLibGpgme.cmake.orig 2023-08-25 20:22:55.946714270 +0200 ++++ elektra-0.9.14/scripts/cmake/Modules/FindLibGpgme.cmake 2023-08-25 20:25:26.262566605 +0200 +@@ -44,6 +44,31 @@ if (GPGME_EXECUTABLE) + set (LIBGPGME_FOUND TRUE) + endif (LIBGPGME_LIBRARIES AND LIBGPGME_CFLAGS) + ++else (GPGME_EXECUTABLE) ++ ++ execute_process ( ++ COMMAND pkg-config gpgme --libs ++ RESULT_VARIABLE _return_VALUE ++ OUTPUT_VARIABLE LIBGPGME_LIBRARIES ++ OUTPUT_STRIP_TRAILING_WHITESPACE) ++ execute_process ( ++ COMMAND pkg-config gpgme --cflags ++ RESULT_VARIABLE _return_VALUE ++ OUTPUT_VARIABLE LIBGPGME_CFLAGS ++ OUTPUT_STRIP_TRAILING_WHITESPACE) ++ execute_process ( ++ COMMAND pkg-config gpgme --modversion ++ RESULT_VARIABLE _return_VALUE ++ OUTPUT_VARIABLE LIBGPGME_VERSION ++ OUTPUT_STRIP_TRAILING_WHITESPACE) ++ ++ if (NOT LIBGPGME_CFLAGS AND NOT _return_VALUE) ++ set (LIBGPGME_CFLAGS " ") ++ endif (NOT LIBGPGME_CFLAGS AND NOT _return_VALUE) ++ ++ if (LIBGPGME_LIBRARIES AND LIBGPGME_CFLAGS) ++ set (LIBGPGME_FOUND TRUE) ++ endif (LIBGPGME_LIBRARIES AND LIBGPGME_CFLAGS) + endif (GPGME_EXECUTABLE) + + if (LIBGPGME_FOUND) +@@ -55,7 +70,10 @@ if (LIBGPGME_FOUND) + # parse include directory from C-Flags + string (LENGTH "${LIBGPGME_CFLAGS}" LIBGPGME_CFLAGS_LEN) if (${LIBGPGME_CFLAGS_LEN} GREATER 1) +- string (REPLACE "-I" "" LIBGPGME_INCLUDE_DIRS "${LIBGPGME_CFLAGS}") + string (REGEX REPLACE "-D[A-Za-z0-9_=]* *" "" + LIBGPGME_INCLUDE_DIRS + "${LIBGPGME_CFLAGS}") - string (REPLACE "-I" - "" - LIBGPGME_INCLUDE_DIRS -- "${LIBGPGME_CFLAGS}") -+ "${LIBGPGME_INCLUDE_DIRS}") - string (REPLACE " " - ";" - LIBGPGME_INCLUDE_DIRS ---- elektra-0.8.26/src/plugins/gpgme/CMakeLists.txt.orig 2019-02-26 12:45:46.000000000 +0100 -+++ elektra-0.8.26/src/plugins/gpgme/CMakeLists.txt 2022-07-03 18:16:30.609371151 +0200 -@@ -11,4 +11,4 @@ endif () ++ string (REPLACE "-I" "" LIBGPGME_INCLUDE_DIRS "${LIBGPGME_INCLUDE_DIRS}") + string (REPLACE " " ";" LIBGPGME_INCLUDE_DIRS "${LIBGPGME_INCLUDE_DIRS}") - set (GPGME_SOURCE_FILES keylist.h keylist.c gpgme.h gpgme.c) + endif () +--- elektra-0.9.14/src/plugins/gpgme/CMakeLists.txt.orig 2023-08-25 20:22:55.950047585 +0200 ++++ elektra-0.9.14/src/plugins/gpgme/CMakeLists.txt 2023-08-25 20:27:16.921967112 +0200 +@@ -16,6 +16,7 @@ add_plugin ( + SOURCES ${GPGME_SOURCE_FILES} + INCLUDE_DIRECTORIES ${LIBGPGME_INCLUDE_DIRS} + LINK_LIBRARIES ${LIBGPGME_LIBRARIES} ++ COMPILE_DEFINITIONS "_FILE_OFFSET_BITS=64" + ADD_TEST COMPONENT libelektra${SO_VERSION}-experimental) --add_plugin (gpgme SOURCES ${GPGME_SOURCE_FILES} INCLUDE_DIRECTORIES ${LIBGPGME_INCLUDE_DIRS} LINK_LIBRARIES ${LIBGPGME_LIBRARIES} ADD_TEST) -+add_plugin (gpgme SOURCES ${GPGME_SOURCE_FILES} INCLUDE_DIRECTORIES ${LIBGPGME_INCLUDE_DIRS} LINK_LIBRARIES ${LIBGPGME_LIBRARIES} COMPILE_DEFINITIONS "_FILE_OFFSET_BITS=64" ADD_TEST) + if (ADDTESTING_PHASE) diff --git a/elektra-jni.patch b/elektra-jni.patch index c06fa61..e9d643b 100644 --- a/elektra-jni.patch +++ b/elektra-jni.patch @@ -1,20 +1,19 @@ cmake_push_check_state (RESET) resets also CMAKE_REQUIRED_INCLUDES, which are essential here ---- elektra-0.8.26/cmake/Modules/SafeCheckSymbolExists.cmake.orig 2019-02-26 12:45:46.000000000 +0100 -+++ elektra-0.8.26/cmake/Modules/SafeCheckSymbolExists.cmake 2022-07-03 21:43:13.742177612 +0200 -@@ -15,6 +15,7 @@ include (CMakePushCheckState) +--- elektra-0.9.14/scripts/cmake/Modules/SafeCheckSymbolExists.cmake.orig 2023-08-25 20:28:50.328127754 +0200 ++++ elektra-0.9.14/scripts/cmake/Modules/SafeCheckSymbolExists.cmake 2023-08-25 20:30:56.444111192 +0200 +@@ -15,12 +15,14 @@ include (CMakePushCheckState) macro (safe_check_symbol_exists SYMBOL FILES VARIABLE) set (CMAKE_C_FLAGS_OLD ${CMAKE_C_FLAGS}) + set (SAVE_CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES}) - string (REPLACE "-Wpedantic" - "" - CMAKE_C_FLAGS -@@ -25,6 +26,7 @@ macro (safe_check_symbol_exists SYMBOL F + string (REPLACE "-Wpedantic" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS}) + + cmake_push_check_state () + get_directory_property (DEFS COMPILE_DEFINITIONS) prepend (DEFS "-D" ${DEFS}) - list (APPEND CMAKE_REQUIRED_DEFINITIONS - ${DEFS}) + list (APPEND CMAKE_REQUIRED_DEFINITIONS ${DEFS}) + set (CMAKE_REQUIRED_INCLUDES ${SAVE_CMAKE_REQUIRED_INCLUDES}) check_symbol_exists ("${SYMBOL}" "${FILES}" "${VARIABLE}") - + cmake_pop_check_state () diff --git a/elektra-no-markdown.patch b/elektra-no-markdown.patch index c75ccb5..292aac6 100644 --- a/elektra-no-markdown.patch +++ b/elektra-no-markdown.patch @@ -1,6 +1,6 @@ ---- elektra-0.8.26/cmake/Modules/FindDiscount.cmake.orig 2022-07-03 17:23:48.529834939 +0200 -+++ elektra-0.8.26/cmake/Modules/FindDiscount.cmake 2022-07-03 17:26:08.972407429 +0200 -@@ -72,7 +72,7 @@ if (NOT DISCOUNT_FOUND) +--- elektra-0.9.14/scripts/cmake/Modules/FindDISCOUNT.cmake.orig 2023-03-16 16:11:44.000000000 +0100 ++++ elektra-0.9.14/scripts/cmake/Modules/FindDISCOUNT.cmake 2023-08-25 19:54:52.422501370 +0200 +@@ -70,7 +70,7 @@ if (NOT DISCOUNT_FOUND) # ____________________________________________________________________________ Actions taken when all components have been found diff --git a/elektra-system-gtest.patch b/elektra-system-gtest.patch index 5ccbc9f..ceb3fc3 100644 --- a/elektra-system-gtest.patch +++ b/elektra-system-gtest.patch @@ -1,6 +1,6 @@ ---- elektra-0.8.26/tests/CMakeLists.txt.orig 2019-02-26 12:45:46.000000000 +0100 -+++ elektra-0.8.26/tests/CMakeLists.txt 2022-07-06 20:43:06.457706947 +0200 -@@ -12,38 +12,8 @@ include (LibAddMacros) +--- elektra-0.9.14/tests/CMakeLists.txt.orig 2023-08-25 20:31:59.347103750 +0200 ++++ elektra-0.9.14/tests/CMakeLists.txt 2023-08-25 20:32:56.280128651 +0200 +@@ -12,30 +12,8 @@ include (LibAddMacros) if (ENABLE_TESTING) @@ -12,36 +12,28 @@ - set (googletest_BINARY_DIR "${CMAKE_BINARY_DIR}/gtest") - else (DEFINED GOOGLETEST_ROOT) - include (DownloadProject) -- if (CMAKE_VERSION VERSION_LESS 3.2) -- set (UPDATE_DISCONNECTED_IF_AVAILABLE "") -- else () -- set (UPDATE_DISCONNECTED_IF_AVAILABLE "UPDATE_DISCONNECTED 1") -- endif () - -- download_project (PROJ googletest -- GIT_REPOSITORY https://github.com/google/googletest.git -- GIT_TAG release-1.8.1 -- QUIET -- ${UPDATE_DISCONNECTED_IF_AVAILABLE}) +- download_project ( +- PROJ googletest +- GIT_REPOSITORY https://github.com/google/googletest.git +- GIT_TAG release-1.12.1 QUIET UPDATE_DISCONNECTED 1) - endif (DEFINED GOOGLETEST_ROOT) - - # Prevent GoogleTest from overriding our compiler/linker options when building with Visual Studio -- set (gtest_force_shared_crt -- ON -- CACHE BOOL -- "" -- FORCE) +- set ( +- gtest_force_shared_crt +- ON +- CACHE BOOL "" FORCE) - - add_subdirectory (${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL) - -- set_property (TARGET gtest -- PROPERTY COMPILE_FLAGS -- "-Wno-undef") +- set_property (TARGET gtest PROPERTY COMPILE_FLAGS "-Wno-undef") +- set_property (TARGET gtest_main PROPERTY COMPILE_FLAGS "-Wno-undef") endif (ENABLE_TESTING) # don't call add_headers in a loop ---- elektra-0.8.26/cmake/Modules/LibAddPlugin.cmake.orig 2019-02-26 12:45:46.000000000 +0100 -+++ elektra-0.8.26/cmake/Modules/LibAddPlugin.cmake 2022-07-06 21:58:10.920432262 +0200 +--- elektra-0.9.14/scripts/cmake/Modules/LibAddPlugin.cmake.orig 2019-02-26 12:45:46.000000000 +0100 ++++ elektra-0.9.14/scripts/cmake/Modules/LibAddPlugin.cmake 2022-07-06 21:58:10.920432262 +0200 @@ -183,7 +183,7 @@ function (add_plugintest testname) target_link_elektra (${testexename} elektra-kdb elektra-plugin ${ARG_LINK_ELEKTRA} ${ARG_TEST_LINK_ELEKTRA}) diff --git a/elektra-zsh.patch b/elektra-zsh.patch index b78adf0..d8892f5 100644 --- a/elektra-zsh.patch +++ b/elektra-zsh.patch @@ -1,11 +1,11 @@ ---- elektra-0.8.23/scripts/CMakeLists.txt.orig 2018-06-21 21:19:48.567341007 +0200 -+++ elektra-0.8.23/scripts/CMakeLists.txt 2018-06-21 21:20:44.280673708 +0200 -@@ -77,7 +77,7 @@ - else () - +--- elektra-0.9.14/scripts/completion/CMakeLists.txt.orig 2023-03-16 16:11:44.000000000 +0100 ++++ elektra-0.9.14/scripts/completion/CMakeLists.txt 2023-08-25 19:51:06.727057400 +0200 +@@ -65,7 +65,7 @@ if (INSTALL_SYSTEM_FILES) # This Folder is at least the valid folder for Debian -- install (FILES kdb_zsh_completion DESTINATION /usr/share/zsh/vendor-completions RENAME _kdb) -+ install (FILES kdb_zsh_completion DESTINATION /usr/share/zsh/site-functions RENAME _kdb) + install ( + FILES kdb_zsh_completion +- DESTINATION /usr/share/zsh/vendor-completions ++ DESTINATION /usr/share/zsh/site-functions + RENAME _kdb + COMPONENT elektra-bin) endif () - endif () - diff --git a/elektra.spec b/elektra.spec index 635bd3c..8905e42 100644 --- a/elektra.spec +++ b/elektra.spec @@ -1,20 +1,17 @@ # TODO: # - subpackage crypto modules? (-plugin-crypto_{botan,gcrypt,openssl} or so) # - force maven to work without network, enable java_mvn -# - haskell plugin (BR: ghc >= 8.0.0, cabal) # - rest-backend (BR: cppcms boost >= 1.45 libjwt openssl) # - rest-frontend, web (BR: npm) -# - use system nickel (1.1.0, in src/plugins/ni), inih (r29, src/plugins/ini) +# - use system nickel (1.1.0, in src/plugins/ni) # # Conditonal build: %bcond_with full # "full" variant (libelektra-full with all plugins linked in) -%bcond_without gen # gen tool packaging %bcond_without glib # GLib/GObject/GSetttings (+ GI) bindings %bcond_without gsettings # GSetttings module %bcond_without java # Java support: JNA binding and JNI plugin (needs Java 8) %bcond_with java_mvn # Java JNA binding (needs Java 8 and maven) %bcond_without lua # Lua (5.2) support: bindings and plugin -%bcond_without python2 # Python 2 support: bindings and plugin %bcond_without python3 # Python 3 support: bindings and plugin %bcond_without qt # Qt GUI %bcond_without ruby # Ruby binding and plugin @@ -28,16 +25,14 @@ Summary: A key/value pair database to store software configurations Summary(pl.UTF-8): Baza kluczy/wartości do przechowywania konfiguracji oprogramowania Name: elektra -Version: 0.8.26 +Version: 0.9.14 Release: 1 License: BSD Group: Applications/System Source0: https://www.libelektra.org/ftp/elektra/releases/%{name}-%{version}.tar.gz -# Source0-md5: 4ef202b5d421cc497ef05221e5309ebc +# Source0-md5: eb0f1d2e5d93bbae122999b5a27be343 Patch0: %{name}-zsh.patch Patch1: %{name}-no-markdown.patch -Patch2: disable-broken-tests.patch -Patch3: gcc11.patch Patch4: %{name}-gpgme.patch Patch5: %{name}-jni.patch Patch6: %{name}-system-gtest.patch @@ -68,9 +63,10 @@ BuildRequires: gpgme-devel >= 1.10 # for binding %{?with_java_mvn:BuildRequires: java-jna >= 4.5.0} %{?with_java_mvn:BuildRequires: java-junit >= 4.12} -%{?with_java:BuildRequires: jdk >= 1.8} +%{?with_java:BuildRequires: jdk >= 10} # jawt for plugin -%{?with_java:BuildRequires: jre-X11 >= 1.8} +%{?with_java:BuildRequires: jre-X11 >= 1.10} +BuildRequires: libev-devel BuildRequires: libgcrypt-devel BuildRequires: libgit2-devel >= 0.24.1 %{?with_qt:BuildRequires: libmarkdown-devel} @@ -84,7 +80,6 @@ BuildRequires: libxslt-progs %{?with_java_mvn:BuildRequires: maven-plugin-surefire >= 2.19.1} BuildRequires: openssl-devel BuildRequires: pkgconfig -%{?with_python2:BuildRequires: python-devel >= 1:2.7} %{?with_python3:BuildRequires: python3-devel >= 1:3.2} BuildRequires: ronn BuildRequires: rpm-build >= 4.6 @@ -93,7 +88,7 @@ BuildRequires: rpmbuild(macros) >= 1.612 %{?with_ruby:BuildRequires: ruby-devel} BuildRequires: sed >= 4.0 BuildRequires: swig >= 3 -%if %{with python2} || %{with python3} +%if %{with python3} BuildRequires: swig-python >= 3 %endif %{?with_ruby:BuildRequires: swig-ruby >= 3.0.8} @@ -112,6 +107,7 @@ Requires: augeas-libs >= 1.0 Requires: curl-libs >= 7.28.0 Requires: libgit2 >= 0.24.1 Requires: yaml-cpp >= 0.5 +Obsoletes: elektra-gen < 0.9 Obsoletes: registry < 0.4 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -133,19 +129,6 @@ W ten sposób oprogramowanie może odczytywać/zapisywać konfigurację za pomocą spójnego API. Dodatkowo aplikacje mogą być zorientowane w konfiguracji innych aplikacji, ułatwiając ich integrację. -%package gen -Summary: Elektra kbd-gen code generation utility -Summary(pl.UTF-8): Narzędzie Elektra kbd-gen do generowania kodu -Group: Development/Tools -Requires: %{name} = %{version}-%{release} -Requires: python-modules >= 1:2.7 - -%description gen -Elektra kbd-gen code generation utility. - -%description gen -l pl.UTF-8 -Narzędzie Elektra kbd-gen do generowania kodu. - %package gui Summary: Qt based GUI for Elektra Summary(pl.UTF-8): Oparty na Qt graficzny interfejs do Elektry @@ -164,7 +147,7 @@ Summary(pl.UTF-8): Wtyczka Java JNI dla Elektry Group: Libraries Requires: %{name} = %{version}-%{release} # jawt -Requires: jre-X11 >= 1.8 +Requires: jre-X11 >= 1.10 %description plugin-jni Java JNI plugin for Elektra. It allows to use plugins written in Java. @@ -186,27 +169,13 @@ Lua plugin for Elektra. It allows to use plugins written in Lua. %description plugin-lua -l pl.UTF-8 Wtyczka Lua dla Elektry. Pozwala na używanie wtyczek napisanych w Lua. -%package plugin-python2 -Summary: Python 2 plugin for Elektra -Summary(pl.UTF-8): Wtyczka Python 2 dla Elektry -Group: Libraries -Requires: %{name} = %{version}-%{release} -Requires: python-libs >= 1:2.7 - -%description plugin-python2 -Python 2 plugin for Elektra. It allows to use plugins written in -Python 2. - -%description plugin-python2 -l pl.UTF-8 -Wtyczka 2 Python dla Elektry. Pozwala na używanie wtyczek napisanych w -Pythonie 2. - %package plugin-python3 Summary: Python 3 plugin for Elektra Summary(pl.UTF-8): Wtyczka Python 3 dla Elektry Group: Libraries Requires: %{name} = %{version}-%{release} Requires: python3-libs >= 1:3.2 +Obsoletes: elektra-plugin-python2 < 0.9 %description plugin-python3 Python 3 plugin for Elektra. It allows to use plugins written in @@ -355,6 +324,8 @@ Requires: glib2 >= 1:2.42 %else Requires: glib2 >= 1:2.36 %endif +Obsoletes: lua-elektra-glib < 0.9 +Obsoletes: python3-elektra-glib < 0.9 %description glib GLib/GObject binding for Elektra. @@ -379,6 +350,32 @@ GLib/GObject binding for Elektra - development files. %description glib-devel -l pl.UTF-8 Wiązanie GLib/GObject do Elektry - pliki programistyczne. +%package io-ev +Summary: Elektra I/O binding using libev +Summary(pl.UTF-8): Wiązanie we/wy Elektry wykorzystujące libev +Group: Libraries +Requires: %{name}-libs = %{version}-%{release} + +%description io-ev +Elektra I/O binding using libev. + +%description io-ev -l pl.UTF-8 +Wiązanie we/wy Elektry wykorzystujące libev. + +%package io-ev-devel +Summary: Development files for Elektra I/O ev binding +Summary(pl.UTF-8): Pliki programistyczne wiązania we/wy Elektry ev +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-io-ev = %{version}-%{release} +Requires: libev-devel + +%description io-ev-devel +Development files for Elektra I/O ev binding. + +%description io-ev-devel -l pl.UTF-8 +Pliki programistyczne wiązania we/wy Elektry ev. + %package io-glib Summary: Elektra I/O binding using GLib Summary(pl.UTF-8): Wiązanie we/wy Elektry wykorzystujące GLib @@ -437,7 +434,7 @@ Summary(pl.UTF-8): Wiązanie języka Java dla Elektry Group: Libraries Requires: %{name}-libs = %{version}-%{release} Requires: java-jna >= 4.5.0 -Requires: jre >= 1.8 +Requires: jre >= 1.10 %description -n java-elektra Java binding for Elektra. @@ -458,41 +455,13 @@ Lua binding for Elektra. %description -n lua-elektra -l pl.UTF-8 Wiązanie języka Lua dla Elektry. -%package -n lua-elektra-glib -Summary: Lua/GI binding for Elektra -Summary(pl.UTF-8): Wiązanie Lua/GI dla Elektry -Group: Libraries -Requires: %{name}-glib = %{version}-%{release} -Requires: lua52-libs >= 5.2 -#R: lua52-lgi ? - -%description -n lua-elektra-glib -Lua/GI binding for Elektra. Note: this bindings is deprecated, it's -better to use SWIG (lua-elektra) binding. - -%description -n lua-elektra-glib -l pl.UTF-8 -Wiązanie Lua/GI dla Elektry. Uwaga: to wiązanie jest przestarzałe, -lepiej używać wiązania SWIG (lua-elektra). - -%package -n python-elektra -Summary: Python 2 binding for Elektra -Summary(pl.UTF-8): Wiązanie Pythona 2 dla Elektry -Group: Libraries -Requires: %{name}-libs = %{version}-%{release} -Requires: python-libs >= 1:2.7 - -%description -n python-elektra -Python 2 binding for Elektra. - -%description -n python-elektra -l pl.UTF-8 -Wiązanie Pythona 2 dla Elektry. - %package -n python3-elektra Summary: Python 3 binding for Elektra Summary(pl.UTF-8): Wiązanie Pythona 3 dla Elektry Group: Libraries Requires: %{name}-libs = %{version}-%{release} Requires: python3-libs >= 1:3.2 +Obsoletes: python-elektra < 0.9 %description -n python3-elektra Python 3 binding for Elektra. @@ -500,22 +469,6 @@ Python 3 binding for Elektra. %description -n python3-elektra -l pl.UTF-8 Wiązanie Pythona 3 dla Elektry. -%package -n python3-elektra-glib -Summary: Python 3 GI binding for Elektra -Summary(pl.UTF-8): Wiązanie Pythona 3 GI dla Elektry -Group: Libraries -Requires: %{name}-glib = %{version}-%{release} -Requires: python3-pygobject3 >= 3 - -%description -n python3-elektra-glib -Python 3 GI binding for Elektra. Note: this bindings is deprecated, -it's better to use SWIG (python*-elektra) binding. - - -%description -n python3-elektra-glib -l pl.UTF-8 -Wiązanie Pythona 3 GI dla Elektry. Uwaga: to wiązanie jest -przestarzałe, lepiej używać wiązania SWIG (python*-elektra). - %package -n ruby-elektra Summary: Ruby binding for Elektra Summary(pl.UTF-8): Wiązanie języka Ruby dla Elektry @@ -532,16 +485,15 @@ Wiązanie języka Ruby dla Elektry. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 %{__sed} -i -e '1s,/usr/bin/env bash,/bin/bash,' $(grep -l '/usr/bin/env bash' -r scripts) -%{__sed} -i -e '1s,/usr/bin/env sh,/bin/sh,' scripts/check-env-dep -%{__sed} -i -e '1s,/usr/bin/env python,%{__python},' scripts/{find-tools,update-infos-status} +%{__sed} -i -e '1s,/usr/bin/env sh,/bin/sh,' scripts/check-env-dep scripts/kdb/mount-list-all-files +%{__sed} -i -e '1s,/usr/bin/env python,%{__python},' scripts/dev/update-infos-status +%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' scripts/kdb/find-tools %{__rm} -r src/bindings/io/test %{__rm} src/bindings/io/uv/testio_uv.c @@ -551,14 +503,15 @@ Wiązanie języka Ruby dla Elektry. install -d build cd build %cmake .. \ - -DBINDINGS="INTERCEPT;cpp;io_uv%{?with_glib:;glib;io_glib%{?with_gsettings:;gsettings}%{?with_lua:;gi_lua}%{?with_python3:;gi_python}}%{?with_java_mvn:;jna}%{?with_lua:;swig_lua}%{?with_python2:;swig_python2}%{?with_python3:;swig_python}%{?with_ruby:;swig_ruby}" \ + -DBINDINGS="INTERCEPT;cpp;io_ev;io_uv%{?with_glib:;glib;io_glib}%{?with_gsettings:;gsettings}%{?with_java_mvn:;jna}%{?with_lua:;lua}%{?with_python3:;python}%{?with_ruby:;ruby}" \ %{!?with_full:-DBUILD_FULL=OFF} \ - -DENABLE_TESTING=FALSE \ - -DINSTALL_TESTING=FALSE \ - %{?with_glib:-DIS_GLIB_ADDED=ON} \ + -DBUILD_TESTING=OFF \ + -DENABLE_TESTING=OFF \ + -DINSTALL_SYSTEM_FILES=ON \ + -DINSTALL_TESTING=OFF \ -DPLUGINS=ALL \ -DTARGET_CMAKE_FOLDER=%{_datadir}/cmake/Modules \ - -DTOOLS="kdb;race%{?with_gen:;gen}%{?with_qt:;qt-gui}" \ + -DTOOLS="kdb;race%{?with_gen:;pythongen}%{?with_qt:;qt-gui}" \ -DBUILD_STATIC=ON %{__make} @@ -574,12 +527,6 @@ rm -rf $RPM_BUILD_ROOT install -D src/plugins/xmltool/xmlschema/elektra.xsd $RPM_BUILD_ROOT%{_datadir}/sgml/elektra/elektra.xsd -%if %{with python2} -%py_comp $RPM_BUILD_ROOT%{py_sitedir} -%py_ocomp $RPM_BUILD_ROOT%{py_sitedir} -%py_postclean -%endif - %if %{with python3} %py3_comp $RPM_BUILD_ROOT%{py3_sitedir} %py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir} @@ -597,16 +544,16 @@ install -d installed-doc %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name} # these don't belong to man3 -%{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/{CODING.md,README_md,doc_*_md,md_doc_*,md_src_*,scripts_README_md,src_libs{,_getenv,_highlevel}_README_md,src_plugins_README_md}.3elektra +%{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/{CODING.md,README_md,doc_*_md,md_doc_*,md_src_*,scripts_README_md,src_libs{,_highlevel,_merge}_README_md,src_plugins_README_md}.3elektra # internal or example, not part of API %{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/{DocBindingData,DocOperationData,SomeIoLibHandle}.3elektra %{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/doc.h.3elektra -%{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/{array,backend,dl,doc,ease_keyname,elektra_{keyname,plugin,proposal},exportsymbols,functional,internal,kdbenum,log,markdownlinkconverter,meta,mount,nolog,owner,plugin_plugin,proposal_proposal,split,static,testio_doc,testlib_notification,testlib_pluginprocess,trie,try_compile_{dbus,zeromq}}.c.3elektra -%{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/{benchmark_crypto_comparison,benchmark_plugins,examples_backend}.cpp.3elektra +%{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/{array,dl,doc,ease_keyname,elektra_{keyname,plugin},functional,internal,kdbenum,log,markdownlinkconverter,meta,nolog,plugin_plugin,static,testio_doc,testlib_notification,testlib_pluginprocess,try_compile_{dbus,zeromq}}.c.3elektra +%{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/{benchmark_plugins,examples_backend}.cpp.3elektra %{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/std_hash_*_.3elektra %if %{without java_mvn} -%{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/org_libelektra_*.3elektra +%{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/org_libelektra*.3elektra %endif %clean @@ -618,6 +565,9 @@ rm -rf $RPM_BUILD_ROOT %post glib -p /sbin/ldconfig %postun glib -p /sbin/ldconfig +%post io-ev -p /sbin/ldconfig +%postun io-ev -p /sbin/ldconfig + %post io-glib -p /sbin/ldconfig %postun io-glib -p /sbin/ldconfig @@ -626,7 +576,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc LICENSE.md README.md doc/{AUTHORS,BIGPICTURE.md,DESIGN.md,GOALS.md,SECURITY.md,WHY.md,todo} build/doc/NEWS.md +%doc LICENSE.md README.md doc/{AUTHORS.md,BIGPICTURE.md,DESIGN.md,GOALS.md,SECURITY.md,WHY.md,todo} build/doc/NEWS.md # doc/standards installed-doc/scripts %attr(755,root,root) %{_bindir}/kdb %if %{with full} @@ -635,24 +585,19 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/elektra # R: augeas-libs >= 1.0 libxml2 %attr(755,root,root) %{_libdir}/elektra/libelektra-augeas.so +%attr(755,root,root) %{_libdir}/elektra/libelektra-backend.so %attr(755,root,root) %{_libdir}/elektra/libelektra-base64.so +%attr(755,root,root) %{_libdir}/elektra/libelektra-blacklist.so %attr(755,root,root) %{_libdir}/elektra/libelektra-blockresolver.so -%attr(755,root,root) %{_libdir}/elektra/libelektra-boolean.so %attr(755,root,root) %{_libdir}/elektra/libelektra-c.so -%attr(755,root,root) %{_libdir}/elektra/libelektra-cachefilter.so -%attr(755,root,root) %{_libdir}/elektra/libelektra-camel.so %attr(755,root,root) %{_libdir}/elektra/libelektra-ccode.so %attr(755,root,root) %{_libdir}/elektra/libelektra-conditionals.so %attr(755,root,root) %{_libdir}/elektra/libelektra-constants.so %attr(755,root,root) %{_libdir}/elektra/libelektra-counter.so # R: libstdc++ %attr(755,root,root) %{_libdir}/elektra/libelektra-cpptemplate.so -# R: botan -%attr(755,root,root) %{_libdir}/elektra/libelektra-crypto_botan.so # R: libgcrypt -%attr(755,root,root) %{_libdir}/elektra/libelektra-crypto_gcrypt.so -# R: openssl -%attr(755,root,root) %{_libdir}/elektra/libelektra-crypto_openssl.so +%attr(755,root,root) %{_libdir}/elektra/libelektra-crypto.so %attr(755,root,root) %{_libdir}/elektra/libelektra-csvstorage.so # R: curl-libs >= 7.28.0 %attr(755,root,root) %{_libdir}/elektra/libelektra-curlget.so @@ -662,12 +607,11 @@ rm -rf $RPM_BUILD_ROOT # R: dbus %attr(755,root,root) %{_libdir}/elektra/libelektra-dbusrecv.so %attr(755,root,root) %{_libdir}/elektra/libelektra-desktop.so -%attr(755,root,root) %{_libdir}/elektra/libelektra-dini.so %attr(755,root,root) %{_libdir}/elektra/libelektra-directoryvalue.so %attr(755,root,root) %{_libdir}/elektra/libelektra-doc.so %attr(755,root,root) %{_libdir}/elektra/libelektra-dpkg.so %attr(755,root,root) %{_libdir}/elektra/libelektra-dump.so -%attr(755,root,root) %{_libdir}/elektra/libelektra-enum.so +%attr(755,root,root) %{_libdir}/elektra/libelektra-email.so %attr(755,root,root) %{_libdir}/elektra/libelektra-error.so %attr(755,root,root) %{_libdir}/elektra/libelektra-fcrypt.so %attr(755,root,root) %{_libdir}/elektra/libelektra-file.so @@ -676,77 +620,74 @@ rm -rf $RPM_BUILD_ROOT # R: libgit2 >= 0.24.1 %attr(755,root,root) %{_libdir}/elektra/libelektra-gitresolver.so %attr(755,root,root) %{_libdir}/elektra/libelektra-glob.so +%attr(755,root,root) %{_libdir}/elektra/libelektra-gopts.so # R: gpgme %attr(755,root,root) %{_libdir}/elektra/libelektra-gpgme.so %attr(755,root,root) %{_libdir}/elektra/libelektra-hexcode.so %attr(755,root,root) %{_libdir}/elektra/libelektra-hexnumber.so -%attr(755,root,root) %{_libdir}/elektra/libelektra-hidden.so %attr(755,root,root) %{_libdir}/elektra/libelektra-hosts.so %attr(755,root,root) %{_libdir}/elektra/libelektra-iconv.so -# uses internal inih library -%attr(755,root,root) %{_libdir}/elektra/libelektra-ini.so %attr(755,root,root) %{_libdir}/elektra/libelektra-internalnotification.so %attr(755,root,root) %{_libdir}/elektra/libelektra-ipaddr.so %attr(755,root,root) %{_libdir}/elektra/libelektra-iterate.so # R: systemd-libs %attr(755,root,root) %{_libdir}/elektra/libelektra-journald.so +# R: libstdc++ +%attr(755,root,root) %{_libdir}/elektra/libelektra-kconfig.so %attr(755,root,root) %{_libdir}/elektra/libelektra-keytometa.so +%attr(755,root,root) %{_libdir}/elektra/libelektra-length.so %attr(755,root,root) %{_libdir}/elektra/libelektra-line.so %attr(755,root,root) %{_libdir}/elektra/libelektra-lineendings.so -%attr(755,root,root) %{_libdir}/elektra/libelektra-list.so %attr(755,root,root) %{_libdir}/elektra/libelektra-logchange.so +%attr(755,root,root) %{_libdir}/elektra/libelektra-macaddr.so %attr(755,root,root) %{_libdir}/elektra/libelektra-mathcheck.so %attr(755,root,root) %{_libdir}/elektra/libelektra-mini.so -%attr(755,root,root) %{_libdir}/elektra/libelektra-mmapstorage.so -# R: zlib -%attr(755,root,root) %{_libdir}/elektra/libelektra-mmapstorage_crc.so +%attr(755,root,root) %{_libdir}/elektra/libelektra-missing.so +%attr(755,root,root) %{_libdir}/elektra/libelektra-modules.so %attr(755,root,root) %{_libdir}/elektra/libelektra-mozprefs.so %attr(755,root,root) %{_libdir}/elektra/libelektra-multifile.so %attr(755,root,root) %{_libdir}/elektra/libelektra-network.so %attr(755,root,root) %{_libdir}/elektra/libelektra-noresolver.so # uses internal nickel library %attr(755,root,root) %{_libdir}/elektra/libelektra-ni.so -%attr(755,root,root) %{_libdir}/elektra/libelektra-null.so %attr(755,root,root) %{_libdir}/elektra/libelektra-passwd.so %attr(755,root,root) %{_libdir}/elektra/libelektra-path.so %attr(755,root,root) %{_libdir}/elektra/libelektra-process.so %attr(755,root,root) %{_libdir}/elektra/libelektra-profile.so +%attr(755,root,root) %{_libdir}/elektra/libelektra-quickdump.so %attr(755,root,root) %{_libdir}/elektra/libelektra-range.so %attr(755,root,root) %{_libdir}/elektra/libelektra-reference.so -%attr(755,root,root) %{_libdir}/elektra/libelektra-regexstore.so %attr(755,root,root) %{_libdir}/elektra/libelektra-rename.so %attr(755,root,root) %{_libdir}/elektra/libelektra-resolver.so %attr(755,root,root) %{_libdir}/elektra/libelektra-resolver_fm_*.so -%attr(755,root,root) %{_libdir}/elektra/libelektra-required.so -%attr(755,root,root) %{_libdir}/elektra/libelektra-semlock.so +%attr(755,root,root) %{_libdir}/elektra/libelektra-rgbcolor.so %attr(755,root,root) %{_libdir}/elektra/libelektra-shell.so -%attr(755,root,root) %{_libdir}/elektra/libelektra-simplespeclang.so %attr(755,root,root) %{_libdir}/elektra/libelektra-simpleini.so %attr(755,root,root) %{_libdir}/elektra/libelektra-spec.so +%attr(755,root,root) %{_libdir}/elektra/libelektra-specload.so %attr(755,root,root) %{_libdir}/elektra/libelektra-storage.so -%attr(755,root,root) %{_libdir}/elektra/libelektra-struct.so %attr(755,root,root) %{_libdir}/elektra/libelektra-sync.so %attr(755,root,root) %{_libdir}/elektra/libelektra-syslog.so -%attr(755,root,root) %{_libdir}/elektra/libelektra-tcl.so %attr(755,root,root) %{_libdir}/elektra/libelektra-template.so %attr(755,root,root) %{_libdir}/elektra/libelektra-timeofday.so +%attr(755,root,root) %{_libdir}/elektra/libelektra-toml.so %attr(755,root,root) %{_libdir}/elektra/libelektra-tracer.so %attr(755,root,root) %{_libdir}/elektra/libelektra-type.so -# R: xerces-c >= 3.0.0 -%attr(755,root,root) %{_libdir}/elektra/libelektra-xerces.so +%attr(755,root,root) %{_libdir}/elektra/libelektra-unit.so %attr(755,root,root) %{_libdir}/elektra/libelektra-uname.so %attr(755,root,root) %{_libdir}/elektra/libelektra-validation.so +%attr(755,root,root) %{_libdir}/elektra/libelektra-version.so %attr(755,root,root) %{_libdir}/elektra/libelektra-wresolver.so +# R: xerces-c >= 3.0.0 +%attr(755,root,root) %{_libdir}/elektra/libelektra-xerces.so +# R: glib xfconf +%attr(755,root,root) %{_libdir}/elektra/libelektra-xfconf.so # R: libxml2 %attr(755,root,root) %{_libdir}/elektra/libelektra-xmltool.so # R: yajl %attr(755,root,root) %{_libdir}/elektra/libelektra-yajl.so -# R: libstdc++ -%attr(755,root,root) %{_libdir}/elektra/libelektra-yambi.so # R: yaml-cpp >= 0.5 %attr(755,root,root) %{_libdir}/elektra/libelektra-yamlcpp.so -# R: libstdc++ -%attr(755,root,root) %{_libdir}/elektra/libelektra-yamlsmith.so # R: zeromq %attr(755,root,root) %{_libdir}/elektra/libelektra-zeromqrecv.so # R: zeromq @@ -757,17 +698,10 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/elektra/tool_exec/change-resolver-symlink %attr(755,root,root) %{_libdir}/elektra/tool_exec/change-storage-symlink %attr(755,root,root) %{_libdir}/elektra/tool_exec/check-env-dep +%attr(755,root,root) %{_libdir}/elektra/tool_exec/cmerge-config-files %attr(755,root,root) %{_libdir}/elektra/tool_exec/configure-firefox -%attr(755,root,root) %{_libdir}/elektra/tool_exec/convert-fstab -%attr(755,root,root) %{_libdir}/elektra/tool_exec/convert-hosts -%attr(755,root,root) %{_libdir}/elektra/tool_exec/convert-inittab -%attr(755,root,root) %{_libdir}/elektra/tool_exec/convert-users -%attr(755,root,root) %{_libdir}/elektra/tool_exec/elektra-merge -%attr(755,root,root) %{_libdir}/elektra/tool_exec/elektra-mount -%attr(755,root,root) %{_libdir}/elektra/tool_exec/elektra-umount %attr(755,root,root) %{_libdir}/elektra/tool_exec/elektrify-open %attr(755,root,root) %{_libdir}/elektra/tool_exec/elektrify-getenv -%attr(755,root,root) %{_libdir}/elektra/tool_exec/example-xorg %dir %{_libdir}/elektra/tool_exec/ffconfig %attr(755,root,root) %{_libdir}/elektra/tool_exec/ffconfig/setupConfig %attr(755,root,root) %{_libdir}/elektra/tool_exec/ffconfig/setupHomepage @@ -775,15 +709,18 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/elektra/tool_exec/ffconfig/writeConfigFiles %attr(755,root,root) %{_libdir}/elektra/tool_exec/find-tools %attr(755,root,root) %{_libdir}/elektra/tool_exec/getenv +%attr(755,root,root) %{_libdir}/elektra/tool_exec/install-config-file %attr(755,root,root) %{_libdir}/elektra/tool_exec/install-sh-completion %attr(755,root,root) %{_libdir}/elektra/tool_exec/list-tools %attr(755,root,root) %{_libdir}/elektra/tool_exec/mount-augeas %attr(755,root,root) %{_libdir}/elektra/tool_exec/mount-info %attr(755,root,root) %{_libdir}/elektra/tool_exec/mount-list-all-files -%attr(755,root,root) %{_libdir}/elektra/tool_exec/mount-kde %attr(755,root,root) %{_libdir}/elektra/tool_exec/mount-openicc %attr(755,root,root) %{_libdir}/elektra/tool_exec/mountpoint-info +%attr(755,root,root) %{_libdir}/elektra/tool_exec/process-testapp.sh %attr(755,root,root) %{_libdir}/elektra/tool_exec/race +%attr(755,root,root) %{_libdir}/elektra/tool_exec/reset +%attr(755,root,root) %{_libdir}/elektra/tool_exec/reset-elektra %attr(755,root,root) %{_libdir}/elektra/tool_exec/restore %attr(755,root,root) %{_libdir}/elektra/tool_exec/stash %attr(755,root,root) %{_libdir}/elektra/tool_exec/umount-all @@ -792,66 +729,63 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/sgml/elektra %{_mandir}/man1/kdb.1* %{_mandir}/man1/kdb-backup.1* +%{_mandir}/man1/kdb-basename.1* +%{_mandir}/man1/kdb-cache.1* %{_mandir}/man1/kdb-change-resolver-symlink.1* %{_mandir}/man1/kdb-change-storage-symlink.1* -%{_mandir}/man1/kdb-check.1* %{_mandir}/man1/kdb-check-env-dep.1* +%{_mandir}/man1/kdb-cmerge.1* %{_mandir}/man1/kdb-complete.1* %{_mandir}/man1/kdb-convert.1* %{_mandir}/man1/kdb-cp.1* +%{_mandir}/man1/kdb-dirname.1* %{_mandir}/man1/kdb-editor.1* %{_mandir}/man1/kdb-elektrify-getenv.1* %{_mandir}/man1/kdb-export.1* %{_mandir}/man1/kdb-file.1* %{_mandir}/man1/kdb-find.1* %{_mandir}/man1/kdb-find-tools.1* -%{_mandir}/man1/kdb-fstab.1* +%{_mandir}/man1/kdb-gen.1* +%{_mandir}/man1/kdb-gen-highlevel.1* %{_mandir}/man1/kdb-get.1* -%{_mandir}/man1/kdb-getmeta.1* -%{_mandir}/man1/kdb-global-mount.1* -%{_mandir}/man1/kdb-global-umount.1* %{_mandir}/man1/kdb-help.1* %{_mandir}/man1/kdb-import.1* -%{_mandir}/man1/kdb-info.1* -%{_mandir}/man1/kdb-introduction.1* -%{_mandir}/man1/kdb-list.1* +%{_mandir}/man1/kdb-install-config-file.1* %{_mandir}/man1/kdb-list-commands.1* %{_mandir}/man1/kdb-list-tools.1* %{_mandir}/man1/kdb-ls.1* -%{_mandir}/man1/kdb-lsmeta.1* %{_mandir}/man1/kdb-merge.1* +%{_mandir}/man1/kdb-meta-get.1* +%{_mandir}/man1/kdb-meta-ls.1* +%{_mandir}/man1/kdb-meta-rm.1* +%{_mandir}/man1/kdb-meta-set.1* +%{_mandir}/man1/kdb-meta-show.1* %{_mandir}/man1/kdb-mount.1* +%{_mandir}/man1/kdb-mount-java.1* %{_mandir}/man1/kdb-mount-list-all-files.1* %{_mandir}/man1/kdb-mountpoint-info.* %{_mandir}/man1/kdb-mv.1* +%{_mandir}/man1/kdb-namespace.1* +%{_mandir}/man1/kdb-plugin-check.1* +%{_mandir}/man1/kdb-plugin-info.1* +%{_mandir}/man1/kdb-plugin-list.1* %{_mandir}/man1/kdb-remount.1* +%{_mandir}/man1/kdb-reset.1* +%{_mandir}/man1/kdb-reset-elektra.1* %{_mandir}/man1/kdb-restore.1* %{_mandir}/man1/kdb-rm.1* -%{_mandir}/man1/kdb-rmmeta.1* %{_mandir}/man1/kdb-set.1* -%{_mandir}/man1/kdb-setmeta.1* %{_mandir}/man1/kdb-sget.1* %{_mandir}/man1/kdb-shell.1* %{_mandir}/man1/kdb-spec-mount.1* %{_mandir}/man1/kdb-stash.1* +%{_mandir}/man1/kdb-static.1* %{_mandir}/man1/kdb-test.1* %{_mandir}/man1/kdb-umount.1* -%{_mandir}/man1/kdb-vset.1* +%{_mandir}/man1/kdb-umount-all.1* +%{_mandir}/man1/kdb-validate.1* %{_mandir}/man7/elektra-*.7* -%if %{with gen} -%files gen -%defattr(644,root,root,755) -%doc src/tools/gen/README.md -%attr(755,root,root) %{_libdir}/elektra/tool_exec/gen -%{py_sitedir}/elektra_gen-%{version}-py*.egg-info -# FIXME: should be in elektra_gen subdir -%{py_sitedir}/support -%dir %{_datadir}/elektra -%{_datadir}/elektra/templates -%{_mandir}/man1/kdb-gen.1* -%endif - %files gui %defattr(644,root,root,755) %doc src/tools/qt-gui/README.md @@ -877,13 +811,6 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/elektra/libelektra-lua.so %endif -%if %{with python2} -%files plugin-python2 -%defattr(644,root,root,755) -# R: python-libs -%attr(755,root,root) %{_libdir}/elektra/libelektra-python2.so -%endif - %if %{with python3} %files plugin-python3 %defattr(644,root,root,755) @@ -912,36 +839,34 @@ rm -rf $RPM_BUILD_ROOT %files libs %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libelektra.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libelektra.so.4 %attr(755,root,root) %{_libdir}/libelektra-core.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libelektra-core.so.4 +%attr(755,root,root) %ghost %{_libdir}/libelektra-core.so.5 %attr(755,root,root) %{_libdir}/libelektra-ease.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libelektra-ease.so.4 +%attr(755,root,root) %ghost %{_libdir}/libelektra-ease.so.5 %attr(755,root,root) %{_libdir}/libelektra-globbing.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libelektra-globbing.so.4 +%attr(755,root,root) %ghost %{_libdir}/libelektra-globbing.so.5 %attr(755,root,root) %{_libdir}/libelektra-highlevel.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libelektra-highlevel.so.4 +%attr(755,root,root) %ghost %{_libdir}/libelektra-highlevel.so.5 %attr(755,root,root) %{_libdir}/libelektra-invoke.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libelektra-invoke.so.4 +%attr(755,root,root) %ghost %{_libdir}/libelektra-invoke.so.5 %attr(755,root,root) %{_libdir}/libelektra-io.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libelektra-io.so.4 +%attr(755,root,root) %ghost %{_libdir}/libelektra-io.so.5 %attr(755,root,root) %{_libdir}/libelektra-kdb.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libelektra-kdb.so.4 +%attr(755,root,root) %ghost %{_libdir}/libelektra-kdb.so.5 +%attr(755,root,root) %{_libdir}/libelektra-merge.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libelektra-merge.so.5 %attr(755,root,root) %{_libdir}/libelektra-meta.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libelektra-meta.so.4 +%attr(755,root,root) %ghost %{_libdir}/libelektra-meta.so.5 %attr(755,root,root) %{_libdir}/libelektra-notification.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libelektra-notification.so.4 +%attr(755,root,root) %ghost %{_libdir}/libelektra-notification.so.5 %attr(755,root,root) %{_libdir}/libelektra-opts.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libelektra-opts.so.4 +%attr(755,root,root) %ghost %{_libdir}/libelektra-opts.so.5 %attr(755,root,root) %{_libdir}/libelektra-plugin.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libelektra-plugin.so.4 +%attr(755,root,root) %ghost %{_libdir}/libelektra-plugin.so.5 %attr(755,root,root) %{_libdir}/libelektra-pluginprocess.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libelektra-pluginprocess.so.4 -%attr(755,root,root) %{_libdir}/libelektra-proposal.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libelektra-proposal.so.4 +%attr(755,root,root) %ghost %{_libdir}/libelektra-pluginprocess.so.5 %attr(755,root,root) %{_libdir}/libelektra-utility.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libelektra-utility.so.4 +%attr(755,root,root) %ghost %{_libdir}/libelektra-utility.so.5 %attr(755,root,root) %{_libdir}/libelektraintercept-env.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libelektraintercept-env.so.0 %attr(755,root,root) %{_libdir}/libelektraintercept-fs.so @@ -949,13 +874,12 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %ghost %{_libdir}/libelektratools.so.2 %if %{with full} %attr(755,root,root) %{_libdir}/libelektra-full.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libelektra-full.so.4 +%attr(755,root,root) %ghost %{_libdir}/libelektra-full.so.5 %endif %files devel %defattr(644,root,root,755) %doc doc/API.md installed-doc/elektra-api/html -%attr(755,root,root) %{_libdir}/libelektra.so %attr(755,root,root) %{_libdir}/libelektra-core.so %attr(755,root,root) %{_libdir}/libelektra-ease.so %attr(755,root,root) %{_libdir}/libelektra-globbing.so @@ -964,11 +888,11 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/libelektra-io.so %attr(755,root,root) %{_libdir}/libelektra-kdb.so %attr(755,root,root) %{_libdir}/libelektra-meta.so +%attr(755,root,root) %{_libdir}/libelektra-merge.so %attr(755,root,root) %{_libdir}/libelektra-notification.so %attr(755,root,root) %{_libdir}/libelektra-opts.so %attr(755,root,root) %{_libdir}/libelektra-plugin.so %attr(755,root,root) %{_libdir}/libelektra-pluginprocess.so -%attr(755,root,root) %{_libdir}/libelektra-proposal.so %attr(755,root,root) %{_libdir}/libelektra-utility.so %attr(755,root,root) %{_libdir}/libelektragetenv.so %attr(755,root,root) %{_libdir}/libelektraintercept-env.so @@ -981,14 +905,18 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/elektra/elektra.h %{_includedir}/elektra/elektra %{_includedir}/elektra/kdb.h -%{_includedir}/elektra/kdbconfig.h %{_includedir}/elektra/kdbease.h +%{_includedir}/elektra/kdbendian.h %{_includedir}/elektra/kdbextension.h %{_includedir}/elektra/kdbgetenv.h +%{_includedir}/elektra/kdbglobbing.h +%{_includedir}/elektra/kdbgopts.h %{_includedir}/elektra/kdbhelper.h %{_includedir}/elektra/kdbinvoke.h %{_includedir}/elektra/kdbio.h %dir %{_includedir}/elektra/kdbio +%{_includedir}/elektra/kdbmacros.h +%{_includedir}/elektra/kdbmerge.h %{_includedir}/elektra/kdbmeta.h %{_includedir}/elektra/kdbmodule.h %{_includedir}/elektra/kdbnotification.h @@ -997,38 +925,43 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/elektra/kdbplugin.h %{_includedir}/elektra/kdbpluginprocess.h %{_includedir}/elektra/kdbprivate.h -%{_includedir}/elektra/kdbproposal.h %{_includedir}/elektra/kdbtypes.h %{_includedir}/elektra/kdbutility.h %{_includedir}/elektra/kdbversion.h %{_pkgconfigdir}/elektra.pc +%{_pkgconfigdir}/elektra-codegen.pc %{_pkgconfigdir}/elektra-highlevel.pc %{_pkgconfigdir}/elektra-io.pc +%{_pkgconfigdir}/elektra-merge.pc %{_pkgconfigdir}/elektra-notification.pc %{_datadir}/cmake/Modules/ElektraConfig*.cmake %{_datadir}/cmake/Modules/ElektraTargetsLibelektra*.cmake # FIXME: x86_64 doxygen uses lower case, while the other use upper, needs investigation %{_mandir}/man3/[Ii]nvoke.3elektra* %{_mandir}/man3/Opmphm*.3elektra* -%{_mandir}/man3/api.3elektra* +%{_mandir}/man3/backends.c.3elektra* +%{_mandir}/man3/contracts.c.3elektra* +%{_mandir}/man3/conversion.c.3elektra* %{_mandir}/man3/conversion.h.3elektra* +%{_mandir}/man3/cow.c.3elektra* %{_mandir}/man3/dbus.c.3elektra* %{_mandir}/man3/dbus.h.3elektra* %{_mandir}/man3/deprecated.3elektra* %{_mandir}/man3/elektra.c.3elektra* %{_mandir}/man3/elektra.h.3elektra* %{_mandir}/man3/elektra_array_value.c.3elektra* -%{_mandir}/man3/elektra_conversion.c.3elektra* %{_mandir}/man3/elektra_error.c.3elektra* %{_mandir}/man3/elektra_value.c.3elektra* %{_mandir}/man3/error.h.3elektra* +%{_mandir}/man3/errors.c.3elektra* %{_mandir}/man3/ev.h.3elektra* -%{_mandir}/man3/global.c.3elektra* %{_mandir}/man3/globbing.c.3elektra* %{_mandir}/man3/highlevel.3elektra* +%{_mandir}/man3/hooks.c.3elektra* %{_mandir}/man3/invoke.c.3elektra* %{_mandir}/man3/io.c.3elektra* %{_mandir}/man3/io_doc.c.3elektra* +%{_mandir}/man3/hash.c.3elektra* %{_mandir}/man3/kdb.3elektra* %{_mandir}/man3/kdb.c.3elektra* %{_mandir}/man3/kdb_*.3elektra* @@ -1055,8 +988,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/opts.c.3elektra* %{_mandir}/man3/plugin.3elektra* %{_mandir}/man3/pluginprocess.c.3elektra* -%{_mandir}/man3/proposal.3elektra* +%{_mandir}/man3/proposal.c.3elektra* %{_mandir}/man3/rand.c.3elektra* +%{_mandir}/man3/reference.c.3elektra* %{_mandir}/man3/zeromq.c.3elektra* %{_mandir}/man3/zeromq.h.3elektra* @@ -1069,6 +1003,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc src/bindings/cpp/README.md %{_includedir}/elektra/*.hpp +%{_includedir}/elektra/errors %{_includedir}/elektra/helper %{_includedir}/elektra/merging # libelektratools API man pages @@ -1136,17 +1071,15 @@ rm -rf $RPM_BUILD_ROOT %files glib %defattr(644,root,root,755) %doc src/bindings/glib/README.md -%attr(755,root,root) %{_libdir}/libgelektra-4.0.so +%attr(755,root,root) %{_libdir}/libgelektra-5.0.so %if %{with gsettings} %attr(755,root,root) %{_libdir}/gio/modules/libelektrasettings.so %endif -%{_libdir}/girepository-1.0/GElektra-4.0.typelib %files glib-devel %defattr(644,root,root,755) -%{_datadir}/gir-1.0/GElektra-4.0.gir %{_includedir}/elektra/gelektra-*.h -%{_pkgconfigdir}/gelektra-4.0.pc +%{_pkgconfigdir}/gelektra-5.0.pc %endif %files io-glib @@ -1154,6 +1087,16 @@ rm -rf $RPM_BUILD_ROOT %doc src/bindings/io/glib/README.md %attr(755,root,root) %{_libdir}/libelektra-io-glib.so +%files io-ev +%defattr(644,root,root,755) +%doc src/bindings/io/ev/README.md +%attr(755,root,root) %{_libdir}/libelektra-io-ev.so + +%files io-ev-devel +%defattr(644,root,root,755) +%{_includedir}/elektra/kdbio/ev.h +%{_pkgconfigdir}/elektra-io-ev.pc + %files io-glib-devel %defattr(644,root,root,755) %{_includedir}/elektra/kdbio/glib.h @@ -1185,40 +1128,18 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc src/bindings/swig/lua/README.md %attr(755,root,root) %{_libdir}/lua/5.2/kdb.so - -%if %{with glib} -%files -n lua-elektra-glib -%defattr(644,root,root,755) -%doc src/bindings/gi/lua/README.md -%dir %{_datadir}/lua/5.2/lgi -%dir %{_datadir}/lua/5.2/lgi/override -%{_datadir}/lua/5.2/lgi/override/GElektra.lua -%endif -%endif - -%if %{with python2} -%files -n python-elektra -%defattr(644,root,root,755) -%doc src/bindings/swig/python2/README.md -%attr(755,root,root) %{py_sitedir}/_kdb.so -%{py_sitedir}/kdb.py[co] %endif %if %{with python3} %files -n python3-elektra %defattr(644,root,root,755) %doc src/bindings/swig/python/README.md -%attr(755,root,root) %{py3_sitedir}/_kdb.so -%{py3_sitedir}/kdb.py -%{py3_sitedir}/__pycache__/kdb.cpython-*.py[co] - -%if %{with glib} -%files -n python3-elektra-glib -%defattr(644,root,root,755) -%doc src/bindings/gi/python/README.md -%{py3_sitedir}/gi/overrides/GElektra.py -%{py3_sitedir}/gi/overrides/__pycache__/GElektra.cpython-*.py[co] -%endif +%dir %{py3_sitedir}/kdb +%attr(755,root,root) %{py3_sitedir}/kdb/_kdb.so +%attr(755,root,root) %{py3_sitedir}/kdb/_merge.so +%attr(755,root,root) %{py3_sitedir}/kdb/_tools.so +%{py3_sitedir}/kdb/*.py +%{py3_sitedir}/kdb/__pycache__ %endif %if %{with ruby} diff --git a/gcc11.patch b/gcc11.patch deleted file mode 100644 index 84438d6..0000000 --- a/gcc11.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- elektra-0.8.23.orig/src/tools/kdb/cmdline.cpp 2018-05-13 18:57:57.000000000 +0200 -+++ elektra-0.8.23/src/tools/kdb/cmdline.cpp 2021-05-28 00:53:03.152527591 +0200 -@@ -16,6 +16,7 @@ - - #include - #include -+#include - #include - #include - diff --git a/libgit2-detect.patch b/libgit2-detect.patch index 36b5bef..b8b4617 100644 --- a/libgit2-detect.patch +++ b/libgit2-detect.patch @@ -1,11 +1,11 @@ ---- elektra-0.8.26/cmake/Modules/FindLibGit2.cmake.orig 2019-02-26 12:45:46.000000000 +0100 -+++ elektra-0.8.26/cmake/Modules/FindLibGit2.cmake 2023-08-26 23:29:23.468868236 +0200 -@@ -15,7 +15,7 @@ +--- elektra-0.9.14/scripts/cmake/Modules/FindLibGit2.cmake.orig 2023-08-27 09:11:27.128839611 +0200 ++++ elektra-0.9.14/scripts/cmake/Modules/FindLibGit2.cmake 2023-08-27 09:12:15.285245392 +0200 +@@ -15,7 +15,7 @@ find_file (LibGit2_VERSION_HEADER NAMES if (NOT LibGit2_VERSION_HEADER STREQUAL LibGit2_VERSION_HEADER-NOTFOUND) - file (STRINGS ${LibGit2_VERSION_HEADER} - LibGit2_VERSION -- REGEX "#define LIBGIT2_VERSION \".+\"" -+ REGEX "#define[\t ]+LIBGIT2_VERSION[\t ]+\".+\"" - LIMIT_COUNT 1) - string (REGEX - REPLACE ".*\"(.+)\"" + file ( + STRINGS ${LibGit2_VERSION_HEADER} LibGit2_VERSION +- REGEX "#define LIBGIT2_VERSION[ \t]+\".+\"" ++ REGEX "#define[ \t]+LIBGIT2_VERSION[ \t]+\".+\"" + LIMIT_COUNT 1) + string (REGEX REPLACE ".*\"(.+)\"" "\\1" LibGit2_VERSION ${LibGit2_VERSION}) + endif (NOT LibGit2_VERSION_HEADER STREQUAL LibGit2_VERSION_HEADER-NOTFOUND)