diff --git a/.cvsignore b/.cvsignore index 6be1abc..f61ee22 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -meld-1.3.0.tar.bz2 +meld-1.3.1.tar.bz2 diff --git a/import.log b/import.log new file mode 100644 index 0000000..efc541a --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +meld-1_3_1-2_fc14:EL-6:meld-1.3.1-2.fc14.src.rpm:1278622748 diff --git a/meld.spec b/meld.spec index 3816353..1ef9d11 100644 --- a/meld.spec +++ b/meld.spec @@ -1,12 +1,12 @@ Name: meld -Version: 1.3.0 +Version: 1.3.1 Release: 2%{?dist} Summary: Visual diff and merge tool Group: Development/Tools License: GPLv2+ URL: http://meld.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/gnome/sources/meld/1.3/%{name}-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.3/%{name}-%{version}.tar.bz2 Patch1: %{name}-scrollkeeper.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -20,9 +20,6 @@ Requires: pygtk2 >= 2.8.0 Requires: pygtk2-libglade Requires: pygobject2 >= 2.8.0 -Requires(post): scrollkeeper -Requires(postun): scrollkeeper - BuildArch: noarch %description @@ -57,31 +54,25 @@ desktop-file-install --vendor fedora \ %find_lang %{name} -%post -scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : - - -%postun -scrollkeeper-update -q || : - - -%clean -rm -rf ${RPM_BUILD_ROOT} - - %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/applications/fedora-%{name}.desktop -%{_datadir}/application-registry/%{name}* %{_datadir}/pixmaps/%{name}.png %{_datadir}/gnome/help/%{name}/ %{_datadir}/omf/%{name}/ %changelog +* Sun Apr 25 2010 Brian Pepple - 1.3.1-2 +- Remove clean section. No longer needed. + +* Wed Jan 6 2010 Brian Pepple - 1.3.1-1 +- Update to 1.3.1. +- Remove scrollkeeper scriptlets since they are no longer needed. + * Sat Jul 25 2009 Fedora Release Engineering - 1.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 1e5eb5c..ace2bb2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8f8eaabfb398cb59e7cb51284003f552 meld-1.3.0.tar.bz2 +05885811cf0bccc051c3f44938ff54ed meld-1.3.1.tar.bz2