diff --git a/.gitignore b/.gitignore index 9ef4841..fa3e98a 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ gnome-commander-1.2.8.7.tar.bz2 /gnome-commander-1.4.3.tar.xz /gnome-commander-1.4.4.tar.xz /gnome-commander-1.4.5.tar.xz +/gnome-commander-5a4806f7e5789a7d29d62550e9128436ffdef00a.tar.xz diff --git a/gnome-commander.spec b/gnome-commander.spec index 5dad1a1..9e68bef 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -21,14 +21,16 @@ %global LIBGSF_REQ 1.12.0 %global POPPLER_REQ 0.8 -%global git_pull_JST D20090629T1400 +%global git_pull_JST D20150504 +%global githash 5a4806f7e5789a7d29d62550e9128436ffdef00a +%global shorthash %(c=%{githash}; echo ${c:0:7}) %global use_autotool 0 %global update_po 0 %global if_pre 0 -%global main_release 3 -%global extratag git_%{git_pull_JST} -%undefine extratag +%global main_release 4 +%global extratag %{git_pull_JST}git%{shorthash} +#%%undefine extratag %global mimeedit_rev 1958 %if 0%{?if_pre} > 0 @@ -51,7 +53,7 @@ Name: gnome-commander Version: 1.4.5 # Downgrade 3 times, sorry... Epoch: 4 -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 @@ -59,7 +61,8 @@ Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME Group: Applications/File License: GPLv2+ URL: http://gcmd.github.io/ -Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.4/%{name}-%{version}%{?extratag:-%extratag}.tar.xz +#Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.4/%{name}-%{version}%{?extratag:-%extratag}.tar.xz +Source0: https://git.gnome.org/browse/gnome-commander/snapshot/%{name}-%{githash}.tar.xz Source1: gnome-commander.sh Source10: mimeedit-svn%{mimeedit_rev}.sh Patch10: mimeedit-svn1958.diff @@ -133,9 +136,8 @@ Utöver att kunna hantera filer på din egen dator så kan programmet även ansluta till FTP-servrar och SMB-nätverk. %prep -%setup -q -n %{name}-%{version}%{?extratag:-%extratag} - -%patch100 -p1 +#%%setup -q -n %{name}-%{version}%{?extratag:-%extratag} +%setup -q -n %{name}-%{githash} %if 0%{use_autotool} > 0 ( export NOCONFIGURE=1 ; sh autogen.sh ) @@ -255,6 +257,9 @@ desktop-file-install \ %{_datadir}/pixmaps/%{name}/ %changelog +* Mon May 4 2015 Mamoru TASAKA - 4:1.4.5-4.D20150504git5a4806f +- Try the latest git + * Sat May 02 2015 Kalev Lember - 4:1.4.5-3.1 - Rebuilt for GCC 5 C++11 ABI change diff --git a/sources b/sources index a7c2454..3f5771e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -34c9d2e9e8fdc8b8f28b9d7047a2e244 gnome-commander-1.4.5.tar.xz +fda7df19a9a99b6deb9d3e7be9733cd2 gnome-commander-5a4806f7e5789a7d29d62550e9128436ffdef00a.tar.xz