rpms/meld/FC-5 .cvsignore, 1.8, 1.9 meld.spec, 1.15, 1.16 sources, 1.8, 1.9

[Brian Pepple (bpepple)]

Author: bpepple

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

Modified Files:
	.cvsignore meld.spec sources 
Log Message:
* Sun Jun 11 2006 Brian Pepple <bdpepple at ameritech.net> - 1.1.4-2
- Update to 1.1.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/meld/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	5 Feb 2006 21:31:07 -0000	1.8
+++ .cvsignore	11 Jun 2006 15:09:18 -0000	1.9
@@ -1 +1 @@
-meld-1.1.3.tar.bz2
+meld-1.1.4.tar.bz2


Index: meld.spec
===================================================================
RCS file: /cvs/extras/rpms/meld/FC-5/meld.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- meld.spec	16 Feb 2006 16:36:59 -0000	1.15
+++ meld.spec	11 Jun 2006 15:09:18 -0000	1.16
@@ -1,9 +1,6 @@
-# targeting FC-5
-# spec for FC-4 differs (and could be merged)
-
 Name:             meld
-Version:          1.1.3
-Release:          4%{?dist}
+Version:          1.1.4
+Release:          2%{?dist}
 Summary:          Visual diff and merge tool
 
 Group:            Development/Tools
@@ -40,7 +37,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .desktop
-%patch1 -p1 -b .scrollkeepe
+%patch1 -p1 -b .scrollkeeper
 
 
 %build
@@ -96,6 +93,9 @@
 
 
 %changelog
+* Sun Jun 11 2006 Brian Pepple <bdpepple at ameritech.net> - 1.1.4-2
+- Update to 1.1.4.
+
 * Thu Feb 16 2006 Brian Pepple <bdpepple at ameritech.net> - 1.1.3-4
 - Remove unnecessary BR (intltool).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/meld/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	5 Feb 2006 21:31:07 -0000	1.8
+++ sources	11 Jun 2006 15:09:18 -0000	1.9
@@ -1 +1 @@
-b958f6b3b5b849607d952f49eb082cba  meld-1.1.3.tar.bz2
+e780a8f67183acf7f51b13aa4a62ac85  meld-1.1.4.tar.bz2