Author: kiesiu Date: Mon May 14 11:53:05 2012 GMT Module: packages Tag: HEAD ---- Log message: - updated to 1.6.0
---- Files affected: packages/meld: meld-desktop.patch (1.8 -> 1.9) , meld.spec (1.65 -> 1.66) ---- Diffs: ================================================================ Index: packages/meld/meld-desktop.patch diff -u packages/meld/meld-desktop.patch:1.8 packages/meld/meld-desktop.patch:1.9 --- packages/meld/meld-desktop.patch:1.8 Sat Oct 16 16:42:07 2010 +++ packages/meld/meld-desktop.patch Mon May 14 13:53:00 2012 @@ -1,11 +1,11 @@ -diff -Nur meld-1.2.1.orig/meld.desktop.in meld-1.2.1.desktop/meld.desktop.in ---- meld-1.2.1.orig/data/meld.desktop.in 2008-11-15 03:39:56.000000000 -0700 -+++ meld-1.2.1.desktop/data/meld.desktop.in 2008-11-23 14:13:02.000000000 -0700 -@@ -7,7 +7,8 @@ +diff -uNr meld-1.6.0.old/data/meld.desktop.in meld-1.6.0/data/meld.desktop.in +--- meld-1.6.0.old/data/meld.desktop.in 2012-04-27 23:09:24.000000000 +0200 ++++ meld-1.6.0/data/meld.desktop.in 2012-05-14 13:50:15.306381836 +0200 +@@ -9,7 +9,8 @@ Type=Application Icon=meld StartupNotify=true --Categories=GNOME;Application;Development; +-Categories=GTK;Development; +Categories=GTK;GNOME;Development; +MimeType=text/x-patch; X-GNOME-Bugzilla-Bugzilla=GNOME ================================================================ Index: packages/meld/meld.spec diff -u packages/meld/meld.spec:1.65 packages/meld/meld.spec:1.66 --- packages/meld/meld.spec:1.65 Wed Mar 23 11:42:58 2011 +++ packages/meld/meld.spec Mon May 14 13:53:00 2012 @@ -5,12 +5,12 @@ Summary: Visual diff and merge tool Summary(pl.UTF-8): Wizualne narzędzie do oglądania i włączania zmian (diff) Name: meld -Version: 1.5.1 +Version: 1.6.0 Release: 1 License: GPL Group: Applications/Text -Source0: http://ftp.gnome.org/pub/GNOME/sources/meld/1.5/%{name}-%{version}.tar.bz2 -# Source0-md5: 387f24c936e2a433ac3dedd298008675 +Source0: http://ftp.gnome.org/pub/GNOME/sources/meld/1.6/%{name}-%{version}.tar.xz +# Source0-md5: c68b78586426d74a939d7f69eb88051e Patch0: %{name}-desktop.patch Patch1: %{name}-GNUmakefile.patch Patch2: %{name}-glob.patch @@ -22,6 +22,8 @@ BuildRequires: rpmbuild(find_lang) >= 1.23 BuildRequires: rpmbuild(macros) >= 1.197 BuildRequires: scrollkeeper +BuildRequires: tar >= 1:1.22 +BuildRequires: xz Requires(post,postun): desktop-file-utils Requires(post,postun): gtk-update-icon-cache Requires(post,postun): scrollkeeper @@ -93,7 +95,6 @@ %files -f %{name}.lang %defattr(644,root,root,755) -%doc AUTHORS %attr(755,root,root) %{_bindir}/%{name} %dir %{py_sitedir}/%{name} %{py_sitedir}/%{name}/*.py[co] @@ -109,6 +110,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.66 2012/05/14 11:53:00 kiesiu +- updated to 1.6.0 + Revision 1.65 2011/03/23 10:42:58 wiget - up to 1.5.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/meld/meld-desktop.patch?r1=1.8&r2=1.9 http://cvs.pld-linux.org/packages/meld/meld.spec?r1=1.65&r2=1.66 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
