rpms/meld/devel meld-gettext.patch,NONE,1.1 meld.spec,1.18,1.19

[Brian Pepple (bpepple)]

Author: bpepple

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

Modified Files:
	meld.spec 
Added Files:
	meld-gettext.patch 
Log Message:
* Sat Dec  9 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.1.4-6
- Drop X-Fedora category from desktop file.
- Add patch to fix rejects from new version of gettext.


meld-gettext.patch:

--- NEW FILE meld-gettext.patch ---
diff -ur meld-1.1.4.OLD/po/hu.po meld-1.1.4/po/hu.po
--- meld-1.1.4.OLD/po/hu.po	2006-02-24 19:19:25.000000000 -0500
+++ meld-1.1.4/po/hu.po	2006-12-09 14:47:59.000000000 -0500
@@ -99,49 +99,42 @@
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i másodperc"
-msgstr[1] "%i másodperc"
 
 #: ../dirdiff.py:570
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i perc"
-msgstr[1] "%i perc"
 
 #: ../dirdiff.py:571
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
 msgstr[0] "%i óra"
-msgstr[1] "%i óra"
 
 #: ../dirdiff.py:572
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i nap"
-msgstr[1] "%i nap"
 
 #: ../dirdiff.py:573
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] "%i hét"
-msgstr[1] "%i hét"
 
 #: ../dirdiff.py:574
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i hónap"
-msgstr[1] "%i hónap"
 
 #: ../dirdiff.py:575
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i év"
-msgstr[1] "%i év"
 
 #. Abbreviation for insert,overwrite so that it will fit in the status bar
 #: ../filediff.py:214
diff -ur meld-1.1.4.OLD/po/ja.po meld-1.1.4/po/ja.po
--- meld-1.1.4.OLD/po/ja.po	2006-03-05 06:03:44.000000000 -0500
+++ meld-1.1.4/po/ja.po	2006-12-09 14:48:41.000000000 -0500
@@ -97,49 +97,42 @@
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i 秒"
-msgstr[1] "%i 秒"
 
 #: ../dirdiff.py:570
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i 分"
-msgstr[1] "%i 分"
 
 #: ../dirdiff.py:571
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
 msgstr[0] "%i 時間"
-msgstr[1] "%i 時間"
 
 #: ../dirdiff.py:572
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i æ—¥"
-msgstr[1] "%i æ—¥"
 
 #: ../dirdiff.py:573
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] "%i 週間"
-msgstr[1] "%i 週間"
 
 #: ../dirdiff.py:574
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i ヶ月"
-msgstr[1] "%i ヶ月"
 
 #: ../dirdiff.py:575
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i å¹´"
-msgstr[1] "%i å¹´"
 
 #. Abbreviation for insert,overwrite so that it will fit in the status bar
 #: ../filediff.py:215
diff -ur meld-1.1.4.OLD/po/ru.po meld-1.1.4/po/ru.po
--- meld-1.1.4.OLD/po/ru.po	2005-10-25 18:58:09.000000000 -0400
+++ meld-1.1.4/po/ru.po	2006-12-09 14:51:29.000000000 -0500
@@ -190,57 +190,57 @@
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
-msgstr[0] "секунда"
-msgstr[1] "секунды"
-msgstr[2] "секунд"
+msgstr[0] "%i секунда"
+msgstr[1] "%i секунды"
+msgstr[2] "%i секунд"
 
 #: ../dirdiff.py:571
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
-msgstr[0] "минута"
-msgstr[1] "минуты"
-msgstr[2] "минут"
+msgstr[0] "%i минута"
+msgstr[1] "%i минуты"
+msgstr[2] "%i минут"
 
 #: ../dirdiff.py:572
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
-msgstr[0] "час"
-msgstr[1] "часа"
-msgstr[2] "часов"
+msgstr[0] "%i час"
+msgstr[1] "%i часа"
+msgstr[2] "%i часов"
 
 #: ../dirdiff.py:573
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
-msgstr[0] "день"
-msgstr[1] "дня"
-msgstr[2] "дней"
+msgstr[0] "%i день"
+msgstr[1] "%i дня"
+msgstr[2] "%i дней"
 
 #: ../dirdiff.py:574
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
-msgstr[0] "неделя"
-msgstr[1] "недели"
-msgstr[2] "недель"
+msgstr[0] "%i неделя"
+msgstr[1] "%i недели"
+msgstr[2] "%i недель"
 
 #: ../dirdiff.py:575
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
-msgstr[0] "месяц"
-msgstr[1] "месяца"
-msgstr[2] "месяцев"
+msgstr[0] "%i месяц"
+msgstr[1] "%i месяца"
+msgstr[2] "%i месяцев"
 
 #: ../dirdiff.py:576
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
-msgstr[0] "год"
-msgstr[1] "года"
-msgstr[2] "лет"
+msgstr[0] "%i год"
+msgstr[1] "%i года"
+msgstr[2] "%i лет"
 
 #. Abbreviation for insert,overwrite so that it will fit in the status bar
 #: ../filediff.py:224


Index: meld.spec
===================================================================
RCS file: /cvs/extras/rpms/meld/devel/meld.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- meld.spec	8 Dec 2006 18:10:13 -0000	1.18
+++ meld.spec	9 Dec 2006 20:00:35 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		meld
 Version:	1.1.4
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Visual diff and merge tool
 
 Group:		Development/Tools
@@ -9,6 +9,7 @@
 Source0:	http://ftp.gnome.org/pub/gnome/sources/meld/1.1/meld-%{version}.tar.bz2
 Patch0:		desktop.patch
 Patch1:		%{name}-scrollkeeper.patch
+Patch2:		%{name}-gettext.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -40,6 +41,7 @@
 %setup -q
 %patch0 -p1 -b .desktop
 %patch1 -p1 -b .scrollkeeper
+%patch2 -p1 -b .gettext
 
 
 %build
@@ -55,7 +57,6 @@
 
 desktop-file-install --vendor fedora                    \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
-  --add-category X-Fedora                               \
   --delete-original                                     \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
@@ -95,6 +96,10 @@
 
 
 %changelog
+* Sat Dec  9 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.1.4-6
+- Drop X-Fedora category from desktop file.
+- Add patch to fix rejects from new version of gettext.
+
 * Fri Dec  8 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.1.4-5
 - Rebuild against new python.