8c9a531
Name:           kdiff3
fa85a4e
Version:        0.9.98
26897e6
Release:        12%{?dist}
3de92d5
Summary:        Compare + merge 2 or 3 files or directories
3de92d5
561b40e
License:        GPLv2
3de92d5
URL:            http://kdiff3.sourceforge.net/
47e9078
Source0:        http://downloads.sourceforge.net/sourceforge/kdiff3/%{name}-%{version}.tar.gz
1134f81
Rex Dieter 2a66ec2
## upstreamable patches
Rex Dieter 2a66ec2
# use standard install prefix for Qt-only build, docs disabled (doesn't work, no index.html)
Rex Dieter 2a66ec2
Patch1: kdiff3-0.9.98-install_prefix.patch
Rex Dieter 2a66ec2
ff49e2e
BuildRequires:  desktop-file-utils
ff49e2e
BuildRequires:  gettext
ff49e2e
BuildRequires:  kdelibs4-devel
Rex Dieter dcdc8ae
# consider Requires: kde-runtime instead -- rex
8181d2a
Requires:  oxygen-icon-theme
3de92d5
Rex Dieter 7005f62
# https://bugzilla.redhat.com/show_bug.cgi?id=990447
Rex Dieter 7005f62
Provides: mergetool
Rex Dieter 7005f62
3de92d5
%description
3de92d5
KDiff3 is a program that
3de92d5
- compares and merges two or three input files or directories,
3de92d5
- shows the differences line by line and character by character (!),
3de92d5
- provides an automatic merge-facility and
3de92d5
- an integrated editor for comfortable solving of merge-conflicts
3de92d5
- has support for KDE-KIO (ftp, sftp, http, fish, smb)
3de92d5
- and has an intuitive graphical user interface.
3de92d5
Rex Dieter 2a66ec2
%package qt
Rex Dieter 2a66ec2
Summary: Qt-only application to Compare + merge 2 or 3 files or directories
Rex Dieter 2a66ec2
%description qt
Rex Dieter 2a66ec2
kdiff3-qt is a Qt-only program that
Rex Dieter 2a66ec2
- compares and merges two or three input files or directories,
Rex Dieter 2a66ec2
- shows the differences line by line and character by character (!),
Rex Dieter 2a66ec2
- provides an automatic merge-facility and
Rex Dieter 2a66ec2
- an integrated editor for comfortable solving of merge-conflicts
Rex Dieter 2a66ec2
- and has an intuitive graphical user interface.
Rex Dieter 2a66ec2
3de92d5
3de92d5
%prep
d9fd75c
%setup -q -n %{name}-%{version}
ff49e2e
Rex Dieter 2a66ec2
%patch1 -p1 -b .install_prefix
Rex Dieter 2a66ec2
3de92d5
%build
ff49e2e
mkdir -p %{_target_platform}
ff49e2e
pushd %{_target_platform}
ff49e2e
%{cmake_kde4} ..
ff49e2e
popd
3de92d5
1134f81
make %{?_smp_mflags} -C %{_target_platform}
3de92d5
Rex Dieter 2a66ec2
## Qt-only build
Rex Dieter 2a66ec2
mkdir -p %{_target_platform}-qt4
Rex Dieter 2a66ec2
pushd    %{_target_platform}-qt4
Rex Dieter 252593c
%{qmake_qt4} ../src-QT4
Rex Dieter 2a66ec2
popd
Rex Dieter 2a66ec2
make %{?_smp_mflags} -C %{_target_platform}-qt4
Rex Dieter 2a66ec2
3de92d5
3de92d5
%install
Rex Dieter 2a66ec2
make -C %{_target_platform}-qt4 install INSTALL_ROOT=$RPM_BUILD_ROOT
Rex Dieter 2a66ec2
# rename binary so it doesn't conflict with kde version
Rex Dieter 2a66ec2
mv $RPM_BUILD_ROOT%{_bindir}/kdiff3 $RPM_BUILD_ROOT%{_bindir}/kdiff3-qt
Rex Dieter 2a66ec2
ff49e2e
make -C %{_target_platform} install/fast DESTDIR=$RPM_BUILD_ROOT
3de92d5
3de92d5
# locale's
Rex Dieter dcdc8ae
%find_lang %{name} --with-kde --all-name
4887cb3
3de92d5
# Desktop.
ff49e2e
desktop-file-install  --vendor="" \
ff49e2e
    --dir=$RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4  \
