diff --git a/.gitignore b/.gitignore index 48dffc6..da863a7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ kdiff3-0.9.95.tar.gz /kdiff3-0.9.97.tar.gz /kdiff3-0.9.97-saving_files.patch /kdiff3-0.9.98.tar.gz +/1902b6e2986279704caf82418b94fb6d2d2b27e4 diff --git a/kdiff3-0.9.98-install_prefix.patch b/kdiff3-0.9.98-install_prefix.patch deleted file mode 100644 index 4f3cd53..0000000 --- a/kdiff3-0.9.98-install_prefix.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up kdiff3-0.9.98/src-QT4/kdiff3.pro.install_prefix kdiff3-0.9.98/src-QT4/kdiff3.pro ---- kdiff3-0.9.98/src-QT4/kdiff3.pro.install_prefix 2014-07-03 06:37:37.000000000 -0500 -+++ kdiff3-0.9.98/src-QT4/kdiff3.pro 2014-09-16 17:53:47.745252576 -0500 -@@ -66,12 +66,12 @@ os2 { - } - - unix { -- documentation.path = /usr/local/share/doc/kdiff3 -+ documentation.path = /usr/share/doc/kdiff3 - documentation.files = ../doc/* - -- INSTALLS += documentation -+ #INSTALLS += documentation - -- target.path = /usr/local/bin -+ target.path = /usr/bin - INSTALLS += target - } - -diff -up kdiff3-0.9.98/src-QT4/kreplacements/kreplacements.cpp.install_prefix kdiff3-0.9.98/src-QT4/kreplacements/kreplacements.cpp ---- kdiff3-0.9.98/src-QT4/kreplacements/kreplacements.cpp.install_prefix 2014-07-03 06:37:37.000000000 -0500 -+++ kdiff3-0.9.98/src-QT4/kreplacements/kreplacements.cpp 2014-09-16 17:53:43.910292281 -0500 -@@ -111,7 +111,7 @@ static void showHelp() - pBrowser = new QTextBrowser( 0 ); - pBrowser->setMinimumSize( 600, 400 ); - } -- pBrowser->setSource(QUrl("file://usr/local/share/doc/kdiff3/en/index.html")); -+ pBrowser->setSource(QUrl("file://usr/share/doc/kdiff3/en/index.html")); - pBrowser->show(); - #endif - } diff --git a/kdiff3.spec b/kdiff3.spec index 63f92cd..08bef6c 100644 --- a/kdiff3.spec +++ b/kdiff3.spec @@ -1,23 +1,32 @@ +%global gitcommit_full 1902b6e2986279704caf82418b94fb6d2d2b27e4 +%global gitcommit %(c=%{gitcommit_full}; echo ${c:0:7}) + Name: kdiff3 -Version: 0.9.98 -Release: 13%{?dist} +Version: 1.7.90 +Release: 1%{?dist} Summary: Compare + merge 2 or 3 files or directories License: GPLv2 -URL: http://kdiff3.sourceforge.net/ -Source0: http://downloads.sourceforge.net/sourceforge/kdiff3/%{name}-%{version}.tar.gz - -## upstreamable patches -# use standard install prefix for Qt-only build, docs disabled (doesn't work, no index.html) -Patch1: kdiff3-0.9.98-install_prefix.patch +URL: https://github.com/KDE/kdiff3 +Source0: https://github.com/KDE/kdiff3/tarball/%{gitcommit_full} +BuildRequires: cmake3 +BuildRequires: gcc-c++ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: kdelibs4-devel -# consider Requires: kde-runtime instead -- rex -Requires: oxygen-icon-theme +BuildRequires: libappstream-glib +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5WidgetsAddons) +BuildRequires: cmake(KF5Parts) +BuildRequires: cmake(KF5IconThemes) +BuildRequires: cmake(KF5DocTools) +BuildRequires: cmake(KF5Crash) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5Bookmarks) +BuildRequires: kf5-rpm-macros +BuildRequires: extra-cmake-modules -# https://bugzilla.redhat.com/show_bug.cgi?id=990447 Provides: mergetool %description @@ -29,94 +38,49 @@ KDiff3 is a program that - has support for KDE-KIO (ftp, sftp, http, fish, smb) - and has an intuitive graphical user interface. -%package qt -Summary: Qt-only application to Compare + merge 2 or 3 files or directories -%description qt -kdiff3-qt is a Qt-only program that -- compares and merges two or three input files or directories, -- shows the differences line by line and character by character (!), -- provides an automatic merge-facility and -- an integrated editor for comfortable solving of merge-conflicts -- and has an intuitive graphical user interface. - %prep -%setup -q -n %{name}-%{version} +%autosetup -n KDE-%{name}-%{gitcommit} -%patch1 -p1 -b .install_prefix %build mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} .. -popd - -make %{?_smp_mflags} -C %{_target_platform} - -## Qt-only build -mkdir -p %{_target_platform}-qt4 -pushd %{_target_platform}-qt4 -%{qmake_qt4} ../src-QT4 + %cmake_kf5 .. + %make_build popd -make %{?_smp_mflags} -C %{_target_platform}-qt4 %install -make -C %{_target_platform}-qt4 install INSTALL_ROOT=$RPM_BUILD_ROOT -# rename binary so it doesn't conflict with kde version -mv $RPM_BUILD_ROOT%{_bindir}/kdiff3 $RPM_BUILD_ROOT%{_bindir}/kdiff3-qt - -make -C %{_target_platform} install/fast DESTDIR=$RPM_BUILD_ROOT - -# locale's -%find_lang %{name} --with-kde --all-name - -# Desktop. -desktop-file-install --vendor="" \ - --dir=$RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4 \ - --add-category=Development \ - $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4/kdiff3.desktop - -# manpage -install -D -m644 -p doc/en/kdiff3.1 $RPM_BUILD_ROOT%{_mandir}/man1/kdiff3.1 - - -%post -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || : -touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null || : +pushd %{_target_platform} + %make_install +popd -%postun -if [ $1 -eq 0 ] ; then - touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null - touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null || : - gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : - gtk-update-icon-cache %{_kde4_iconsdir}/locolor &> /dev/null || : - update-desktop-database -q &> /dev/null -fi -%posttrans -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : -gtk-update-icon-cache %{_kde4_iconsdir}/locolor &> /dev/null || : -update-desktop-database -q &> /dev/null +%check +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/org.kde.%{name}.appdata.xml +desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.%{name}.desktop -%files -f %{name}.lang -%doc AUTHORS COPYING ChangeLog README TODO -%license COPYING -%{_kde4_bindir}/kdiff3 -%{_kde4_libdir}/kde4/kdiff3fileitemaction.so -%{_kde4_datadir}/applications/kde4/*.desktop -%{_kde4_appsdir}/kdiff3/ -%{_kde4_appsdir}/kdiff3part/ -%{_kde4_iconsdir}/hicolor/*/*/kdiff3.* -%{_kde4_iconsdir}/locolor/*/*/kdiff3.* -%{_kde4_datadir}/kde4/services/kdiff3*.desktop -%{_mandir}/man1/kdiff3.1* - -%files qt +%files %license COPYING -%{_bindir}/kdiff3-qt +%doc AUTHORS NEWS README +%{_bindir}/%{name} +%{_kf5_docdir}/HTML/en/%{name} +%{_kf5_plugindir}/kfileitemaction/kdiff3fileitemaction.so +%{_kf5_plugindir}/parts/kdiff3part.so +%{_datadir}/appdata/org.kde.%{name}.appdata.xml +%{_datadir}/applications/org.kde.%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/*.png +%{_datadir}/kservices5/kdiff3part.desktop +%{_datadir}/kxmlgui5/%{name} +%{_datadir}/kxmlgui5/kdiff3part/kdiff3_part.rc +%{_mandir}/man1/%{name}.1.gz + %changelog +* Mon Oct 15 2018 Vasiliy N. Glazov 1.7.90-1 +- Switch to Qt5/KF5 + * Fri Jul 13 2018 Fedora Release Engineering - 0.9.98-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 34df634..d8baaca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b52f99f2cf2ea75ed5719315cbf77446 kdiff3-0.9.98.tar.gz +SHA512 (1902b6e2986279704caf82418b94fb6d2d2b27e4) = d17241c5bf306d92cabf71aad8390623b85f69c6c8ccd5fd6758bb965b2b463ff215230d133f99ea35efc7aa3b99ca859481403fc4e0ec36c642bb70ffda8d3c