rpms/meld/devel .cvsignore, 1.10, 1.11 meld-scrollkeeper.patch, 1.2, 1.3 meld.spec, 1.25, 1.26 sources, 1.10, 1.11 meld-1.1.5-git.patch, 1.1, NONE

Sun Aug 3 15:05:51 UTC 2008

Author: bpepple

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

Modified Files:
	.cvsignore meld-scrollkeeper.patch meld.spec sources 
Removed Files:
	meld-1.1.5-git.patch 
Log Message:
* Sun Aug  3 2008 Brian Pepple <bpepple at fedoraproject.org> - 1.2-1
- Update to 1.2.
- Drop git patch.  fixed upstream.
- Update scrollkeeper patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/meld/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11

--- .cvsignore	9 Jun 2007 19:47:10 -0000	1.10
+++ .cvsignore	3 Aug 2008 15:05:21 -0000	1.11
@@ -1 +1 @@
-meld-1.1.5.tar.bz2
+meld-1.2.tar.bz2

meld-scrollkeeper.patch:

Index: meld-scrollkeeper.patch
===================================================================
RCS file: /cvs/pkgs/rpms/meld/devel/meld-scrollkeeper.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- meld-scrollkeeper.patch	9 Jun 2007 19:47:10 -0000	1.2
+++ meld-scrollkeeper.patch	3 Aug 2008 15:05:21 -0000	1.3
@@ -1,7 +1,7 @@
-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 @@
+diff -urp meld-1.2.OLD/help/C/GNUmakefile meld-1.2/help/C/GNUmakefile
+--- meld-1.2.OLD/help/C/GNUmakefile	2007-02-17 13:40:05.000000000 -0500
++++ meld-1.2/help/C/GNUmakefile	2008-08-03 10:40:06.000000000 -0400
+@@ -19,7 +19,6 @@ install : $(OMF_NAME).install
  	install -m 644 meld.xml $(XML_DIR_)/meld.xml
  	install -m 644 figures/*.png $(XML_DIR_)/figures
  	-install -m 644 $< $(OMF_DIR_)/$(OMF_NAME)
@@ -9,7 +9,7 @@
  
  .PHONY : uninstall
  uninstall :
-@@ -28,7 +27,6 @@
+@@ -28,7 +27,6 @@ uninstall :
  		$(XML_DIR_)/figures/*.png
  	-rmdir $(XML_DIR_)/figures \
  		$(XML_DIR_)
@@ -17,10 +17,10 @@
  
  .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 @@
+diff -urp meld-1.2.OLD/help/es/GNUmakefile meld-1.2/help/es/GNUmakefile
+--- meld-1.2.OLD/help/es/GNUmakefile	2007-02-17 13:40:05.000000000 -0500
++++ meld-1.2/help/es/GNUmakefile	2008-08-03 10:40:32.000000000 -0400
+@@ -19,7 +19,6 @@ install : $(OMF_NAME).install
  	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)
@@ -28,7 +28,7 @@
  
  .PHONY : uninstall
  uninstall :
-@@ -28,7 +27,6 @@
+@@ -28,7 +27,6 @@ uninstall :
  		$(XML_DIR_)/figures/*.png
  	-rmdir $(XML_DIR_)/figures \
  		$(XML_DIR_)
@@ -36,3 +36,26 @@
  
  .PHONY : clean
  clean :
+diff -urp meld-1.2.OLD/help/fr/GNUmakefile meld-1.2/help/fr/GNUmakefile
+--- meld-1.2.OLD/help/fr/GNUmakefile	2008-03-31 16:44:53.000000000 -0400
++++ meld-1.2/help/fr/GNUmakefile	2008-08-03 10:52:07.000000000 -0400
+@@ -17,18 +17,12 @@ all $(OMF_NAME).install : $(OMF_NAME)
+ install : $(OMF_NAME).install
+ 	-mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_) $(XML_DIR_)/figures
+ 	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 :
+ 	-rm -f $(OMF_DIR_)/$(OMF_NAME) \
+-		$(XML_DIR_)/meld.xml \
+-		$(XML_DIR_)/figures/*.png
+-	-rmdir $(XML_DIR_)/figures \
+-		$(XML_DIR_)
+-	-scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
++		$(XML_DIR_)/meld.xml
+ 
+ .PHONY : clean
+ clean :


Index: meld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/meld/devel/meld.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- meld.spec	3 Jun 2008 23:48:36 -0000	1.25
+++ meld.spec	3 Aug 2008 15:05:21 -0000	1.26
@@ -1,6 +1,6 @@
 Name:		meld
-Version:	1.1.5
-Release:	5%{?dist}
+Version:	1.2
+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}-%{version}-git.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 .git
 
 
 %build
@@ -80,15 +78,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{_bindir}/%{name}
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*.py
-%{_datadir}/%{name}/*.pyc
-%{_datadir}/%{name}/*.pyo
-%dir %{_datadir}/%{name}/vc
-%{_datadir}/%{name}/vc/*.py
-%{_datadir}/%{name}/vc/*.pyc
-%{_datadir}/%{name}/vc/*.pyo
-%{_datadir}/%{name}/glade2/
+%{_datadir}/%{name}/
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/application-registry/%{name}*
 %{_datadir}/pixmaps/%{name}.png
@@ -97,6 +87,11 @@
 
 
 %changelog
+* Sun Aug  3 2008 Brian Pepple <bpepple at fedoraproject.org> - 1.2-1
+- Update to 1.2.
+- Drop git patch.  fixed upstream.
+- Update scrollkeeper patch.
+
 * Tue Jun  3 2008 Brian Pepple <bpepple at fedoraproject.org> - 1.1.5-5
 - Backport git support (#449250).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/meld/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	9 Jun 2007 19:47:10 -0000	1.10
+++ sources	3 Aug 2008 15:05:21 -0000	1.11
@@ -1 +1 @@
-a92e72a3b4392ee3e677720f9a75246f  meld-1.1.5.tar.bz2
+08e047ab4c8a8ae383674fcddde9fb87  meld-1.2.tar.bz2


--- meld-1.1.5-git.patch DELETED ---


