rpms/meld/devel .cvsignore, 1.9, 1.10 meld-scrollkeeper.patch, 1.1, 1.2 meld.spec, 1.20, 1.21 sources, 1.9, 1.10 meld-gettext.patch, 1.1, NONE

[Brian Pepple (bpepple)]

Author: bpepple

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

Modified Files:
	.cvsignore meld-scrollkeeper.patch meld.spec sources 
Removed Files:
	meld-gettext.patch 
Log Message:
* Sat Jun  9 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.1.5-1
- Update to 1.1.5.
- Drop gettext patch.  fixed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/meld/devel/.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	9 Jun 2007 19:47:10 -0000	1.10
@@ -1 +1 @@
-meld-1.1.4.tar.bz2
+meld-1.1.5.tar.bz2

meld-scrollkeeper.patch:

Index: meld-scrollkeeper.patch
===================================================================
RCS file: /cvs/pkgs/rpms/meld/devel/meld-scrollkeeper.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- meld-scrollkeeper.patch	5 Feb 2006 21:31:07 -0000	1.1
+++ meld-scrollkeeper.patch	9 Jun 2007 19:47:10 -0000	1.2
@@ -1,15 +1,7 @@
-diff -ru meld-1.1.3.OLD/help/C/GNUmakefile meld-1.1.3/help/C/GNUmakefile
---- meld-1.1.3.OLD/help/C/GNUmakefile	2006-01-28 16:43:57.000000000 -0500
-+++ meld-1.1.3/help/C/GNUmakefile	2006-02-05 16:04:32.000000000 -0500
-@@ -6,7 +6,6 @@
- XML_DIR_ := $(DESTDIR)$(helpdir)/meld/$(LANG)
- OMF_NAME := meld-$(LANG).omf
- OMF_DIR_ := $(DESTDIR)$(sharedir)/omf/meld
--OMF_STATE:= $(DESTDIR)$(prefix)/var/lib/scrollkeeper
- 
- .PHONY : all
- all $(OMF_NAME).install : $(OMF_NAME)
-@@ -18,7 +17,6 @@
+diff -ur meld-1.1.5.OLD/help/C/GNUmakefile meld-1.1.5/help/C/GNUmakefile
+--- meld-1.1.5.OLD/help/C/GNUmakefile	2007-06-09 13:29:24.000000000 -0400
++++ meld-1.1.5/help/C/GNUmakefile	2007-06-09 15:15:46.000000000 -0400
+@@ -19,7 +19,6 @@
  	install -m 644 meld.xml $(XML_DIR_)/meld.xml
  	install -m 644 figures/*.png $(XML_DIR_)/figures
  	-install -m 644 $< $(OMF_DIR_)/$(OMF_NAME)
@@ -17,7 +9,26 @@
  
  .PHONY : uninstall
  uninstall :
-@@ -27,7 +25,6 @@
+@@ -28,7 +27,6 @@
+ 		$(XML_DIR_)/figures/*.png
+ 	-rmdir $(XML_DIR_)/figures \
+ 		$(XML_DIR_)
+-	-scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
+ 
+ .PHONY : clean
+ clean :
+diff -ur meld-1.1.5.OLD/help/es/GNUmakefile meld-1.1.5/help/es/GNUmakefile
+--- meld-1.1.5.OLD/help/es/GNUmakefile	2007-06-09 13:29:25.000000000 -0400
++++ meld-1.1.5/help/es/GNUmakefile	2007-06-09 15:14:36.000000000 -0400
+@@ -19,7 +19,6 @@
+ 	install -m 644 meld.$(LANG).xml $(XML_DIR_)/meld.xml
+ 	install -m 644 figures/*.png $(XML_DIR_)/figures
+ 	-install -m 644 $< $(OMF_DIR_)/$(OMF_NAME)
+-	-scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
+ 
+ .PHONY : uninstall
+ uninstall :
+@@ -28,7 +27,6 @@
  		$(XML_DIR_)/figures/*.png
  	-rmdir $(XML_DIR_)/figures \
  		$(XML_DIR_)


Index: meld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/meld/devel/meld.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- meld.spec	9 Jun 2007 18:03:50 -0000	1.20
+++ meld.spec	9 Jun 2007 19:47:10 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		meld
-Version:	1.1.4
-Release:	7%{?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
@@ -42,7 +41,6 @@
 %setup -q
 %patch0 -p1 -b .desktop
 %patch1 -p1 -b .scrollkeeper
-%patch2 -p1 -b .gettext
 
 
 %build
@@ -97,6 +95,10 @@
 
 
 %changelog
+* Sat Jun  9 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.1.5-1
+- Update to 1.1.5.
+- Drop gettext patch.  fixed upstream.
+
 * Sat Jun  9 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.1.4-7
 - Add requires on yelp.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/meld/devel/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	9 Jun 2007 19:47:10 -0000	1.10
@@ -1 +1 @@
-e780a8f67183acf7f51b13aa4a62ac85  meld-1.1.4.tar.bz2
+a92e72a3b4392ee3e677720f9a75246f  meld-1.1.5.tar.bz2


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