rpms/gnome-commander/F-12 .cvsignore, 1.35, 1.36 gnome-commander.spec, 1.60, 1.61 sources, 1.36, 1.37

Mamoru Tasaka mtasaka at fedoraproject.org
Wed Sep 23 19:16:57 UTC 2009


Author: mtasaka

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

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
* Thu Sep 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Try latest git



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-12/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	22 Jun 2009 18:47:17 -0000	1.35
+++ .cvsignore	23 Sep 2009 19:16:57 -0000	1.36
@@ -1 +1,2 @@
-gnome-commander-1.3-git_D20090623T0316_13dev.tar.bz2
+gnome-commander-1.3-git_D20090924T0215_13dev.tar.bz2
+gnome-commander-1.2.8.2-po.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-12/gnome-commander.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- gnome-commander.spec	27 Jul 2009 15:21:55 -0000	1.60
+++ gnome-commander.spec	23 Sep 2009 19:16:57 -0000	1.61
@@ -1,12 +1,14 @@
 # To use git, follow:
 #
-# git clone  git://git.gnome.org/gnome-commander
+# git clone git://git.gnome.org/gnome-commander
 # cd gnome-commander/
-# git rebase origin/gcmd-1-3
+# git checkout -b gcmd-1-3 origin/gcmd-1-3
+# git pull
+# ...
 # cd ..
-# ln -sf gcmd-1-3 gnome-commander-%%{version}-git_%%{git_pull_JST}
+# ln -sf gcmd-commander 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}
+#    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/
@@ -14,13 +16,19 @@
 #
 # ref: http://lists.gnu.org/archive/html/gcmd-devel/2007-11/msg00076.html
 
+#
+# Source20 is extracted from gnome-commander-1.2.8.2.tar.bz2
+# wget -N ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/gnome-commander-1.2.8.2.tar.bz2
+# tar xf gnome-commander-1.2.8.2.tar.bz2
+# tar cjf gnome-commander-1.2.8.2-po.tar.bz2 gnome-commander-1.2.8.2/po/
+
 %define        EXIV2_REQ             0.14
 %define        TAGLIB_REQ            1.4
 %define        LIBGSF_REQ            1.12.0
 %define        POPPLER_REQ           0.6
 %define        VTE_REQ               0.11
 
-%define        git_pull_JST          D20090623T0316
+%define        git_pull_JST          D20090924T0215
 
 %define        use_autotool          0
 %define        if_pre                1
@@ -28,6 +36,8 @@
 %define        extratag              git_%{git_pull_JST}_13dev
 %define        mimeedit_rev          1958
 
+%define        update_po             1
+
 %if 0%{?if_pre} > 0
 %define        use_autotool          1
 %endif
@@ -36,7 +46,7 @@
 
 Name:          gnome-commander
 Version:       1.3
-Release:       %{fedora_rel}%{?dist}.1
+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)
 Summary(sv):   GNOME Commander är en snabb och smidig filhanderare för GNOME
@@ -47,6 +57,9 @@ 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
+%if %{update_po}
+Source20:      gnome-commander-1.2.8.2-po.tar.bz2
+%endif
 Patch10:       mimeedit-svn1958.diff
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -112,7 +125,7 @@ Utöver att kunna hantera filer på din 
 ansluta till FTP-servrar och SMB-nätverk.
 
 %prep
-%setup -q -n %{name}-%{version}%{?extratag:-%extratag}
+%setup -q -n %{name}-%{version}%{?extratag:-%extratag} -a 20
 
 %if 0%{use_autotool} > 0
 %{__sed} -i.conf '$s|^\(.*\)|NOCONFIGURE=1 \1|' autogen.sh
@@ -126,6 +139,14 @@ cp -p %SOURCE10 mimeedit.sh
    -e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \
    configure
 
+# Update po
+%if %{update_po}
+%{__cp} -p gnome-commander-1.2.*/po/*.po po/
+pushd po
+ls -1 *.po | sort | %{__sed} -e 's|\.po||' > LINGUAS
+popd
+%endif
+
 touch po/POTFILES.in
 touch -r po/POTFILES.in po/stamp-it
 
@@ -137,6 +158,17 @@ touch -r po/POTFILES.in po/stamp-it
    --bindir=%{_libexecdir}/%{name} \
    --disable-scrollkeeper \
    --enable-python
+
+
+# update po
+%if %{update_po}
+pushd po
+rm -f POTFILES.in ; touch POTFILES.in
+intltool-update -m  2>&1 | grep '/' | grep -v ' ' > POTFILES.in
+make gnome-commander.pot update-po
+popd
+%endif
+
 # Sometimes parallel make fails (perhaps), however once
 # force it.
 %{__make} %{?_smp_mflags} -k || { %{__make} || exit 1; }
@@ -203,6 +235,9 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Thu Sep 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Try latest git
+
 * Tue Jul 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - F-12: Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-12/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	22 Jun 2009 18:47:17 -0000	1.36
+++ sources	23 Sep 2009 19:16:57 -0000	1.37
@@ -1 +1,2 @@
-e1d245fd383708b5142adf057c9abad1  gnome-commander-1.3-git_D20090623T0316_13dev.tar.bz2
+52df3ddcafb134c782a7b74369374ec6  gnome-commander-1.3-git_D20090924T0215_13dev.tar.bz2
+b190627ef20d9fe261c0445bc7d56877  gnome-commander-1.2.8.2-po.tar.bz2




More information about the fedora-extras-commits mailing list