devel/meld meld-1.0.0-po_fr.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 meld.spec, 1.9, 1.10 sources, 1.5, 1.6
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Mon Jul 25 19:37:00 UTC 2005
Author: mschwendt
Update of /cvs/extras/devel/meld
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26003
Modified Files:
.cvsignore meld.spec sources
Added Files:
meld-1.0.0-po_fr.patch
Log Message:
Updating to non-beta release while investigating #161223.
* Mon Jul 25 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.0-1
- Update to 1.0.0.
- Include fix for upstream bug #309408.
meld-1.0.0-po_fr.patch:
--- NEW FILE meld-1.0.0-po_fr.patch ---
--- meld-1.0.0.old/po/fr.po 2005-07-03 18:41:20.000000000 -0400
+++ meld-1.0.0/po/fr.po 2005-07-03 18:40:45.000000000 -0400
@@ -15,6 +15,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py 1.5\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../meld.desktop.in.h:1
msgid "Compare and merge your files."
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/meld/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 8 Jun 2005 20:21:36 -0000 1.5
+++ .cvsignore 25 Jul 2005 19:36:58 -0000 1.6
@@ -1 +1 @@
-meld-0.9.6.tar.bz2
+meld-1.0.0.tar.bz2
Index: meld.spec
===================================================================
RCS file: /cvs/extras/devel/meld/meld.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- meld.spec 8 Jun 2005 20:21:36 -0000 1.9
+++ meld.spec 25 Jul 2005 19:36:58 -0000 1.10
@@ -1,13 +1,14 @@
Name: meld
-Version: 0.9.6
+Version: 1.0.0
Release: 1%{?dist}
Summary: Visual diff and merge tool
Group: Development/Tools
License: GPL
URL: http://meld.sourceforge.net/
-Source0: http://ftp.gnome.org/pub/gnome/sources/meld/0.9/meld-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/gnome/sources/meld/1.0/meld-%{version}.tar.bz2
Patch0: desktop.patch
+Patch1: meld-1.0.0-po_fr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -36,6 +37,7 @@
%prep
%setup -q
%patch0 -p1 -b .desktop
+%patch1 -p1 -b .po_fr
%build
@@ -82,6 +84,10 @@
%changelog
+* Mon Jul 25 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.0-1
+- Update to 1.0.0.
+- Include fix for upstream bug #309408.
+
* Wed Jun 8 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.6-1
- Remove unused meld shell script from src.rpm.
- Add scriptlets for scrollkeeper-update.
Index: sources
===================================================================
RCS file: /cvs/extras/devel/meld/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 8 Jun 2005 20:21:36 -0000 1.5
+++ sources 25 Jul 2005 19:36:58 -0000 1.6
@@ -1 +1 @@
-73419987b125c0cfbb1f04cfe454a8e5 meld-0.9.6.tar.bz2
+ccde817f0396d39e9e40f31a3a7611f6 meld-1.0.0.tar.bz2
More information about the fedora-extras-commits
mailing list