|
cvsextras |
4766333 |
Name: meld
|
|
|
9ce7c3d |
Version: 1.0.0
|
|
|
503f57d |
Release: 1%{?dist}
|
|
|
c8a1110 |
Summary: Visual diff and merge tool
|
|
cvsextras |
08cbd91 |
|
|
|
c8a1110 |
Group: Development/Tools
|
|
cvsextras |
4766333 |
License: GPL
|
|
cvsextras |
08cbd91 |
URL: http://meld.sourceforge.net/
|
|
|
9ce7c3d |
Source0: http://ftp.gnome.org/pub/gnome/sources/meld/1.0/meld-%{version}.tar.bz2
|
|
cvsextras |
08cbd91 |
Patch0: desktop.patch
|
|
|
9ce7c3d |
Patch1: meld-1.0.0-po_fr.patch
|
|
cvsextras |
4766333 |
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
cvsextras |
08cbd91 |
|
|
cvsextras |
08cbd91 |
BuildRequires: desktop-file-utils
|
|
|
c8a1110 |
BuildRequires: gettext
|
|
|
c8a1110 |
BuildRequires: intltool
|
|
|
503f57d |
BuildRequires: scrollkeeper
|
|
pcompton |
85747d3 |
Requires: gnome-python2 >= 1.99.14
|
|
cvsextras |
4766333 |
Requires: gnome-python2-canvas
|
|
cvsextras |
4766333 |
Requires: gnome-python2-gconf
|
|
pcompton |
85747d3 |
Requires: pygtk2 >= 1.99.15
|
|
pcompton |
85747d3 |
Requires: pygtk2-libglade
|
|
cvsextras |
08cbd91 |
|
|
|
503f57d |
Requires(post): scrollkeeper
|
|
|
503f57d |
Requires(postun): scrollkeeper
|
|
|
503f57d |
|
|
cvsextras |
4766333 |
BuildArch: noarch
|
|
cvsextras |
4766333 |
|
|
cvsextras |
4766333 |
%description
|
|
cvsextras |
4766333 |
Meld is a GNOME 2 visual diff and merge tool. It integrates especially well
|
|
cvsextras |
4766333 |
with CVS. The diff viewer lets you edit files in place (diffs update
|
|
cvsextras |
4766333 |
dynamically), and a middle column shows detailed changes and allows merges. The
|
|
cvsextras |
4766333 |
margins show location of changes for easy navigation, and it also features a
|
|
cvsextras |
4766333 |
tabbed interface that allows you to open many diffs at once.
|
|
cvsextras |
4766333 |
|
|
cvsextras |
4766333 |
|
|
cvsextras |
4766333 |
%prep
|
|
cvsextras |
4766333 |
%setup -q
|
|
cvsextras |
08cbd91 |
%patch0 -p1 -b .desktop
|
|
|
9ce7c3d |
%patch1 -p1 -b .po_fr
|
|
cvsextras |
4766333 |
|
|
cvsextras |
4766333 |
|
|
cvsextras |
4766333 |
%build
|
|
|
503f57d |
make prefix=%{_prefix} libdir=%{_datadir}
|
|
cvsextras |
4766333 |
|
|
cvsextras |
4766333 |
|
|
cvsextras |
4766333 |
%install
|
|
cvsextras |
4766333 |
rm -rf ${RPM_BUILD_ROOT}
|
|
cvsextras |
4766333 |
|
|
|
503f57d |
make prefix=%{_prefix} libdir=%{_datadir} \
|
|
|
503f57d |
DESTDIR=${RPM_BUILD_ROOT} install
|
|
cvsextras |
4766333 |
|
|
cvsextras |
08cbd91 |
desktop-file-install --vendor fedora \
|
|
cvsextras |
4766333 |
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
|
|
cvsextras |
4766333 |
--add-category X-Fedora \
|
|
|
503f57d |
--delete-original \
|
|
|
503f57d |
${RPM_BUILD_ROOT}%{_datadir}/applications/meld.desktop
|
|
|
503f57d |
|
|
|
503f57d |
%find_lang %{name}
|
|
|
503f57d |
|
|
|
503f57d |
|
|
|
503f57d |
%post
|
|
|
503f57d |
scrollkeeper-update -q || :
|
|
|
503f57d |
|
|
|
503f57d |
|
|
|
503f57d |
%postun
|
|
|
503f57d |
scrollkeeper-update -q || :
|
|
cvsextras |
4766333 |
|
|
cvsextras |
4766333 |
|
|
cvsextras |
4766333 |
%clean
|
|
cvsextras |
4766333 |
rm -rf ${RPM_BUILD_ROOT}
|
|
cvsextras |
4766333 |
|
|
cvsextras |
4766333 |
|
|
|
503f57d |
%files -f %{name}.lang
|
|
cvsextras |
4766333 |
%defattr(-,root,root,-)
|
|
|
c8a1110 |
%doc AUTHORS COPYING
|
|
cvsextras |
4766333 |
%{_bindir}/meld
|
|
|
503f57d |
%{_datadir}/meld/
|
|
cvsextras |
4766333 |
%{_datadir}/applications/fedora-meld.desktop
|
|
|
503f57d |
%{_datadir}/application-registry/%{name}*
|
|
cvsextras |
4766333 |
%{_datadir}/pixmaps/meld.png
|
|
|
503f57d |
%{_datadir}/gnome/help/%{name}/
|
|
|
503f57d |
%{_datadir}/omf/%{name}/
|
|
cvsextras |
4766333 |
|
|
cvsextras |
4766333 |
|
|
cvsextras |
4766333 |
%changelog
|
|
|
9ce7c3d |
* Mon Jul 25 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.0-1
|
|
|
9ce7c3d |
- Update to 1.0.0.
|
|
|
9ce7c3d |
- Include fix for upstream bug #309408.
|
|
|
9ce7c3d |
|
|
|
503f57d |
* Wed Jun 8 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.6-1
|
|
|
503f57d |
- Remove unused meld shell script from src.rpm.
|
|
|
503f57d |
- Add scriptlets for scrollkeeper-update.
|
|
|
503f57d |
- Use %%find_lang macro.
|
|
|
503f57d |
- Simplify %%install (let included Makefile do the installation).
|
|
|
503f57d |
- Update to 0.9.6 (fixes manual).
|
|
|
503f57d |
- BR scrollkeeper (#156235).
|
|
|
503f57d |
|
|
|
503f57d |
* Thu Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.5-2
|
|
|
b933e45 |
- rebuilt
|
|
|
b933e45 |
|
|
pcompton |
f5ae160 |
* Sun Feb 06 2005 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.9.5-1
|
|
pcompton |
f5ae160 |
- 0.9.5.
|
|
pcompton |
f5ae160 |
|
|
pcompton |
85747d3 |
* Thu Nov 11 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.9.4.1-0.fdr.3
|
|
pcompton |
85747d3 |
- Clean up spec/Bump release.
|
|
pcompton |
85747d3 |
|
|
cvsextras |
08cbd91 |
* Sat Jul 31 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.9.4.1-0.fdr.2
|
|
cvsextras |
08cbd91 |
- Group now Development/Tools.
|
|
cvsextras |
08cbd91 |
|
|
cvsextras |
08cbd91 |
* Wed Jul 21 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.9.4.1-0.fdr.1
|
|
cvsextras |
08cbd91 |
- Updated to 0.9.4.1.
|
|
cvsextras |
08cbd91 |
|
|
cvsextras |
08cbd91 |
* Fri May 28 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.9.3-0.fdr.1
|
|
cvsextras |
08cbd91 |
- Updated to 0.9.3.
|
|
cvsextras |
08cbd91 |
|
|
cvsextras |
08cbd91 |
* Wed Apr 07 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.9.2.1-0.fdr.2
|
|
cvsextras |
08cbd91 |
- BuildReqs intltool & gettext (#1459).
|
|
cvsextras |
08cbd91 |
|
|
cvsextras |
08cbd91 |
* Tue Apr 06 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.9.2.1-0.fdr.1
|
|
cvsextras |
08cbd91 |
- Updated to 0.9.2.1.
|
|
cvsextras |
08cbd91 |
|
|
cvsextras |
08cbd91 |
* Thu Dec 04 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.9.1-0.fdr.2
|
|
cvsextras |
08cbd91 |
- Include translations.
|
|
cvsextras |
08cbd91 |
|
|
cvsextras |
08cbd91 |
* Sat Nov 22 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.9.1-0.fdr.1
|
|
cvsextras |
08cbd91 |
- Updated to 0.9.1.
|
|
cvsextras |
08cbd91 |
|
|
cvsextras |
08cbd91 |
* Thu Oct 23 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.9.0-0.fdr.2
|
|
cvsextras |
08cbd91 |
- Reuire pygtk2 >= 0:1.99.15.
|
|
cvsextras |
08cbd91 |
|
|
cvsextras |
08cbd91 |
* Sun Oct 12 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.9.0-0.fdr.1
|
|
cvsextras |
08cbd91 |
- Updated to 0.9.0.
|
|
cvsextras |
08cbd91 |
|
|
cvsextras |
4766333 |
* Mon Sep 01 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.8.5-0.fdr.1
|
|
cvsextras |
4766333 |
- Updated to 0.8.5.
|
|
cvsextras |
4766333 |
|
|
cvsextras |
4766333 |
* Wed Aug 13 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.8.4-0.fdr.3
|
|
cvsextras |
4766333 |
- dropped tidyxml.py.
|
|
cvsextras |
4766333 |
|
|
cvsextras |
4766333 |
* Mon Aug 11 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.8.4-0.fdr.2
|
|
cvsextras |
4766333 |
- Moved manual so the help feature will work.
|
|
cvsextras |
4766333 |
|
|
cvsextras |
4766333 |
* Thu Jul 31 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.8.4-0.fdr.1
|
|
cvsextras |
4766333 |
- Updated to 0.8.4.
|
|
cvsextras |
4766333 |
- now install files under %%{_datadir} rather than %%{_libdir}.
|
|
cvsextras |
4766333 |
|
|
cvsextras |
4766333 |
* Wed May 28 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.8.1-0.fdr.3
|
|
cvsextras |
4766333 |
- Package now contains verifiable source.
|
|
cvsextras |
4766333 |
|
|
cvsextras |
4766333 |
* Tue May 27 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.8.1-0.fdr.2
|
|
cvsextras |
4766333 |
- Cleaned out libdir/meld.
|
|
cvsextras |
4766333 |
- fixed file permissions.
|
|
cvsextras |
4766333 |
|
|
cvsextras |
4766333 |
* Sun May 25 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.8.1-0.fdr.1
|
|
cvsextras |
4766333 |
- Updated to 0.8.1.
|
|
cvsextras |
4766333 |
- buildroot -> RPM_BUILD_ROOT.
|
|
cvsextras |
4766333 |
|
|
cvsextras |
4766333 |
* Wed Apr 16 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.7.1-0.fdr.1
|
|
cvsextras |
4766333 |
- Updated to 0.7.1.
|
|
cvsextras |
4766333 |
|
|
cvsextras |
4766333 |
* Wed Apr 09 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.7.0-0.fdr.3
|
|
cvsextras |
4766333 |
- Updated Requires.
|
|
cvsextras |
4766333 |
|
|
cvsextras |
4766333 |
* Tue Apr 01 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.7.0-0.fdr.2
|
|
cvsextras |
4766333 |
- Changed category to X-Fedora-Extra.
|
|
cvsextras |
4766333 |
- Added desktop-file-utils to BuildRequires.
|
|
cvsextras |
4766333 |
- Added missing Requires fields.
|
|
cvsextras |
4766333 |
- Added Epoch:0.
|
|
cvsextras |
4766333 |
|
|
cvsextras |
4766333 |
* Thu Mar 27 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.7.0-0.fdr.1
|
|
cvsextras |
4766333 |
- Initial RPM release.
|