From 937ce8b2fc33f77b3c319103a288f2303b235f0b Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Fri, 11 Jun 2010 19:54:55 +0000 Subject: [PATCH] - Finally downgrade to 1.2.8.6 even on rawhide as the upsteam changed release plan --- .cvsignore | 2 +- gnome-commander.spec | 65 ++++++++++++++++++++++++++++++-------------- sources | 2 +- 3 files changed, 46 insertions(+), 23 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8b3e854..4f054ca 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnome-commander-1.2.9-git_D20100215T0000.tar.bz2 +gnome-commander-1.2.8.6.tar.bz2 diff --git a/gnome-commander.spec b/gnome-commander.spec index 81a6a6a..2795b3d 100644 --- a/gnome-commander.spec +++ b/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 .. @@ -21,14 +21,14 @@ %global LIBGSF_REQ 1.12.0 %global POPPLER_REQ 0.6 -%global git_pull_JST D20100215T0000 +%global git_pull_JST D20090629T1400 %global use_autotool 0 -%global update_po 1 -%global if_pre 1 -%global main_release 6 +%global update_po 0 +%global if_pre 0 +%global main_release 1 %global extratag git_%{git_pull_JST} -#%%undefine extratag +%undefine extratag %global mimeedit_rev 1958 %if 0%{?if_pre} > 0 @@ -38,11 +38,16 @@ %global update_po 0 %endif +# Autotool seems still needed to avoid build failure +# under doc/ diretory, need investigating +%global use_autotool 1 + %global fedora_rel %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag} Name: gnome-commander -Version: 1.2.9 -Epoch: 2 +Version: 1.2.8.6 +# Downgrade 3 times, sorry... +Epoch: 3 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) @@ -86,8 +91,6 @@ BuildRequires: gnome-common Requires: gnome-python2-gnomevfs Requires: gnome-vfs2-smb Requires: meld -Requires(post): scrollkeeper -Requires(postun): scrollkeeper %description GNOME Commander is a nice and fast file manager for the GNOME desktop. @@ -121,8 +124,7 @@ ansluta till FTP-servrar och SMB-nätverk. %setup -q -n %{name}-%{version}%{?extratag:-%extratag} %if 0%{use_autotool} > 0 -%{__sed} -i.conf '$s|^\(.*\)|NOCONFIGURE=1 \1|' autogen.sh -sh autogen.sh +( export NOCONFIGURE=1 ; sh autogen.sh ) %endif %{__cp} -p %SOURCE10 mimeedit.sh @@ -138,8 +140,25 @@ gzip -9 ChangeLog-* %build # Install wrapper script, and move binaries to # %%{_libexecdir}/%%{name} - +mkdir _builddir || : + +# For debuginfo issue +find . -name \*.cc | while read f +do + dirn=$(dirname $f) + %{__cat} $f | %{__sed} -n -e 's|^#line.*[ \t][ \t]*\"\(.*\)"$|\1|p' | \ + sort | uniq | while read g + do + %{__mkdir_p} _builddir/$dirn + %{__cp} -p $dirn/$g _builddir/$dirn + done +done + +pushd _builddir + +ln -sf ../configure %configure \ + --srcdir=$(pwd)/.. \ --bindir=%{_libexecdir}/%{name} \ --disable-scrollkeeper \ --enable-python @@ -148,15 +167,22 @@ gzip -9 ChangeLog-* %{__make} -C po gnome-commander.pot update-po %endif -%{__make} %{?_smp_mflags} -k \ - GMSGFMT="msgfmt --statistics" +# First make po without _smp_mflags, so that messages +# won't be mixed up +%{__make} -C po GMSGFMT="msgfmt --statistics" +%{__make} %{?_smp_mflags} -k + +popd # from _builddir %install %{__rm} -rf %{buildroot} + +pushd _builddir %{__make} \ INSTALL="%{__install} -c -p" \ DESTDIR=%{buildroot} \ install +popd # from _builddir # Desktop file desktop-file-install \ @@ -179,12 +205,6 @@ desktop-file-install \ %find_lang %{name} -%post -scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : - -%postun -scrollkeeper-update -q || : - %clean %{__rm} -rf %{buildroot} @@ -214,6 +234,9 @@ scrollkeeper-update -q || : %{_datadir}/pixmaps/%{name}/ %changelog +* Sat Jun 12 2010 Mamoru Tasaka - 3:1.2.8.6-1 +- Finally downgrade to 1.2.8.6 even on rawhide as the upsteam changed release plan + * Mon May 31 2010 Rex Dieter - 2:1.2.9-0.6.git_D20100215T0000 - rebuild (exiv2) diff --git a/sources b/sources index 4659d29..a68733f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0943baf1acf99719477798c8b0849f4e gnome-commander-1.2.9-git_D20100215T0000.tar.bz2 +0ff2cd358e1dc67ddea6aa9314b84e5c gnome-commander-1.2.8.6.tar.bz2