rpms/gnome-commander/F-12 .cvsignore, 1.42, 1.43 gnome-commander.spec, 1.69, 1.70 sources, 1.43, 1.44 gnome-commander-1.2.8.5-makefile-relpath.patch, 1.1, NONE
Mamoru Tasaka
mtasaka at fedoraproject.org
Wed Jun 2 18:42:42 UTC 2010
Author: mtasaka
Update of /cvs/extras/rpms/gnome-commander/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32670
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> - 1:1.2.8.6-1
- Update to 1.2.8.6
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-12/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore 3 Mar 2010 08:51:52 -0000 1.42
+++ .cvsignore 2 Jun 2010 18:42:41 -0000 1.43
@@ -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-12/gnome-commander.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- gnome-commander.spec 3 Mar 2010 08:51:53 -0000 1.69
+++ gnome-commander.spec 2 Jun 2010 18:42:42 -0000 1.70
@@ -26,7 +26,7 @@
%global use_autotool 0
%global update_po 0
%global if_pre 0
-%global main_release 2
+%global main_release 1
%global extratag git_%{git_pull_JST}
%undefine extratag
%global mimeedit_rev 1958
@@ -38,17 +38,16 @@
%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
-%if 0%{?fedora} >= 12
+Version: 1.2.8.6
# Downgrade 1 time
Epoch: 1
-%endif
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)
@@ -59,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)
@@ -95,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.
@@ -128,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
@@ -156,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
@@ -207,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}
@@ -242,6 +234,9 @@ scrollkeeper-update -q || :
%{_datadir}/pixmaps/%{name}/
%changelog
+* Thu Jun 3 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:1.2.8.6-1
+- Update to 1.2.8.6
+
* Wed Mar 3 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:1.2.8.5-2
- Add ko_KR translation (from gcmd-dev mailing list)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-12/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources 3 Mar 2010 08:51:53 -0000 1.43
+++ sources 2 Jun 2010 18:42:42 -0000 1.44
@@ -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 ---
More information about the scm-commits
mailing list