rpms/meld/FC-4 .cvsignore, 1.6, 1.7 meld.spec, 1.11, 1.12 sources, 1.6, 1.7 meld-1.0.0-fedora-162403.patch, 1.1, NONE meld-1.0.0-po_fr.patch, 1.1, NONE

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/meld/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3359

Modified Files:
	.cvsignore meld.spec sources 
Removed Files:
	meld-1.0.0-fedora-162403.patch meld-1.0.0-po_fr.patch 
Log Message:
sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/meld/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Aug 2005 12:55:39 -0000	1.6
+++ .cvsignore	15 Jan 2006 11:33:23 -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/FC-4/meld.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- meld.spec	20 Aug 2005 12:55:39 -0000	1.11
+++ meld.spec	15 Jan 2006 11:33:23 -0000	1.12
@@ -1,15 +1,13 @@
 Name:             meld
-Version:          1.0.0
-Release:          0.1%{?dist}
+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
-Patch2:           meld-1.0.0-fedora-162403.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    desktop-file-utils
@@ -38,8 +36,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .desktop
-%patch1 -p1 -b .po_fr
-%patch2 -p1 -b .fedora-162403
 
 
 %build
@@ -86,9 +82,8 @@
 
 
 %changelog
-* Sat Aug 20 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.0-0.1
-- Work around missing gnome-python2-gnomeprint dependency in
-  gnome-python2-gtksourceview package for FC4 and FC3 (#162403).
+* 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.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/meld/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Aug 2005 12:55:39 -0000	1.6
+++ sources	15 Jan 2006 11:33:23 -0000	1.7
@@ -1 +1 @@
-ccde817f0396d39e9e40f31a3a7611f6  meld-1.0.0.tar.bz2
+a00473f852c32db0bcd48c84b0f27869  meld-1.1.2.tar.bz2


--- meld-1.0.0-fedora-162403.patch DELETED ---


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