automatic version update by autodist [release 1.11.0-1mamba;Thu Apr 25 2024]

This commit is contained in:
Automatic Build System 2024-04-29 20:52:14 +02:00
parent 0ca27565b8
commit 24caf2820c
2 changed files with 26 additions and 44 deletions

View File

@ -1,10 +0,0 @@
--- kdiff3-1.9.2/src/TypeUtils.h.orig 2022-09-27 12:24:49.310035932 +0200
+++ kdiff3-1.9.2/src/TypeUtils.h 2022-09-27 12:29:03.354625366 +0200
@@ -9,6 +9,7 @@
#include <stdlib.h>
#include <type_traits>
+#include <limits>
#include <QtGlobal>

View File

@ -1,5 +1,5 @@
Name: kdiff3 Name: kdiff3
Version: 1.10.7 Version: 1.11.0
Release: 1mamba Release: 1mamba
Summary: A graphical text difference analyzer for up to 3 input files Summary: A graphical text difference analyzer for up to 3 input files
Group: Graphical Desktop/Applications/Development Group: Graphical Desktop/Applications/Development
@ -8,32 +8,27 @@ Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://apps.kde.org/kdiff3/ URL: https://apps.kde.org/kdiff3/
Source: https://download.kde.org/stable/kdiff3/kdiff3-%{version}.tar.xz Source: https://download.kde.org/stable/kdiff3/kdiff3-%{version}.tar.xz
Patch0: kdiff3-1.9.2-include-limits.patch
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
BuildRequires: libX11-devel
BuildRequires: libgcc BuildRequires: libgcc
BuildRequires: libkauth-devel BuildRequires: libglvnd-devel
BuildRequires: libkcodecs-devel BuildRequires: libkf6-kcolorscheme-devel
BuildRequires: libkcompletion-devel BuildRequires: libkf6-kcompletion-devel
BuildRequires: libkconfig-devel BuildRequires: libkf6-kconfig-devel
BuildRequires: libkconfigwidgets-devel BuildRequires: libkf6-kconfigwidgets-devel
BuildRequires: libkcoreaddons-devel BuildRequires: libkf6-kcoreaddons-devel
BuildRequires: libkcrash-devel BuildRequires: libkf6-kcrash-devel
BuildRequires: libki18n-devel BuildRequires: libkf6-ki18n-devel
BuildRequires: libkio-devel BuildRequires: libkf6-kio-devel
BuildRequires: libkjobwidgets-devel BuildRequires: libkf6-kjobwidgets-devel
BuildRequires: libkparts-devel BuildRequires: libkf6-kservice-devel
BuildRequires: libkservice-devel BuildRequires: libkf6-kwidgetsaddons-devel
BuildRequires: libktextwidgets-devel BuildRequires: libkf6-kxmlgui-devel
BuildRequires: libkwidgetsaddons-devel BuildRequires: libkf6-solid-devel
BuildRequires: libkwindowsystem-devel
BuildRequires: libkxmlgui-devel
BuildRequires: libsolid-devel
BuildRequires: libsonnet-devel
BuildRequires: libstdc++6-devel BuildRequires: libstdc++6-devel
BuildRequires: qt5-qtbase-devel BuildRequires: qt6-qt5compat-devel
BuildRequires: qt6-qtbase-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRequires: cmake BuildRequires: cmake
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
@ -59,15 +54,15 @@ KDiff3 is a program that:
%prep %prep
%setup -q %setup -q
#%patch0 -p1
%build %build
%cmake_kde5 -d build %cmake_kf6
%make
%cmake_build
%install %install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%makeinstall -C build %cmake_install
%find_lang %{name} --all-name --with-html --with-man %find_lang %{name} --all-name --with-html --with-man
@ -77,21 +72,18 @@ KDiff3 is a program that:
%files -f %{name}.lang %files -f %{name}.lang
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/kdiff3 %{_bindir}/kdiff3
%{_libdir}/qt5/plugins/kf5/kfileitemaction/kdiff3fileitemaction.so %{_kf6_plugindir}/kfileitemaction/kdiff3fileitemaction.so
%{_libdir}/qt5/plugins/kf5/parts/kdiff3part.so
%{_datadir}/applications/org.kde.kdiff3.desktop %{_datadir}/applications/org.kde.kdiff3.desktop
%{_datadir}/metainfo/org.kde.kdiff3.appdata.xml %{_datadir}/metainfo/org.kde.kdiff3.appdata.xml
%{_datadir}/kservices5/kdiff3part.desktop
%dir %{_datadir}/kxmlgui5/kdiff3
%{_datadir}/kxmlgui5/kdiff3/kdiff3_shell.rc
%dir %{_datadir}/kxmlgui5/kdiff3part
%{_datadir}/kxmlgui5/kdiff3part/kdiff3_part.rc
%{_datadir}/icons/hicolor/*/apps/kdiff3.png %{_datadir}/icons/hicolor/*/apps/kdiff3.png
%{_datadir}/icons/hicolor/scalable/apps/kdiff3.svgz %{_datadir}/icons/hicolor/scalable/apps/kdiff3.svgz
%{_mandir}/man1/kdiff3.1* %{_mandir}/man1/kdiff3.1*
%doc AUTHORS COPYING %doc COPYING
%changelog %changelog
* Thu Apr 25 2024 Automatic Build System <autodist@openmamba.org> 1.11.0-1mamba
- automatic version update by autodist
* Mon Dec 11 2023 Automatic Build System <autodist@mambasoft.it> 1.10.7-1mamba * Mon Dec 11 2023 Automatic Build System <autodist@mambasoft.it> 1.10.7-1mamba
- automatic version update by autodist - automatic version update by autodist