- Chase master git branch for F-13 after discussion with the upstream

developer

.cvsignore

@@ -1 +1 @@
-gnome-commander-1.2.8.3.tar.bz2
+gnome-commander-1.2.9-git_D20091126T1510.tar.bz2

gnome-commander.spec

@@ -2,7 +2,7 @@
 #
 # git clone git://git.gnome.org/gnome-commander
 # cd gnome-commander/
-# git checkout -b gcmd-1-3 origin/gcmd-1-3
+# # git checkout -b gcmd-1-3 origin/gcmd-1-3
 # git pull
 # ...
 # cd ..
@@ -16,34 +16,32 @@
 #
 # ref: http://lists.gnu.org/archive/html/gcmd-devel/2007-11/msg00076.html
 
-#
+%global        EXIV2_REQ             0.14
-# Source20 is extracted from gnome-commander-1.2.8.2.tar.bz2
+%global        TAGLIB_REQ            1.4
-# wget -N ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/gnome-commander-1.2.8.2.tar.bz2
+%global        LIBGSF_REQ            1.12.0
-# tar xf gnome-commander-1.2.8.2.tar.bz2
+%global        POPPLER_REQ           0.6
-# tar cjf gnome-commander-1.2.8.2-po.tar.bz2 gnome-commander-1.2.8.2/po/
-
-%define        EXIV2_REQ             0.14
-%define        TAGLIB_REQ            1.4
-%define        LIBGSF_REQ            1.12.0
-%define        POPPLER_REQ           0.6
 
-%define        git_pull_JST          D20090629T1400
+%global        git_pull_JST          D20091126T1510
 
-%define        use_autotool          0
+%global        use_autotool          0
-%define        if_pre                0
+%global        update_po             1
-%define        main_release          1
+%global        if_pre                1
-%define        extratag              git_%{git_pull_JST}
+%global        main_release          1
-%undefine      extratag
+%global        extratag              git_%{git_pull_JST}
-%define        mimeedit_rev          1958
+#%%undefine      extratag
+%global        mimeedit_rev          1958
 
 %if 0%{?if_pre} > 0
-%define        use_autotool          1
+%global        use_autotool          1
+%endif
+%if 0%{?use_autotool} < 1
+%global        update_po             0
 %endif
 
-%define        fedora_rel            %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag}
+%global        fedora_rel            %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag}
 
 Name:          gnome-commander
-Version:       1.2.8.3
+Version:       1.2.9
 # Downgrade 1 time
 Epoch:         1
 Release:       %{fedora_rel}%{?dist}
@@ -123,45 +121,17 @@ ansluta till FTP-servrar och SMB-nätverk.
 %setup -q -n %{name}-%{version}%{?extratag:-%extratag}
 
 %if 0%{use_autotool} > 0
-# Workaround to make gnome-autogen support automake 1.11
-# Note that fixed gnome-common-2.26.0-2.fc11 is now in testing
-mkdir TMPBIN ; cd TMPBIN
-sed -e 's|automake-1\.10|automake-1.11 automake-1.10|' \
-	%{_bindir}/gnome-autogen.sh > ./gnome-autogen.sh
-chmod 0755 ./gnome-autogen.sh
-export PATH=$(pwd):$PATH
-cd ..
-
 %{__sed} -i.conf '$s|^\(.*\)|NOCONFIGURE=1 \1|' autogen.sh
 sh autogen.sh
 %endif
 
-cp -p %SOURCE10 mimeedit.sh
+%{__cp} -p %SOURCE10 mimeedit.sh
 %patch10 -p0
 
 %{__sed} -i.pylib \
    -e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \
    configure
 
-%if 0%{?fedora} >= 10 && 0
-function replace_icon(){
-	find . -name \*.cc | xargs grep -l $1 | \
-		xargs %{__sed} -i.icon -e "s|\"$1\"|\"$2\"|"
-}
-
-
-# Replace icon name due to gnome-icon-theme 2.23.x change
-# (many icons are removed)
-replace_icon	gnome-fs-directory	gtk-directory
-replace_icon	gnome-fs-ftp		folder-remote
-replace_icon	gnome-fs-home		user-home
-replace_icon	gnome-fs-network	gtk-network
-replace_icon	gnome-fs-smb		network-workgroup
-replace_icon	gnome-fs-ssh		folder-remote
-replace_icon	gnome-fs-web		folder-remote
-
-%endif
-
 # gzip
 gzip -9 ChangeLog-*
 
@@ -173,9 +143,13 @@ gzip -9 ChangeLog-*
    --bindir=%{_libexecdir}/%{name} \
    --disable-scrollkeeper \
    --enable-python
-# Sometimes parallel make fails (perhaps), however once
+
-# force it.
+%if %{update_po}
-%{__make} %{?_smp_mflags} -k || { %{__make} || exit 1; }
+make -C po gnome-commander.pot update-po
+%endif
+
+%{__make} %{?_smp_mflags} -k \
+	GMSGFMT="msgfmt --statistics"
 
 %install
 %{__rm} -rf %{buildroot}
@@ -240,6 +214,10 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Thu Nov 26 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1:1.2.9-0.1.git_D20091126T1510
+- Chase master git branch for F-13 after discussion with the upstream
+  developer
+
 * Thu Nov 26 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1:1.2.8.3-1
 - Use stable 1.2.8.x branch for F-12 after discussion with
   the upstream developer

sources

@@ -1 +1 @@
-68bbc1a4a642376e47e6c6e3b3a291b2  gnome-commander-1.2.8.3.tar.bz2
+37680c7c5d25bd6599b58901c59fa6e8  gnome-commander-1.2.9-git_D20091126T1510.tar.bz2