ff49e2e
    --add-category=Development \
ad2883e
        $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4/kdiff3.desktop
3de92d5
Rex Dieter 8fe6dbe
# manpage
Rex Dieter 8fe6dbe
install -D -m644 -p doc/en/kdiff3.1 $RPM_BUILD_ROOT%{_mandir}/man1/kdiff3.1
Rex Dieter 8fe6dbe
ff49e2e
3de92d5
%post
1134f81
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
1134f81
touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null || :
3de92d5
3de92d5
%postun
1134f81
if [ $1 -eq 0 ] ; then
1134f81
  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
1134f81
  touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null || :
1134f81
  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
1134f81
  gtk-update-icon-cache %{_kde4_iconsdir}/locolor &> /dev/null || :
1134f81
  update-desktop-database -q &> /dev/null
1134f81
fi
1134f81
1134f81
%posttrans
1134f81
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
1134f81
gtk-update-icon-cache %{_kde4_iconsdir}/locolor &> /dev/null || :
1134f81
update-desktop-database -q &> /dev/null
ff49e2e
3de92d5
%files -f %{name}.lang
3de92d5
%doc AUTHORS COPYING ChangeLog README TODO
Rex Dieter dcdc8ae
%license COPYING
ff49e2e
%{_kde4_bindir}/kdiff3
713414f
%{_kde4_libdir}/kde4/kdiff3fileitemaction.so
1134f81
%{_kde4_datadir}/applications/kde4/*.desktop
ff49e2e
%{_kde4_appsdir}/kdiff3/
e38a2f3
%{_kde4_appsdir}/kdiff3part/
Rex Dieter dcdc8ae
%{_kde4_iconsdir}/hicolor/*/*/kdiff3.*
Rex Dieter dcdc8ae
%{_kde4_iconsdir}/locolor/*/*/kdiff3.*
ff49e2e
%{_kde4_datadir}/kde4/services/kdiff3*.desktop
Rex Dieter 8fe6dbe
%{_mandir}/man1/kdiff3.1*
ff49e2e
Rex Dieter 2a66ec2
%files qt
Rex Dieter dcdc8ae
%license COPYING
Rex Dieter 2a66ec2
%{_bindir}/kdiff3-qt
Rex Dieter 2a66ec2
3de92d5
%changelog
26897e6
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.98-12
26897e6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
26897e6
f29b88b
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.98-11
f29b88b
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
f29b88b
1d71e9a
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.98-10
1d71e9a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
1d71e9a
Rex Dieter dcdc8ae
* Mon Feb 20 2017 Rex Dieter <rdieter@fedoraproject.org> - 0.9.98-9
Rex Dieter dcdc8ae
- fix FTBFS (#1423810), .spec cleanup
Rex Dieter dcdc8ae
7504adf
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.98-8
7504adf
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
7504adf
Rex Dieter 252593c
* Wed Feb 03 2016 Rex Dieter <rdieter@fedoraproject.org> - 0.9.98-7
Rex Dieter 252593c
- use %%qmake_qt4 macro to ensure proper build flags
Rex Dieter 252593c
55d9c62
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.98-6
55d9c62
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
55d9c62
96a1f69
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 0.9.98-5
96a1f69
- Rebuilt for GCC 5 C++11 ABI change
96a1f69
Rex Dieter 2a66ec2
* Tue Sep 16 2014 Rex Dieter <rdieter@fedoraproject.org> 0.9.98-4
Rex Dieter 2a66ec2
- -qt subpkg, Qt-only build (#746663)
Rex Dieter 2a66ec2
Rex Dieter 7005f62
* Tue Sep 16 2014 Rex Dieter <rdieter@fedoraproject.org> - 0.9.98-3
Rex Dieter 7005f62
- Provides: mergetool (#990447)
Rex Dieter 7005f62
- .spec cleanup
Rex Dieter 8fe6dbe
- install manpage
Rex Dieter 7005f62
d87a3d7
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.98-2
d87a3d7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
d87a3d7
fa85a4e
* Tue Jul  8 2014 nbecker <ndbecker2@gmail.com> - 0.9.98-1
fa85a4e
- Update to 0.9.98
fa85a4e
91c1cf8
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.97-8
91c1cf8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
91c1cf8
f13304a
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.97-7
f13304a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
f13304a
b3cb14b
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.97-6
b3cb14b
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
b3cb14b
e106ded
* Mon Jan 21 2013 Neal Becker <ndbecker2@gmail.com> - 0.9.97-5
e106ded
- bump version to match f17 version
e106ded
9823aa9
* Wed Nov 21 2012 Johan Cwiklinski <johan AT x-tnd DOT be> - 0.9.97-4.trashy
9823aa9
- Fix for saving files on KDE with relative path specified
9823aa9
  via command line option -o.
9823aa9
37dba0d
* Mon Aug 13 2012 Neal Becker <ndbecker2@gmail.com> - 0.9.97-3
37dba0d
- Remove libkdiff3*.so
37dba0d
e364697
* Mon Aug 13 2012 Neal Becker <ndbecker2@gmail.com> - 0.9.97-1
e364697
- Update to 0.9.97
e364697
15dec3f
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.96-8
15dec3f
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
15dec3f
8181d2a
* Fri Feb 24 2012 Neal Becker <ndbecker2@gmail.com> - 0.9.96-6
8181d2a
- Add req: oxygen-icon-theme to close BR 771356
8181d2a
6b0eb14
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.96-6
6b0eb14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
6b0eb14
713414f
* Sat Sep  3 2011 Neal Becker <ndbecker2@gmail.com> - 0.9.96-5
713414f
- added kdiff3fileitemactionplugin
713414f
0dd4340
* Sat Sep  3 2011 Neal Becker <ndbecker2@gmail.com> - 0.9.96-4
0dd4340
- Remove patch2
0dd4340
e0e6055
* Sat Sep  3 2011 Neal Becker <ndbecker2@gmail.com> - 0.9.96-3
e0e6055
- Remove patch1
e0e6055
16cc844
* Sat Sep  3 2011 Neal Becker <ndbecker2@gmail.com> - 0.9.96-2
16cc844
- fix patch
16cc844
8aa3aca
* Sat Sep  3 2011 Neal Becker <ndbecker2@gmail.com> - 0.9.96-1
8aa3aca
- Update to 0.9.96
8aa3aca
bf0a5a8
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.95-6
bf0a5a8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
bf0a5a8
1134f81
* Tue Jul 13 2010 Rex Dieter <rdieter@fedoraproject.org> - 0.9.95-5
1134f81
- ftbfs against kde-4.5 (pre)releases
1134f81
- optimize scriplets
1134f81
- drop HTML doc hackery, use %%find_lang --with-kde
1134f81
a095ee8
* Sun Mar 28 2010 Neal Becker <ndbecker2@gmail.com> - 0.9.95-4
a095ee8
- Install kdiff3_part.rc into correct location
a095ee8
ca20887
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.95-3
ca20887
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
ca20887
5f3beb8
* Wed Mar  4 2009 Neal Becker <ndbecker2@gmail.com> - 0.9.95-2
5f3beb8
- Fix Changelog order
5f3beb8
c3a993d
* Wed Mar  4 2009 Neal Becker <ndbecker2@gmail.com> - 0.9.95-1
c3a993d
- Update to 0.9.95
c3a993d
1940397
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.94-2
1940397
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
1940397
5f3beb8
* Sat Jan 17 2009 Neal Becker <ndbecker2@gmail.com> - 0.9.94-1
5f3beb8
- Update to 0.9.94
5f3beb8
17bfe0c
* Fri Jan  9 2009 Neal Becker <ndbecker2@gmail.com> - 0.9.93-1.3%{?dist}
17bfe0c
- Update to 0.9.93-3
17bfe0c
d9fd75c
* Tue Jan  6 2009 Neal Becker <ndbecker2@gmail.com> - 0.9.93-2-1
d9fd75c
- Update to 0.9.93-2
d9fd75c
ff49e2e
* Tue Jan  6 2009 Rex Dieter <rdieter@fedoraproject.org> - 0.9.93-6
ff49e2e
- use kde4 macros
ff49e2e
- add scriptlets for locolor icons
ff49e2e
- update d-f-i usage
ff49e2e
- include khelpcenter handbook
ff49e2e
- update Source0 URL
ff49e2e
ad2883e
* Tue Jan  6 2009 Neal Becker <ndbecker2@gmail.com> - 0.9.93-5
ad2883e
- Fix HTML_DIR and use kde4_ versions of datadir, libdir, bindir
ad2883e
00d824a
* Tue Jan  6 2009 Neal Becker <ndbecker2@gmail.com> - 0.9.93-4
00d824a
- Remove /etc/profile.d/qt.sh, remove configure
00d824a
5b4f974
* Tue Jan  6 2009 Neal Becker <ndbecker2@gmail.com> - 0.9.93-3
5b4f974
- Change BR, no longer kde3
5b4f974
2f01085
* Tue Jan  6 2009 Neal Becker <ndbecker2@gmail.com> - 0.9.93-2
2f01085
- Add br cmake
2f01085
4887cb3
* Tue Jan  6 2009 Neal Becker <ndbecker2@gmail.com> - 0.9.93-1
4887cb3
- Update to 0.9.93
4887cb3
880ca0f
* Thu Jun 5 2008 Manuel Wolfshant <wolfy@fedoraproject.org> - 0.9.92-14
8e19694
- add a conditional BR, allowing build in EPEL-5
8e19694
59e8415
* Tue Mar 25 2008 Rex Dieter <rdieter@fedoraproject.org> - 0.9.92-13
59e8415
- drop BR: qt-devel (broken)
59e8415
- omit 64bit configure hack (invalid and not needed)
59e8415
a24cfa9
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.9.92-12
a24cfa9
- Autorebuild for GCC 4.3
a24cfa9
6d947e0
* Sun Dec  2 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.92-11
6d947e0
- BR qt-devel
6d947e0
- source /etc/profile.d/qt.sh for mock
6d947e0
a70911a
* Wed Nov  7 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.92-10
a70911a
- Update desktop-file-install as suggest by Rex
a70911a
b78e804
* Wed Nov  7 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.92-8
b78e804
- Use desktop-file-install for kdiff3plugin.desktop
b78e804
561b40e
* Tue Nov  6 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.92-7
561b40e
- Update to 0.9.92
561b40e
- Add /usr/share/applnk/.hidden/kdiff3plugin.desktop
561b40e
7844a2c
* Thu Oct 05 2006 Christian Iseli <Christian.Iseli@licr.org> 0.9.90-7
7844a2c
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
7844a2c
3de92d5
* Sun Aug 27 2006 Neal Becker <ndbecker2@gmail.com> - 0.9.90-6
3de92d5
- Untabify
3de92d5
- --add-category X-Fedora
3de92d5
- Add gtk-update-icon-cache
3de92d5
3de92d5
* Fri May 12 2006 Neal Becker <ndbecker2@gmail.com> - 0.9.88-5
3de92d5
- Remove ldconfig
3de92d5
* Fri May 12 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 0.9.88-5
3de92d5
- Quote percent sign in %%changelog.
3de92d5
- Cleanup in %%files
3de92d5
- Removed Requires: tag.
3de92d5
3de92d5
3de92d5
* Fri May 12 2006 Neal Becker <ndbecker2@gmail.com> - 0.9.88-4
3de92d5
- Remove applnk stuff
3de92d5
- Add %%post + %%postun
3de92d5
3de92d5
* Fri May 12 2006 Neal Becker <ndbecker2@gmail.com> - 0.9.88-3
3de92d5
- Fix symlinks (from Rex Dieter)
3de92d5
3de92d5
* Fri May 12 2006 Neal Becker <ndbecker2@gmail.com> - 0.9.88-2
3de92d5
- Fix source0
3de92d5
- Fix E: kdiff3 standard-dir-owned-by-package /usr/share/icons
3de92d5
  E: kdiff3 standard-dir-owned-by-package /usr/share/man
3de92d5
  E: kdiff3 standard-dir-owned-by-package /usr/share/man/man1
3de92d5
- Fix Summary
3de92d5
3de92d5
* Thu May 11 2006 Neal Becker <ndbecker2@gmail.com> - 0.9.88-1
3de92d5
- Initial
3de92d5