[meld] - Update to 1.4.0. - Update source url.
Brian Pepple
bpepple at fedoraproject.org
Thu Oct 21 01:31:09 UTC 2010
commit 145d0fad9ab9dccddaf5bf238fa58cbcdb4592ff
Author: Brian Pepple <bpepple at fedoraproject.org>
Date: Wed Oct 20 21:32:30 2010 -0400
- Update to 1.4.0.
- Update source url.
.gitignore | 1 +
meld-scrollkeeper.patch | 54 ++++++++++++++++++++---------------------------
meld.spec | 8 +++++-
sources | 2 +-
4 files changed, 31 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fcc0d0d..7f512cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
meld-1.3.1.tar.bz2
/meld-1.3.2.tar.bz2
+/meld-1.4.0.tar.bz2
diff --git a/meld-scrollkeeper.patch b/meld-scrollkeeper.patch
index 725a219..b33a966 100644
--- a/meld-scrollkeeper.patch
+++ b/meld-scrollkeeper.patch
@@ -1,7 +1,7 @@
-diff -urp meld-1.3.2.orig/help/C/Makefile meld-1.3.2/help/C/Makefile
---- meld-1.3.2.orig/help/C/Makefile 2010-06-24 17:31:33.000000000 -0400
-+++ meld-1.3.2/help/C/Makefile 2010-09-06 16:09:15.029630001 -0400
-@@ -11,7 +11,6 @@ INST_XML := $(helpdir_)/$(LANG)/meld.xml
+diff -urp meld-1.4.0.OLD/help/C/Makefile meld-1.4.0/help/C/Makefile
+--- meld-1.4.0.OLD/help/C/Makefile 2010-09-26 18:25:02.000000000 -0400
++++ meld-1.4.0/help/C/Makefile 2010-10-20 21:24:28.160056001 -0400
+@@ -11,21 +11,18 @@ INST_XML := $(helpdir_)/$(LANG)/meld.xml
.PHONY : all
all $(OMF_NAME).install : $(OMF_NAME)
@@ -9,26 +9,24 @@ diff -urp meld-1.3.2.orig/help/C/Makefile meld-1.3.2/help/C/Makefile
.PHONY : install
install : $(OMF_NAME).install
-@@ -19,7 +18,6 @@ install : $(OMF_NAME).install
+ -mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_)
install -m 644 meld.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 +26,6 @@ uninstall :
- $(XML_DIR_)/figures/*.png
- -rmdir $(XML_DIR_)/figures \
- $(XML_DIR_)
+ -rm -f $(OMF_DIR_)/$(OMF_NAME) \
+ $(XML_DIR_)/meld.xml
+ -rmdir $(XML_DIR_)
- -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
.PHONY : clean
clean :
-diff -urp meld-1.3.2.orig/help/es/Makefile meld-1.3.2/help/es/Makefile
---- meld-1.3.2.orig/help/es/Makefile 2010-06-24 17:31:33.000000000 -0400
-+++ meld-1.3.2/help/es/Makefile 2010-09-06 16:09:57.036630002 -0400
-@@ -11,7 +11,6 @@ INST_XML := $(helpdir_)/$(LANG)/meld.xml
+diff -urp meld-1.4.0.OLD/help/es/Makefile meld-1.4.0/help/es/Makefile
+--- meld-1.4.0.OLD/help/es/Makefile 2010-09-26 18:25:02.000000000 -0400
++++ meld-1.4.0/help/es/Makefile 2010-10-20 21:25:09.747056001 -0400
+@@ -11,21 +11,18 @@ INST_XML := $(helpdir_)/$(LANG)/meld.xml
.PHONY : all
all $(OMF_NAME).install : $(OMF_NAME)
@@ -36,26 +34,24 @@ diff -urp meld-1.3.2.orig/help/es/Makefile meld-1.3.2/help/es/Makefile
.PHONY : install
install : $(OMF_NAME).install
-@@ -19,7 +18,6 @@ install : $(OMF_NAME).install
+ -mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_)
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 +26,6 @@ uninstall :
- $(XML_DIR_)/figures/*.png
- -rmdir $(XML_DIR_)/figures \
- $(XML_DIR_)
+ -rm -f $(OMF_DIR_)/$(OMF_NAME) \
+ $(XML_DIR_)/meld.xml
+ -rmdir $(XML_DIR_)
- -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
.PHONY : clean
clean :
-diff -urp meld-1.3.2.orig/help/fr/Makefile meld-1.3.2/help/fr/Makefile
---- meld-1.3.2.orig/help/fr/Makefile 2010-06-24 17:31:33.000000000 -0400
-+++ meld-1.3.2/help/fr/Makefile 2010-09-06 16:24:26.252630002 -0400
-@@ -11,24 +11,17 @@ INST_XML := $(helpdir_)/$(LANG)/meld.xml
+diff -urp meld-1.4.0.OLD/help/fr/Makefile meld-1.4.0/help/fr/Makefile
+--- meld-1.4.0.OLD/help/fr/Makefile 2010-09-26 18:25:02.000000000 -0400
++++ meld-1.4.0/help/fr/Makefile 2010-10-20 21:25:38.360056002 -0400
+@@ -11,21 +11,18 @@ INST_XML := $(helpdir_)/$(LANG)/meld.xml
.PHONY : all
all $(OMF_NAME).install : $(OMF_NAME)
@@ -63,21 +59,17 @@ diff -urp meld-1.3.2.orig/help/fr/Makefile meld-1.3.2/help/fr/Makefile
.PHONY : install
install : $(OMF_NAME).install
- -mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_) $(XML_DIR_)/figures
+ -mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_)
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_)
+ $(XML_DIR_)/meld.xml
+ -rmdir $(XML_DIR_)
- -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
-+ $(XML_DIR_)/meld.xml
.PHONY : clean
clean :
diff --git a/meld.spec b/meld.spec
index 1d9ee35..55e6a9c 100644
--- a/meld.spec
+++ b/meld.spec
@@ -1,12 +1,12 @@
Name: meld
-Version: 1.3.2
+Version: 1.4.0
Release: 1%{?dist}
Summary: Visual diff and merge tool
Group: Development/Tools
License: GPLv2+
URL: http://meld.sourceforge.net/
-Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.3/%{name}-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.4/%{name}-%{version}.tar.bz2
Patch1: %{name}-scrollkeeper.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -67,6 +67,10 @@ desktop-file-install --vendor fedora \
%changelog
+* Wed Oct 20 2010 Brian Pepple <bpepple at fedoraproject.org> - 1.4.0-1
+- Update to 1.4.0.
+- Update source url.
+
* Mon Sep 6 2010 Brian Pepple <bpepple at fedoraproject.org> - 1.3.2-1
- Update to 1.3.2.
diff --git a/sources b/sources
index 1c91999..13189bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7bd37cc8688a8cc2db68d26a2f186ff9 meld-1.3.2.tar.bz2
+b675ec2006c4452469cf501c51b2a689 meld-1.4.0.tar.bz2
More information about the scm-commits
mailing list