rpms/gnome-commander/F-10 .cvsignore, 1.10, 1.11 gnome-commander.spec, 1.27, 1.28 sources, 1.10, 1.11

Mamoru Tasaka mtasaka at fedoraproject.org
Mon Jun 29 14:24:26 UTC 2009 

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25255/F-10

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
* Mon Jun 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8-1
- 1.2.8 released



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	29 Jul 2008 16:40:46 -0000	1.10
+++ .cvsignore	29 Jun 2009 14:23:55 -0000	1.11
@@ -1 +1 @@
-gnome-commander-1.2.7.tar.bz2
+gnome-commander-1.2.8.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-10/gnome-commander.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- gnome-commander.spec	12 Aug 2008 15:07:00 -0000	1.27
+++ gnome-commander.spec	29 Jun 2009 14:23:55 -0000	1.28
@@ -1,8 +1,9 @@
-# To use svn, follow:
+# To use git, follow:
 #
-# svn checkout svn://svn.gnome.org/svn/gnome-commander/trunk
-# mv trunk %%{name}-%%{version}-%%{extratag}
-# tar cjf %%{name}-%%{version}-%%{extratag}.tar.bz2 %%{name}-%%{version}-%%{extratag}
+# git clone  git://git.gnome.org/gnome-commander
+# ln -sf gcmd-1-3 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}
 
 # Source10 is created by:
 # svn co http://svn.gnome.org/svn/gnome-commander/branches/gcmd-1-3/tools/mimeedit/
@@ -13,11 +14,15 @@
 %define        EXIV2_REQ             0.14
 %define        TAGLIB_REQ            1.4
 %define        LIBGSF_REQ            1.12.0
+%define        POPPLER_REQ           0.6
+
+%define        git_pull_JST          D20090629T1400
 
 %define        use_autotool          0
 %define        if_pre                0
-%define        main_release          4
-#%%define        extratag              svn1901_trunk
+%define        main_release          1
+%define        extratag              git_%{git_pull_JST}
+%undefine      extratag
 %define        mimeedit_rev          1958
 
 %if 0%{?if_pre} > 0
@@ -27,7 +32,7 @@
 %define        fedora_rel            %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag}
 
 Name:          gnome-commander
-Version:       1.2.7
+Version:       1.2.8
 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)
@@ -39,7 +44,6 @@ URL:           http://www.nongnu.org/gcm
 Source0:       ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}%{?extratag:-%extratag}.tar.bz2
 Source1:       gnome-commander.sh
 Source10:      mimeedit-svn%{mimeedit_rev}.sh
-#Patch0:        gnome-commander-rev1874-hexmode-display.patch
 Patch10:       mimeedit-svn1958.diff
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -54,6 +58,7 @@ BuildRequires: gnome-vfs2-devel
 BuildRequires: libgsf-devel        >= %{LIBGSF_REQ}
 BuildRequires: libgnome-devel
 BuildRequires: libgnomeui-devel
+BuildRequires: poppler-devel       >= %{POPPLER_REQ}
 BuildRequires: taglib-devel        >= %{TAGLIB_REQ}
 
 BuildRequires: gnome-doc-utils
@@ -103,8 +108,17 @@ ansluta till FTP-servrar och SMB-nätver
 
 %prep
 %setup -q -n %{name}-%{version}%{?extratag:-%extratag}
-#%%patch0 -p0 -b .hexdumpmode
+
 %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
@@ -116,10 +130,10 @@ cp -p %SOURCE10 mimeedit.sh
    -e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \
    configure
 
-%if 0%{?fedora} >= 10
+%if 0%{?fedora} >= 10 && 0
 function replace_icon(){
 	find . -name \*.cc | xargs grep -l $1 | \
-		xargs %{__sed} -i -e "s|\"$1\"|\"$2\"|"
+		xargs %{__sed} -i.icon -e "s|\"$1\"|\"$2\"|"
 }
 
 
@@ -143,7 +157,9 @@ replace_icon	gnome-fs-web		folder-remote
    --bindir=%{_libexecdir}/%{name} \
    --disable-scrollkeeper \
    --enable-python
-%{__make} %{?_smp_mflags}
+# Sometimes parallel make fails (perhaps), however once
+# force it.
+%{__make} %{?_smp_mflags} -k || { %{__make} || exit 1; }
 
 %install
 %{__rm} -rf %{buildroot}
@@ -207,6 +223,41 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Mon Jun 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8-1
+- 1.2.8 released
+
+* Mon May 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8-0.4.git_D20090525T0045
+- Upstream moved to git
+
+* Sat Apr 11 2009 Mamour Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8-0.3.svn2532_trunk
+- rev 2532
+
+* Thu Apr  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8-0.3.svn2502_trunk
+- rev 2502
+
+* Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- F-11: Mass rebuild
+
+* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org>
+- respin (exiv2)
+
+* Thu Dec 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2361
+
+* Sat Dec  6 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2332
+- libtool 2.2 patch went upstream
+- "replace_icon" hack seems no longer needed
+
+* Thu Dec  4 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2330
+- Add patch to compile with libtool 2.2
+- And also compile with python 2.6
+
+* Mon Oct 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- 1.2.8 branch
+- rev 2221
+
 * Wed Aug 13 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.7-4
 - More fix for mimeedit.sh to remove potentially unsafe tmpfile
   creation


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	29 Jul 2008 16:40:46 -0000	1.10
+++ sources	29 Jun 2009 14:23:55 -0000	1.11
@@ -1 +1 @@
-7b0d1d50fda548be6600696bc752b6de  gnome-commander-1.2.7.tar.bz2
+5279bb3825efec3789932663e92fc8d2  gnome-commander-1.2.8.tar.bz2

More information about the fedora-extras-commits mailing list