From ef528ab5a3e0ba8636a602f3fff2ff32ce5fbbb4 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 01:19:30 +0100 Subject: [PATCH] update to 1.8.1 [release 1.8.1-1mamba;Thu Aug 15 2019] --- kdiff3.spec | 62 +++++++++++++++++++---------------------------------- 1 file changed, 22 insertions(+), 40 deletions(-) diff --git a/kdiff3.spec b/kdiff3.spec index af3bdc6..508e6fb 100644 --- a/kdiff3.spec +++ b/kdiff3.spec @@ -1,5 +1,5 @@ Name: kdiff3 -Version: 0.9.98 +Version: 1.8.1 Release: 1mamba Summary: A graphical text difference analyzer for up to 3 input files Group: Graphical Desktop/Applications/Development @@ -7,13 +7,13 @@ Vendor: openmamba Distribution: openmamba Packager: Stefano Cotta Ramusino URL: http://kdiff3.sourceforge.net/ -Source: http://downloads.sourceforge.net/project/kdiff3/kdiff3/%{version}/kdiff3-%{version}.tar.gz +Source: https://download.kde.org/stable/kdiff3/kdiff3-%{version}.tar.xz +#Source: http://downloads.sourceforge.net/project/kdiff3/kdiff3/%{version}/kdiff3-%{version}.tar.gz License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: kdelibs4-devel BuildRequires: libgcc -BuildRequires: libqt4-devel +BuildRequires: libqt5-devel BuildRequires: libstdc++6-devel ## AUTOBUILDREQ-END BuildRequires: cmake @@ -41,57 +41,39 @@ KDiff3 is a program that: %setup -q %build -%cmake_kde4 -d build +%cmake_kde5 -d build %make %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %makeinstall -C build -# install desktop file -desktop-file-install \ - --vendor="" \ - --add-category="Qt" \ - --add-category="KDE" \ - --add-category="Development" \ - --dir %{buildroot}%{_kde4_xdgappsdir} \ - %{buildroot}%{_kde4_xdgappsdir}/kdiff3.desktop - -%find_lang %{name} \ - --all-name - -# replace absolute symlinks with relative ones -if [ -d %{buildroot}%{_kde4_docdir}/HTML ]; then -for langdir in %{buildroot}%{_kde4_docdir}/HTML/* ; do - if [ -d $langdir ]; then - lang=$(basename $langdir) - echo "%lang($lang) %{_kde4_docdir}/HTML/$lang/*" >> %{name}.lang - for link in $langdir/*; do - [ -d $link -a -L $link/common ] && rm -f $link/common && ln -sf ../common $link/common - done - fi -done -fi +%find_lang %{name} --all-name --with-html --with-man %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %files -f %{name}.lang %defattr(-,root,root) -%{_kde4_bindir}/kdiff3 -#%{_kde4_libdir}/kde4/libkdiff3*.so -%{_kde4_libdir}/kde4/kdiff3fileitemaction.so -%{_kde4_xdgappsdir}/kdiff3.desktop -%{_kde4_datadir}/kdiff3 -%{_kde4_datadir}/kdiff3part/kdiff3_part.rc -%{_kde4_icondir}/hicolor/*/apps/kdiff3.png -%{_kde4_icondir}/locolor/*/apps/kdiff3.png -%{_kde4_servicesdir}/kdiff3*.desktop -%{_kde4_htmldir}/*/kdiff3 +%{_bindir}/kdiff3 +%{_libdir}/qt5/plugins/kf5/kfileitemaction/kdiff3fileitemaction.so +%{_libdir}/qt5/plugins/kf5/parts/kdiff3part.so +%{_datadir}/applications/org.kde.kdiff3.desktop +%{_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/scalable/apps/kdiff3.svgz +%{_mandir}/man1/kdiff3.1* %doc AUTHORS COPYING -#ChangeLog NEWS README TODO %changelog +* Thu Aug 15 2019 Silvan Calarco 1.8.1-1mamba +- update to 1.8.1 + * Sat Jul 05 2014 Automatic Build System 0.9.98-1mamba - automatic version update by autodist