rpms/meld/devel .cvsignore, 1.6, 1.7 meld.spec, 1.10, 1.11 sources, 1.6, 1.7 meld-1.0.0-po_fr.patch, 1.1, NONE

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/meld/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6954

Modified Files:
	.cvsignore meld.spec sources 
Removed Files:
	meld-1.0.0-po_fr.patch 
Log Message:
* Sun Nov 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.1.2-1
- Update to 1.1.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/meld/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Jul 2005 19:36:58 -0000	1.6
+++ .cvsignore	13 Nov 2005 09:39:53 -0000	1.7
@@ -1 +1 @@
-meld-1.0.0.tar.bz2
+meld-1.1.2.tar.bz2


Index: meld.spec
===================================================================
RCS file: /cvs/extras/rpms/meld/devel/meld.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- meld.spec	25 Jul 2005 19:36:58 -0000	1.10
+++ meld.spec	13 Nov 2005 09:39:53 -0000	1.11
@@ -1,14 +1,13 @@
 Name:             meld
-Version:          1.0.0
+Version:          1.1.2
 Release:          1%{?dist}
 Summary:          Visual diff and merge tool
 
 Group:            Development/Tools
 License:          GPL
 URL:              http://meld.sourceforge.net/
-Source0:          http://ftp.gnome.org/pub/gnome/sources/meld/1.0/meld-%{version}.tar.bz2
+Source0:          http://ftp.gnome.org/pub/gnome/sources/meld/1.1/meld-%{version}.tar.bz2
 Patch0:           desktop.patch
-Patch1:           meld-1.0.0-po_fr.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    desktop-file-utils
@@ -37,7 +36,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .desktop
-%patch1 -p1 -b .po_fr
 
 
 %build
@@ -84,6 +82,9 @@
 
 
 %changelog
+* Sun Nov 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.1.2-1
+- Update to 1.1.2.
+
 * Mon Jul 25 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.0-1
 - Update to 1.0.0.
 - Include fix for upstream bug #309408.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/meld/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Jul 2005 19:36:58 -0000	1.6
+++ sources	13 Nov 2005 09:39:53 -0000	1.7
@@ -1 +1 @@
-ccde817f0396d39e9e40f31a3a7611f6  meld-1.0.0.tar.bz2
+a00473f852c32db0bcd48c84b0f27869  meld-1.1.2.tar.bz2


--- meld-1.0.0-po_fr.patch DELETED ---