rpms/meld/F-7 .cvsignore, 1.9, 1.10 meld.spec, 1.21, 1.22 sources, 1.9, 1.10 meld-gettext.patch, 1.1, NONE

[Brian Pepple (bpepple)]

Author: bpepple

Update of /cvs/pkgs/rpms/meld/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6667

Modified Files:
	.cvsignore meld.spec sources 
Removed Files:
	meld-gettext.patch 
Log Message:
* Wed Jul 18 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.1.5-1
- Update to 1.1.5. Fixed bug #248572.
- Drop gettext patch.  fixed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/meld/F-7/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	11 Jun 2006 14:58:54 -0000	1.9
+++ .cvsignore	18 Jul 2007 16:30:02 -0000	1.10
@@ -1 +1 @@
-meld-1.1.4.tar.bz2
+meld-1.1.5.tar.bz2


Index: meld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/meld/F-7/meld.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- meld.spec	10 Jun 2007 19:17:09 -0000	1.21
+++ meld.spec	18 Jul 2007 16:30:02 -0000	1.22
@@ -1,6 +1,6 @@
 Name:		meld
-Version:	1.1.4
-Release:	8%{?dist}
+Version:	1.1.5
+Release:	1%{?dist}
 Summary:	Visual diff and merge tool
 
 Group:		Development/Tools
@@ -9,7 +9,6 @@
 Source0:	http://ftp.gnome.org/pub/gnome/sources/meld/1.1/meld-%{version}.tar.bz2
 Patch0:		desktop.patch
 Patch1:		%{name}-scrollkeeper.patch
-Patch2:		%{name}-gettext.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -41,7 +40,6 @@
 %setup -q
 %patch0 -p1 -b .desktop
 %patch1 -p1 -b .scrollkeeper
-%patch2 -p1 -b .gettext
 
 
 %build
@@ -96,6 +94,10 @@
 
 
 %changelog
+* Wed Jul 18 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.1.5-1
+- Update to 1.1.5. Fixed bug #248572.
+- Drop gettext patch.  fixed upstream.
+
 * Sun Jun 10 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.1.4-8
 - Drop requires on yelp.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/meld/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	11 Jun 2006 14:58:54 -0000	1.9
+++ sources	18 Jul 2007 16:30:02 -0000	1.10
@@ -1 +1 @@
-e780a8f67183acf7f51b13aa4a62ac85  meld-1.1.4.tar.bz2
+a92e72a3b4392ee3e677720f9a75246f  meld-1.1.5.tar.bz2


--- meld-gettext.patch DELETED ---