diff --git a/.cvsignore b/.cvsignore index 2d95bea..0d2ae36 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ libfm-0.1.11.tar.gz +libfm-0.1.11-translation-update-patches.tar.gz diff --git a/libfm-0.1.11-wrong-linkage.patch b/libfm-0.1.11-wrong-linkage.patch deleted file mode 100644 index cfc7fcf..0000000 --- a/libfm-0.1.11-wrong-linkage.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libfm-0.1.10/src/Makefile.am 2010-04-19 02:57:07.000000000 +0900 -+++ libfm-0.1.11/src/Makefile.am 2010-04-25 22:00:36.000000000 +0900 -@@ -211,7 +211,6 @@ - $(GTK_LIBS) \ - $(MENU_CACHE_LIBS) \ - $(INTLLIBS) \ -- libfm.la \ - libfm-gtk.la \ - $(NULL) - diff --git a/libfm.spec b/libfm.spec index f7de0cf..ba89ab6 100644 --- a/libfm.spec +++ b/libfm.spec @@ -1,14 +1,19 @@ # Review: https://bugzilla.redhat.com/show_bug.cgi?id=567257 +# Upstream git: +# git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/libfm + Name: libfm Version: 0.1.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GIO-based library for file manager-like programs Group: System Environment/Libraries License: GPLv2+ URL: http://pcmanfm.sourceforge.net/ Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz +# Translation update, all from git +Source1: libfm-0.1.11-translation-update-patches.tar.gz Patch0: libfm-0.1.9-pref-apps.patch # The following patch must be reversed Patch1: libfm-0.1.11-wrong-linkage.patch @@ -74,10 +79,15 @@ developing applications that use %{name}-gtk. %prep -%setup -q +%setup -q -a 1 %patch0 -p1 -b .orig %patch2 -p1 -b .gterm_segv +# translation update +for f in libfm-patches/*patch +do + cat $f | patch -p1 -s +done # treak rpath sed -i.libdir_syssearch -e \ @@ -86,6 +96,8 @@ sed -i.libdir_syssearch -e \ %build %configure --disable-static +# To show translation status +make -C po -j1 GMSGFMT="msgfmt --statistics" make %{?_smp_mflags} @@ -182,6 +194,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Sun May 9 2010 Mamoru Tasaka - 0.1.11-4 +- Translation update from git + * Fri May 7 2010 Mamrou Tasaka - 0.1.11-3 - Remove runpath_var=... trick on libtool which causes internal linkage error, diff --git a/sources b/sources index 927f114..0517b88 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 65cf42729c0f3fc3c8c1ed03f78ce9fb libfm-0.1.11.tar.gz +afc1d194b90fc8b1357eb8df265e76c6 libfm-0.1.11-translation-update-patches.tar.gz