BC: java-gnu-classpath; rel 15

[packages/elektra.git] / elektra.spec

diff --git a/elektra.spec b/elektra.spec
index 14fcc52727c7de9963306148efea2237469e10c8..d040cf45fae02c494ff95ccef9eaaf1f1a946e96 100644 (file)
--- a/elektra.spec
+++ b/elektra.spec
@@ -22,13 +22,13 @@
 %undefine      with_gsettings
 %endif
 %if %{without java}
-%undefine      with_java_mvn}
+%undefine      with_java_mvn
 %endif
 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.23
-Release:       12
+Release:       15
 License:       BSD
 Group:         Applications/System
 Source0:       https://www.libelektra.org/ftp/elektra/releases/%{name}-%{version}.tar.gz
@@ -36,6 +36,7 @@ Source0:      https://www.libelektra.org/ftp/elektra/releases/%{name}-%{version}.tar.
 Patch0:                %{name}-zsh.patch
 Patch1:                %{name}-no-markdown.patch
 Patch2:                disable-broken-tests.patch
+Patch3:                gcc11.patch
 URL:           https://www.libelektra.org/
 %if %{with qt}
 BuildRequires: Qt5Core-devel >= 5.3
@@ -93,6 +94,7 @@ BuildRequires:        tcl-devel
 BuildRequires: xerces-c-devel >= 3.0.0
 BuildRequires: yajl-devel
 BuildRequires: yaml-cpp-devel >= 0.5
+BuildConflicts:        java-gnu-classpath
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      mktemp
 # plugins dependencies (move to individual plugin subpackage if created)
@@ -399,7 +401,7 @@ Requires:   %{name}-libs = %{version}-%{release}
 %description io-uv
 Elektra I/O binding using uv.
 
-%description io-glib -l pl.UTF-8
+%description io-uv -l pl.UTF-8
 Wiązanie we/wy Elektry wykorzystujące uv.
 
 %package io-uv-devel
@@ -518,6 +520,7 @@ Wiązanie języka Ruby dla Elektry.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -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 python,%{__python},' scripts/{find-tools,update-infos-status}
@@ -956,7 +959,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/dbus.c.3elektra*
 %{_mandir}/man3/deprecated.3elektra*
 %{_mandir}/man3/global.c.3elektra*
-%{_mandir}/man3/invoke.3elektra*
 %{_mandir}/man3/invoke.c.3elektra*
 %{_mandir}/man3/io.c.3elektra*
 %{_mandir}/man3/io_doc.c.3elektra*