rpms/meld/devel .cvsignore, 1.11, 1.12 meld-scrollkeeper.patch, 1.3, 1.4 meld.spec, 1.27, 1.28 sources, 1.11, 1.12 desktop.patch, 1.1, NONE
Brian Pepple
bpepple at fedoraproject.org
Sun Nov 23 16:10:42 UTC 2008
- Previous message (by thread): rpms/jd/devel .cvsignore, 1.307, 1.308 jd.spec, 1.357, 1.358 sources, 1.308, 1.309
- Next message (by thread): rpms/mysql++/devel .cvsignore, 1.13, 1.14 mysql++.spec, 1.14, 1.15 sources, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: bpepple
Update of /cvs/pkgs/rpms/meld/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15537
Modified Files:
.cvsignore meld-scrollkeeper.patch meld.spec sources
Removed Files:
desktop.patch
Log Message:
* Sun Nov 23 2008 Brian Pepple <bpepple at fedoraproject.org> - 1.2.1-1
- Update to 1.2.1.
- Drop desktop file patch. Fixed upstream.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/meld/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 3 Aug 2008 15:05:21 -0000 1.11
+++ .cvsignore 23 Nov 2008 16:10:11 -0000 1.12
@@ -1 +1 @@
-meld-1.2.tar.bz2
+meld-1.2.1.tar.bz2
meld-scrollkeeper.patch:
Index: meld-scrollkeeper.patch
===================================================================
RCS file: /cvs/pkgs/rpms/meld/devel/meld-scrollkeeper.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- meld-scrollkeeper.patch 3 Aug 2008 15:05:21 -0000 1.3
+++ meld-scrollkeeper.patch 23 Nov 2008 16:10:11 -0000 1.4
@@ -1,7 +1,15 @@
-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
+diff -urp meld-1.2.1.OLD/help/C/GNUmakefile meld-1.2.1/help/C/GNUmakefile
+--- meld-1.2.1.OLD/help/C/GNUmakefile 2007-02-17 13:40:05.000000000 -0500
++++ meld-1.2.1/help/C/GNUmakefile 2008-11-23 10:51:21.000000000 -0500
+@@ -11,7 +11,6 @@ INST_XML := $(helpdir_)/$(LANG)/meld.xml
+
+ .PHONY : all
+ all $(OMF_NAME).install : $(OMF_NAME)
+- scrollkeeper-preinstall $(INST_XML) $(OMF_NAME) $(OMF_NAME).install
+
+ .PHONY : install
+ install : $(OMF_NAME).install
+@@ -19,7 +18,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 +17,7 @@
.PHONY : uninstall
uninstall :
-@@ -28,7 +27,6 @@ uninstall :
+@@ -28,7 +26,6 @@ uninstall :
$(XML_DIR_)/figures/*.png
-rmdir $(XML_DIR_)/figures \
$(XML_DIR_)
@@ -17,10 +25,18 @@
.PHONY : clean
clean :
-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
+diff -urp meld-1.2.1.OLD/help/es/GNUmakefile meld-1.2.1/help/es/GNUmakefile
+--- meld-1.2.1.OLD/help/es/GNUmakefile 2007-02-17 13:40:05.000000000 -0500
++++ meld-1.2.1/help/es/GNUmakefile 2008-11-23 10:51:54.000000000 -0500
+@@ -11,7 +11,6 @@ INST_XML := $(helpdir_)/$(LANG)/meld.xml
+
+ .PHONY : all
+ all $(OMF_NAME).install : $(OMF_NAME)
+- scrollkeeper-preinstall $(INST_XML) $(OMF_NAME) $(OMF_NAME).install
+
+ .PHONY : install
+ install : $(OMF_NAME).install
+@@ -19,7 +18,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 +44,7 @@
.PHONY : uninstall
uninstall :
-@@ -28,7 +27,6 @@ uninstall :
+@@ -28,7 +26,6 @@ uninstall :
$(XML_DIR_)/figures/*.png
-rmdir $(XML_DIR_)/figures \
$(XML_DIR_)
@@ -36,10 +52,16 @@
.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)
+diff -urp meld-1.2.1.OLD/help/fr/GNUmakefile meld-1.2.1/help/fr/GNUmakefile
+--- meld-1.2.1.OLD/help/fr/GNUmakefile 2008-03-31 16:44:53.000000000 -0400
++++ meld-1.2.1/help/fr/GNUmakefile 2008-11-23 10:54:18.000000000 -0500
+@@ -11,24 +11,17 @@ INST_XML := $(helpdir_)/$(LANG)/meld.xml
+
+ .PHONY : all
+ all $(OMF_NAME).install : $(OMF_NAME)
+- scrollkeeper-preinstall $(INST_XML) $(OMF_NAME) $(OMF_NAME).install
+
+ .PHONY : install
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
Index: meld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/meld/devel/meld.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- meld.spec 26 Aug 2008 15:07:38 -0000 1.27
+++ meld.spec 23 Nov 2008 16:10:11 -0000 1.28
@@ -1,13 +1,12 @@
Name: meld
-Version: 1.2
-Release: 2%{?dist}
+Version: 1.2.1
+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/meld/1.1/meld-%{version}.tar.bz2
-Patch0: desktop.patch
Patch1: %{name}-scrollkeeper.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,7 +20,7 @@
Requires: gnome-python2-canvas
Requires: gnome-python2-gconf
Requires: gnome-python2-gtksourceview
-Requires: pygtk2 >= 2.6.0
+Requires: pygtk2 >= 2.8.0
Requires: pygtk2-libglade
Requires(post): scrollkeeper
@@ -39,7 +38,6 @@
%prep
%setup -q
-%patch0 -p1 -b .desktop
%patch1 -p1 -b .scrollkeeper
@@ -87,6 +85,10 @@
%changelog
+* Sun Nov 23 2008 Brian Pepple <bpepple at fedoraproject.org> - 1.2.1-1
+- Update to 1.2.1.
+- Drop desktop file patch. Fixed upstream.
+
* Tue Aug 26 2008 Brian Pepple <bpepple at fedoraproject.org> - 1.2-2
- Change require to gnome-python2-gnome. (#460010)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/meld/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 3 Aug 2008 15:05:21 -0000 1.11
+++ sources 23 Nov 2008 16:10:11 -0000 1.12
@@ -1 +1 @@
-08e047ab4c8a8ae383674fcddde9fb87 meld-1.2.tar.bz2
+78f6084b14ee5334cf3578e62383b341 meld-1.2.1.tar.bz2
--- desktop.patch DELETED ---
- Previous message (by thread): rpms/jd/devel .cvsignore, 1.307, 1.308 jd.spec, 1.357, 1.358 sources, 1.308, 1.309
- Next message (by thread): rpms/mysql++/devel .cvsignore, 1.13, 1.14 mysql++.spec, 1.14, 1.15 sources, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list