From d4cdd28584ffb8225a802946a17b219bc0dae530 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Wed, 25 Nov 2009 16:02:53 +0000 Subject: [PATCH] - Use stable 1.2.8.x branch for F-12 after discussion with the upstream developer --- .cvsignore | 2 +- gnome-commander.spec | 82 +++++++++++++++++++++++++++++++++++--------- sources | 2 +- 3 files changed, 68 insertions(+), 18 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5cdd73a..4922312 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnome-commander-1.3-git_D20090623T0316_13dev.tar.bz2 +gnome-commander-1.2.8.3.tar.bz2 diff --git a/gnome-commander.spec b/gnome-commander.spec index eb82a0f..34fd819 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -1,12 +1,14 @@ # To use git, follow: # -# git clone git://git.gnome.org/gnome-commander +# git clone git://git.gnome.org/gnome-commander # cd gnome-commander/ -# git rebase origin/gcmd-1-3 +# git checkout -b gcmd-1-3 origin/gcmd-1-3 +# git pull +# ... # cd .. -# ln -sf gcmd-1-3 gnome-commander-%%{version}-git_%%{git_pull_JST} +# ln -sf gcmd-commander gnome-commander-%%{version}-git_%%{git_pull_JST} # tar cjf gnome-commander-%%{version}-git_%%{git_pull_JST}.tar.bz2 \ -# gnome-commander-%%{version}-git_%%{git_pull_JST} +# gnome-commander-%%{version}-git_%%{git_pull_JST}/./ # Source10 is created by: # svn co http://svn.gnome.org/svn/gnome-commander/branches/gcmd-1-3/tools/mimeedit/ @@ -14,18 +16,24 @@ # # ref: http://lists.gnu.org/archive/html/gcmd-devel/2007-11/msg00076.html +# +# Source20 is extracted from gnome-commander-1.2.8.2.tar.bz2 +# wget -N ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/gnome-commander-1.2.8.2.tar.bz2 +# tar xf gnome-commander-1.2.8.2.tar.bz2 +# 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 VTE_REQ 0.11 -%define git_pull_JST D20090623T0316 +%define git_pull_JST D20090629T1400 %define use_autotool 0 -%define if_pre 1 -%define main_release 2 -%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 %if 0%{?if_pre} > 0 @@ -35,8 +43,10 @@ %define fedora_rel %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag} Name: gnome-commander -Version: 1.3 -Release: %{fedora_rel}%{?dist}.1 +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) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -51,7 +61,6 @@ 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 @@ -64,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) @@ -115,6 +123,15 @@ 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 @@ -126,8 +143,27 @@ cp -p %SOURCE10 mimeedit.sh -e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \ configure -touch po/POTFILES.in -touch -r po/POTFILES.in po/stamp-it +%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-* %build # Install wrapper script, and move binaries to @@ -182,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 @@ -203,6 +240,19 @@ scrollkeeper-update -q || : %{_datadir}/pixmaps/%{name}/ %changelog +* Thu Nov 26 2009 Mamoru Tasaka - 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 +- Try latest git + +* Sat Sep 26 2009 Mamoru Tasaka - 1.3-0.3.git_D20090924T0215_13dev +- Update Russian translation (from mailing list) + +* Thu Sep 24 2009 Mamoru Tasaka +- Try latest git + * Tue Jul 28 2009 Mamoru Tasaka - F-12: Mass rebuild diff --git a/sources b/sources index 486b5fc..d8650b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e1d245fd383708b5142adf057c9abad1 gnome-commander-1.3-git_D20090623T0316_13dev.tar.bz2 +68bbc1a4a642376e47e6c6e3b3a291b2 gnome-commander-1.2.8.3.tar.bz2