rpms/meld/F-7 meld-scrollkeeper.patch,1.1,1.2 meld.spec,1.22,1.23
Brian Pepple (bpepple)
fedora-extras-commits at redhat.com
Wed Jul 18 16:44:29 UTC 2007
- Previous message: rpms/meld/F-7 .cvsignore, 1.9, 1.10 meld.spec, 1.21, 1.22 sources, 1.9, 1.10 meld-gettext.patch, 1.1, NONE
- Next message: rpms/e2fsprogs/devel e2fsprogs-1.40.2-swapfs.patch, NONE, 1.1 e2fsprogs.spec, 1.75, 1.76
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: bpepple
Update of /cvs/pkgs/rpms/meld/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10398
Modified Files:
meld-scrollkeeper.patch meld.spec
Log Message:
* Wed Jul 18 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.1.5-2
- Update scrollkeeper patch.
meld-scrollkeeper.patch:
Index: meld-scrollkeeper.patch
===================================================================
RCS file: /cvs/pkgs/rpms/meld/F-7/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 18 Jul 2007 16:43:56 -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/F-7/meld.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- meld.spec 18 Jul 2007 16:30:02 -0000 1.22
+++ meld.spec 18 Jul 2007 16:43:56 -0000 1.23
@@ -1,6 +1,6 @@
Name: meld
Version: 1.1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Visual diff and merge tool
Group: Development/Tools
@@ -94,6 +94,9 @@
%changelog
+* Wed Jul 18 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.1.5-2
+- Update scrollkeeper patch.
+
* Wed Jul 18 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.1.5-1
- Update to 1.1.5. Fixed bug #248572.
- Drop gettext patch. fixed upstream.
- Previous message: rpms/meld/F-7 .cvsignore, 1.9, 1.10 meld.spec, 1.21, 1.22 sources, 1.9, 1.10 meld-gettext.patch, 1.1, NONE
- Next message: rpms/e2fsprogs/devel e2fsprogs-1.40.2-swapfs.patch, NONE, 1.1 e2fsprogs.spec, 1.75, 1.76
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list