rpms/gnome-commander/devel .cvsignore, 1.42, 1.43 gnome-commander.spec, 1.73, 1.74 sources, 1.43, 1.44

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6206

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
* Sat Jun 12 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3:1.2.8.6-1
- Finally downgrade to 1.2.8.6 even on rawhide as the upsteam changed release plan



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	14 Feb 2010 17:15:15 -0000	1.42
+++ .cvsignore	11 Jun 2010 19:54:55 -0000	1.43
@@ -1 +1 @@
-gnome-commander-1.2.9-git_D20100215T0000.tar.bz2
+gnome-commander-1.2.8.6.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/gnome-commander.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- gnome-commander.spec	31 May 2010 16:14:23 -0000	1.73
+++ gnome-commander.spec	11 Jun 2010 19:54:55 -0000	1.74
@@ -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ätver
 %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 <mtasaka at ioa.s.u-tokyo.ac.jp> - 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 <rdieter at fedoraproject.org> - 2:1.2.9-0.6.git_D20100215T0000
 - rebuild (exiv2)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	14 Feb 2010 17:15:15 -0000	1.43
+++ sources	11 Jun 2010 19:54:55 -0000	1.44
@@ -1 +1 @@
-0943baf1acf99719477798c8b0849f4e  gnome-commander-1.2.9-git_D20100215T0000.tar.bz2
+0ff2cd358e1dc67ddea6aa9314b84e5c  gnome-commander-1.2.8.6.tar.bz2