[gentoo] - Update to 0.19.3 - gentoo-0.15.6-gtk-2.20.patch removed - Include the translations - gentoo-0.19.2

cheeselee cheeselee at fedoraproject.org
Sun Oct 17 14:39:45 UTC 2010


commit e622a264b97335016968d3e47c6d5564d7d3945a
Author: Robin Lee <cheeselee at fedoraproject.org>
Date:   Sun Oct 17 22:38:48 2010 +0800

    - Update to 0.19.3
    - gentoo-0.15.6-gtk-2.20.patch removed
    - Include the translations
    - gentoo-0.19.2-locales.patch added to exclude duplicated translations
    - BR: gamin-devel removed, gettext added
    - Include more documents

 gentoo-0.15.6-gtk-2.20.patch |   12 ------------
 gentoo-0.19.2-locales.patch  |    6 ++++++
 gentoo.spec                  |   39 ++++++++++++++++++++++++++-------------
 3 files changed, 32 insertions(+), 25 deletions(-)
---
diff --git a/gentoo-0.19.2-locales.patch b/gentoo-0.19.2-locales.patch
new file mode 100644
index 0000000..1d7a7c6
--- /dev/null
+++ b/gentoo-0.19.2-locales.patch
@@ -0,0 +1,6 @@
+--- gentoo-0.19.2/po/LINGUAS	2010-10-06 03:34:37.000000000 +0800
++++ gentoo-0.19.2.new/po/LINGUAS	2010-10-10 13:32:24.064423319 +0800
+@@ -1,2 +1,2 @@
+ # Set of available languages for gentoo.
+-de es_MX fr it ja_JP.UTF-8 pl ru_RU.cp1251 ru_RU.CP1251 ru_RU.KOI8-R ru_RU.koi8r ru_RU.UTF-8 ru_RU.utf8 sv
++de es_MX fr it ja pl ru sv
diff --git a/gentoo.spec b/gentoo.spec
index c0b60f5..1de22e2 100644
--- a/gentoo.spec
+++ b/gentoo.spec
@@ -1,21 +1,22 @@
 Summary: Graphical file management program in GTK+ for Linux
 Name: gentoo
-Version: 0.15.6
+Version: 0.19.3
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/File
 URL: http://www.obsession.se/gentoo/
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1: gentoo.desktop
+# icons/gentoo.png is not within standard sizes
 # Get here http://www.obsession.se/gentoo/gfx/logo.png (not in sources)
 Source2: gentoo.png
+# to generate debuginfo properly
 Patch0: %{name}-0.15.2-cflags.patch
-# src/odmultibutton.c in gentoo uses some macros deprecated in gtk+ 2.20.
-# Patch it not to define GTK_DISABLE_DEPRECATED .
-Patch1: %{name}-0.15.6-gtk-2.20.patch
+# to remove duplicated translations
+Patch1:   %{name}-0.19.2-locales.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel
-BuildRequires: gamin-devel
+BuildRequires: gettext
 BuildRequires: desktop-file-utils
 
 %description
@@ -33,19 +34,24 @@ file manager "Directory OPUS"(TM) (written by Jonathan Potter).
 %setup -q
 %patch0 -p1
 %patch1 -p1
-
+# to remove duplicated translations
+pushd po
+mv ja{_JP.UTF-8,}.po
+mv ja{_JP.UTF-8,}.gmo
+mv ru{_RU.UTF-8,}.po
+mv ru{_RU.UTF-8,}.gmo
+rm -f ru_RU.*.{po,gmo}
+popd
 
 %build
-# Translations are suppressed from building. They do not actually function.
-# Try again in next upstream release.
-%configure --disable-dependency-tracking --disable-nls
+%configure --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
-#%find_lang %{name}
+%find_lang %{name}
 # Included man page, not installed by default
 %{__install} -D -p -m 0644 docs/gentoo.1x %{buildroot}%{_mandir}/man1/gentoo.1
 # Don't install the man page again in %doc
@@ -75,11 +81,10 @@ fi
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
-%files
-#-f %{name}.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS ChangeLog CONFIG-CHANGES COPYING CREDITS docs/
-%doc NEWS README README.gtkrc TODO
+%doc NEWS README* TODO
 %config %{_sysconfdir}/gentoo*
 %{_bindir}/gentoo
 %{_datadir}/applications/gentoo.desktop
@@ -89,6 +94,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sun Oct 17 2010 Robin Lee <cheeselee at fedoraproject.org> - 0.19.3-1
+- Update to 0.19.3
+- gentoo-0.15.6-gtk-2.20.patch removed
+- Include the translations
+- gentoo-0.19.2-locales.patch added to exclude duplicated translations
+- BR: gamin-devel removed, gettext added
+- Include more documents
+
 * Mon Apr 26 2010 Robin Lee <robinlee.sysu at gmail.com> - 0.15.6-1
 - Update to 0.15.6
 - Update Source0 URL


More information about the scm-commits mailing list