rpms/gnome-commander/F-13 .cvsignore, 1.44, 1.45 gnome-commander.spec, 1.73, 1.74 sources, 1.45, 1.46 gnome-commander-1.2.8.5-makefile-relpath.patch, 1.1, NONE

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31295

Modified Files:
	.cvsignore gnome-commander.spec sources 
Removed Files:
	gnome-commander-1.2.8.5-makefile-relpath.patch 
Log Message:
* Thu Jun  3 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2:1.2.8.6-1
- Update to 1.2.8.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-13/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	11 May 2010 19:29:53 -0000	1.44
+++ .cvsignore	2 Jun 2010 18:34:51 -0000	1.45
@@ -1,2 +1 @@
-gnome-commander-1.2.8.5.tar.bz2
-gnome-commander-ko.po.gz
+gnome-commander-1.2.8.6.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-13/gnome-commander.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- gnome-commander.spec	11 May 2010 19:29:53 -0000	1.73
+++ gnome-commander.spec	2 Jun 2010 18:34:51 -0000	1.74
@@ -26,7 +26,7 @@
 %global        use_autotool          0
 %global        update_po             0
 %global        if_pre                0
-%global        main_release          3
+%global        main_release          1
 %global        extratag              git_%{git_pull_JST}
 %undefine      extratag
 %global        mimeedit_rev          1958
@@ -38,13 +38,14 @@
 %global        update_po             0
 %endif
 
-# Patch1 needs autotool
+# 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.8.5
+Version:       1.2.8.6
 # Downgrade 2 times
 Epoch:         2
 Release:       %{fedora_rel}%{?dist}
@@ -57,10 +58,7 @@ License:       GPLv2+
 URL:           http://www.nongnu.org/gcmd/
 Source0:       ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}%{?extratag:-%extratag}.tar.bz2
 Source1:       gnome-commander.sh
-# From gcmd-dev mailing list
-Source2:       gnome-commander-ko.po.gz
 Source10:      mimeedit-svn%{mimeedit_rev}.sh
-Patch1:        gnome-commander-1.2.8.5-makefile-relpath.patch
 Patch10:       mimeedit-svn1958.diff
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -93,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. 
@@ -126,20 +122,11 @@ ansluta till FTP-servrar och SMB-nätver
 
 %prep
 %setup -q -n %{name}-%{version}%{?extratag:-%extratag}
-%patch1 -p1 -b .path
 
 %if 0%{use_autotool} > 0
 ( export NOCONFIGURE=1 ; sh autogen.sh )
 %endif
 
-# Add ko translation (file from gcmd-dev mailing list)
-cd po
-%{__gzip} -dc %{SOURCE2} > ko.po
-cp -p LINGUAS LINGUAS.new
-echo "ko" >> LINGUAS.new
-sort LINGUAS.new > LINGUAS
-cd ..
-
 %{__cp} -p %SOURCE10 mimeedit.sh
 %patch10 -p0
 
@@ -154,6 +141,19 @@ gzip -9 ChangeLog-*
 # 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
@@ -205,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}
 
@@ -240,6 +234,9 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Thu Jun  3 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2:1.2.8.6-1
+- Update to 1.2.8.6
+
 * Wed May 12 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2:1.2.8.5-3
 - Again downgrade, after the discussion with the upstream
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-13/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	11 May 2010 19:29:53 -0000	1.45
+++ sources	2 Jun 2010 18:34:52 -0000	1.46
@@ -1,2 +1 @@
-f5f4365ef6c43141d2b1ec45e3530595  gnome-commander-1.2.8.5.tar.bz2
-456b36b63db63d53dbc198b298f71569  gnome-commander-ko.po.gz
+0ff2cd358e1dc67ddea6aa9314b84e5c  gnome-commander-1.2.8.6.tar.bz2


--- gnome-commander-1.2.8.5-makefile-relpath.patch DELETED ---