Name: kdiff3 Version: 0.9.98 Release: 4%{?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 BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: kdelibs4-devel BuildRequires: kdebase4-devel Requires: oxygen-icon-theme # https://bugzilla.redhat.com/show_bug.cgi?id=990447 Provides: mergetool %description KDiff3 is a 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 - 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} %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 %{_qt4_qmake} ../src-QT4 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 || touch %{name}.lang # 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 || : %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 %files -f %{name}.lang %doc AUTHORS COPYING ChangeLog README TODO %{_kde4_bindir}/kdiff3 %{_kde4_libdir}/kde4/kdiff3fileitemaction.so %{_kde4_datadir}/applications/kde4/*.desktop %{_kde4_appsdir}/kdiff3/ %{_kde4_appsdir}/kdiff3part/ %{_kde4_iconsdir}/hicolor/*/*/kdiff3.png %{_kde4_iconsdir}/locolor/*/*/kdiff3.png %{_kde4_datadir}/kde4/services/kdiff3*.desktop %{_mandir}/man1/kdiff3.1* %files qt %{_bindir}/kdiff3-qt %changelog * Tue Sep 16 2014 Rex Dieter 0.9.98-4 - -qt subpkg, Qt-only build (#746663) * Tue Sep 16 2014 Rex Dieter - 0.9.98-3 - Provides: mergetool (#990447) - .spec cleanup - install manpage * Sat Aug 16 2014 Fedora Release Engineering - 0.9.98-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild * Tue Jul 8 2014 nbecker - 0.9.98-1 - Update to 0.9.98 * Sun Jun 08 2014 Fedora Release Engineering - 0.9.97-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild * Sat Aug 03 2013 Fedora Release Engineering - 0.9.97-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild * Thu Feb 14 2013 Fedora Release Engineering - 0.9.97-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild * Mon Jan 21 2013 Neal Becker - 0.9.97-5 - bump version to match f17 version * Wed Nov 21 2012 Johan Cwiklinski - 0.9.97-4.trashy - Fix for saving files on KDE with relative path specified via command line option -o. * Mon Aug 13 2012 Neal Becker - 0.9.97-3 - Remove libkdiff3*.so * Mon Aug 13 2012 Neal Becker - 0.9.97-1 - Update to 0.9.97 * Thu Jul 19 2012 Fedora Release Engineering - 0.9.96-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild * Fri Feb 24 2012 Neal Becker - 0.9.96-6 - Add req: oxygen-icon-theme to close BR 771356 * Fri Jan 13 2012 Fedora Release Engineering - 0.9.96-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild * Sat Sep 3 2011 Neal Becker - 0.9.96-5 - added kdiff3fileitemactionplugin * Sat Sep 3 2011 Neal Becker - 0.9.96-4 - Remove patch2 * Sat Sep 3 2011 Neal Becker - 0.9.96-3 - Remove patch1 * Sat Sep 3 2011 Neal Becker - 0.9.96-2 - fix patch * Sat Sep 3 2011 Neal Becker - 0.9.96-1 - Update to 0.9.96 * Mon Feb 07 2011 Fedora Release Engineering - 0.9.95-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild * Tue Jul 13 2010 Rex Dieter - 0.9.95-5 - ftbfs against kde-4.5 (pre)releases - optimize scriplets - drop HTML doc hackery, use %%find_lang --with-kde * Sun Mar 28 2010 Neal Becker - 0.9.95-4 - Install kdiff3_part.rc into correct location * Fri Jul 24 2009 Fedora Release Engineering - 0.9.95-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild * Wed Mar 4 2009 Neal Becker - 0.9.95-2 - Fix Changelog order * Wed Mar 4 2009 Neal Becker - 0.9.95-1 - Update to 0.9.95 * Wed Feb 25 2009 Fedora Release Engineering - 0.9.94-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Sat Jan 17 2009 Neal Becker - 0.9.94-1 - Update to 0.9.94 * Fri Jan 9 2009 Neal Becker - 0.9.93-1.3%{?dist} - Update to 0.9.93-3 * Tue Jan 6 2009 Neal Becker - 0.9.93-2-1 - Update to 0.9.93-2 * Tue Jan 6 2009 Rex Dieter - 0.9.93-6 - use kde4 macros - add scriptlets for locolor icons - update d-f-i usage - include khelpcenter handbook - update Source0 URL * Tue Jan 6 2009 Neal Becker - 0.9.93-5 - Fix HTML_DIR and use kde4_ versions of datadir, libdir, bindir * Tue Jan 6 2009 Neal Becker - 0.9.93-4 - Remove /etc/profile.d/qt.sh, remove configure * Tue Jan 6 2009 Neal Becker - 0.9.93-3 - Change BR, no longer kde3 * Tue Jan 6 2009 Neal Becker - 0.9.93-2 - Add br cmake * Tue Jan 6 2009 Neal Becker - 0.9.93-1 - Update to 0.9.93 * Thu Jun 5 2008 Manuel Wolfshant - 0.9.92-14 - add a conditional BR, allowing build in EPEL-5 * Tue Mar 25 2008 Rex Dieter - 0.9.92-13 - drop BR: qt-devel (broken) - omit 64bit configure hack (invalid and not needed) * Tue Feb 19 2008 Fedora Release Engineering - 0.9.92-12 - Autorebuild for GCC 4.3 * Sun Dec 2 2007 Neal Becker - 0.9.92-11 - BR qt-devel - source /etc/profile.d/qt.sh for mock * Wed Nov 7 2007 Neal Becker - 0.9.92-10 - Update desktop-file-install as suggest by Rex * Wed Nov 7 2007 Neal Becker - 0.9.92-8 - Use desktop-file-install for kdiff3plugin.desktop * Tue Nov 6 2007 Neal Becker - 0.9.92-7 - Update to 0.9.92 - Add /usr/share/applnk/.hidden/kdiff3plugin.desktop * Thu Oct 05 2006 Christian Iseli 0.9.90-7 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Sun Aug 27 2006 Neal Becker - 0.9.90-6 - Untabify - --add-category X-Fedora - Add gtk-update-icon-cache * Fri May 12 2006 Neal Becker - 0.9.88-5 - Remove ldconfig * Fri May 12 2006 Laurent Rineau - 0.9.88-5 - Quote percent sign in %%changelog. - Cleanup in %%files - Removed Requires: tag. * Fri May 12 2006 Neal Becker - 0.9.88-4 - Remove applnk stuff - Add %%post + %%postun * Fri May 12 2006 Neal Becker - 0.9.88-3 - Fix symlinks (from Rex Dieter) * Fri May 12 2006 Neal Becker - 0.9.88-2 - Fix source0 - Fix E: kdiff3 standard-dir-owned-by-package /usr/share/icons E: kdiff3 standard-dir-owned-by-package /usr/share/man E: kdiff3 standard-dir-owned-by-package /usr/share/man/man1 - Fix Summary * Thu May 11 2006 Neal Becker - 0.9.88-1 - Initial