rpms/gnome-commander/F-12 .cvsignore, 1.38, 1.39 gnome-commander.spec, 1.63, 1.64 sources, 1.39, 1.40

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5020/F-12

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
* Thu Nov 26 2009 Mamoru Tasaka <mtasaka at 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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-12/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	29 Sep 2009 04:00:38 -0000	1.38
+++ .cvsignore	25 Nov 2009 16:02:53 -0000	1.39
@@ -1,3 +1 @@
-gnome-commander-1.2.8.2-po.tar.bz2
-gnome-commander-1.3-git_D20090929T1100_13dev.tar.bz2
-gnome-commander-ru.po.zip
+gnome-commander-1.2.8.3.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-12/gnome-commander.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- gnome-commander.spec	29 Sep 2009 04:00:38 -0000	1.63
+++ gnome-commander.spec	25 Nov 2009 16:02:53 -0000	1.64
@@ -26,18 +26,16 @@
 %define        TAGLIB_REQ            1.4
 %define        LIBGSF_REQ            1.12.0
 %define        POPPLER_REQ           0.6
-%define        VTE_REQ               0.11
 
-%define        git_pull_JST          D20090929T1100
+%define        git_pull_JST          D20090629T1400
 
 %define        use_autotool          0
-%define        if_pre                1
-%define        main_release          3
-%define        extratag              git_%{git_pull_JST}_13dev
+%define        if_pre                0
+%define        main_release          1
+%define        extratag              git_%{git_pull_JST}
+%undefine      extratag
 %define        mimeedit_rev          1958
 
-%define        update_po             1
-
 %if 0%{?if_pre} > 0
 %define        use_autotool          1
 %endif
@@ -45,7 +43,9 @@
 %define        fedora_rel            %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag}
 
 Name:          gnome-commander
-Version:       1.3
+Version:       1.2.8.3
+# Downgrade 1 time
+Epoch:         1
 Release:       %{fedora_rel}%{?dist}
 Summary:       A nice and fast file manager for the GNOME desktop
 Summary(pl):   Menadżer plików dla GNOME oparty o Norton Commander'a (TM)
@@ -57,16 +57,10 @@ URL:           http://www.nongnu.org/gcm
 Source0:       ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}%{?extratag:-%extratag}.tar.bz2
 Source1:       gnome-commander.sh
 Source10:      mimeedit-svn%{mimeedit_rev}.sh
-%if %{update_po}
-Source20:      gnome-commander-1.2.8.2-po.tar.bz2
-# From mailing list
-Source21:      gnome-commander-ru.po.zip
-%endif
 Patch10:       mimeedit-svn1958.diff
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils
-BuildRequires: flex
 BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: scrollkeeper
@@ -79,7 +73,6 @@ BuildRequires: libgnome-devel
 BuildRequires: libgnomeui-devel
 BuildRequires: poppler-devel       >= %{POPPLER_REQ}
 BuildRequires: taglib-devel        >= %{TAGLIB_REQ}
-BuildRequires: vte-devel           >= %{VTE_REQ}
 
 BuildRequires: gnome-doc-utils
 BuildRequires: perl(XML::Parser)
@@ -127,9 +120,18 @@ Utöver att kunna hantera filer på din 
 ansluta till FTP-servrar och SMB-nätverk.
 
 %prep
-%setup -q -n %{name}-%{version}%{?extratag:-%extratag} -a 20
+%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
@@ -141,20 +143,27 @@ cp -p %SOURCE10 mimeedit.sh
    -e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \
    configure
 
-# Update po
-%if %{update_po}
-%{__cp} -p gnome-commander-1.2.*/po/*.po po/
-pushd po
-cp -p %{SOURCE21} .
-unzip -qq *.po.zip <<EOF
-A
-EOF
-ls -1 *.po | sort | %{__sed} -e 's|\.po||' > LINGUAS
-popd
+%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
 
-touch po/POTFILES.in
-touch -r po/POTFILES.in po/stamp-it
+# gzip
+gzip -9 ChangeLog-*
 
 %build
 # Install wrapper script, and move binaries to
@@ -164,17 +173,6 @@ touch -r po/POTFILES.in po/stamp-it
    --bindir=%{_libexecdir}/%{name} \
    --disable-scrollkeeper \
    --enable-python
-
-
-# update po
-%if %{update_po}
-pushd po
-rm -f POTFILES.in ; touch POTFILES.in
-intltool-update -m  2>&1 | grep '/' | grep -v ' ' > POTFILES.in
-make gnome-commander.pot update-po
-popd
-%endif
-
 # Sometimes parallel make fails (perhaps), however once
 # force it.
 %{__make} %{?_smp_mflags} -k || { %{__make} || exit 1; }
@@ -220,10 +218,11 @@ scrollkeeper-update -q || :
 %defattr(-,root,root,-)
 %doc AUTHORS
 %doc BUGS
-%doc ChangeLog
+%doc ChangeLog*
 %doc COPYING
 %doc NEWS
 %doc README
+%doc README.commits
 %doc TODO
 %doc doc/*.txt
 
@@ -241,6 +240,10 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Thu Nov 26 2009 Mamoru Tasaka <mtasaka at 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
+
 * Mon Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Try latest git
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-12/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	29 Sep 2009 04:00:38 -0000	1.39
+++ sources	25 Nov 2009 16:02:53 -0000	1.40
@@ -1,3 +1 @@
-b190627ef20d9fe261c0445bc7d56877  gnome-commander-1.2.8.2-po.tar.bz2
-9592e0e971f13757d1211f1d3b0198e0  gnome-commander-1.3-git_D20090929T1100_13dev.tar.bz2
-9b2a8d11008d570b7cb9bf18878d3050  gnome-commander-ru.po.zip
+68bbc1a4a642376e47e6c6e3b3a291b2  gnome-commander-1.2.8.3.tar.bz2