[gentoo] Update to 0.20.6 Drop patch not needed anymore

Fri Feb 13 06:23:19 UTC 2015

commit 0f4b0fdc751df3d39093741ad44a194626003e24
Author: Christopher Meng <i at cicku.me>
Date:   Fri Feb 13 14:13:12 2015 +0800

    Update to 0.20.6
    Drop patch not needed anymore

 .gitignore                 |    2 +
 gentoo-0.15.2-cflags.patch |   13 -------
 gentoo.desktop             |    1 +
 gentoo.spec                |   87 +++++++++++++++++++-------------------------
 sources                    |    2 +-
 5 files changed, 42 insertions(+), 63 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 03dfb2f..a4d62bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ gentoo-0.15.6.tar.gz
 /gentoo-0.19.6.tar.gz
 /gentoo-0.19.12.tar.gz
 /gentoo-0.19.13.tar.gz
+/gentoo-0.20.4.tar.gz
+/gentoo-0.20.6.tar.gz
diff --git a/gentoo.desktop b/gentoo.desktop
index e630334..03d700d 100644
--- a/gentoo.desktop
+++ b/gentoo.desktop
@@ -5,4 +5,5 @@ Icon=gentoo
 Exec=gentoo
 Terminal=false
 Type=Application
+StartupNotify=true
 Categories=System;FileTools;FileManager;
diff --git a/gentoo.spec b/gentoo.spec
index 10db318..1b30595 100644
--- a/gentoo.spec
+++ b/gentoo.spec
@@ -1,73 +1,60 @@
-Summary: Graphical file management program in GTK+ for Linux
-Name: gentoo
-Version: 0.19.13
-Release: 6%{?dist}
-License: GPLv2
-Group: Applications/File
-URL: http://www.obsession.se/gentoo/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source1: gentoo.desktop
+Name:           gentoo
+Version:        0.20.6
+Release:        1%{?dist}
+Summary:        Graphical file management program written in GTK+3
+License:        GPLv2
+URL:            http://www.obsession.se/gentoo/
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source1:        gentoo.desktop
 # icons/gentoo.png is not within standard sizes
 # Get here http://www.obsession.se/gentoo/gfx/logo.png (not in sources)
-Source2: gentoo.png
-# Generate debuginfo properly
-Patch0: %{name}-0.15.2-cflags.patch
+Source2:        gentoo.png\
 # Remove duplicated translations
-Patch1: %{name}-0.19.12-locales.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gtk2-devel
-BuildRequires: gettext
-BuildRequires: desktop-file-utils
+Patch0:         %{name}-0.19.12-locales.patch
+BuildRequires:  desktop-file-utils
+BuildRequires:  gtk3-devel >= 3.12
+BuildRequires:  gettext
 
 %description
-gentoo is a file manager for Linux written from scratch in pure C. It
-uses the GTK2 toolkit for all of its interface needs. gentoo provides
-100%% GUI configurability; no need to edit config files by hand and re-
-start the program. gentoo supports identifying the type of various
-files (using extension, regular expressions, and/or the 'file' command),
-and can display files of different types with different colors and icons.
-gentoo borrows some of its look and feel from the classic Amiga
-file manager "Directory OPUS"(TM) (written by Jonathan Potter).
-
+gentoo is a file manager written from scratch in pure C. It uses the GTK3 
+toolkit for all of its interface needs. gentoo provides 100%% GUI 
+configurability; no need to edit config files by hand and re-start the 
+program. gentoo supports identifying the type of various files (using 
+extension, regular expressions, and/or the 'file' command), and can display 
+files of different types with different colors and icons. gentoo borrows 
+some of its look and feel from the classic Amiga file manager 
+"Directory OPUS"(TM) (written by Jonathan Potter).
 
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 # Remove duplicated translations, keep only UTF-8
 pushd po
 mv ja{_JP.UTF-8,}.po
 mv ja{_JP.UTF-8,}.gmo
 mv ru{_RU.UTF-8,}.po
 mv ru{_RU.UTF-8,}.gmo
-rm -f ru_RU.*.{po,gmo}
+rm -frv ru_RU.*.{po,gmo}
 popd
 
-
 %build
-%configure --disable-dependency-tracking
-%{__make} %{?_smp_mflags}
-
+%configure
+%make_build
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
-%find_lang %{name}
+%make_install
+
 # Included man page, not installed by default
-%{__install} -D -p -m 0644 docs/gentoo.1x %{buildroot}%{_mandir}/man1/gentoo.1
+install -pDm0644 docs/gentoo.1x %{buildroot}%{_mandir}/man1/gentoo.1
 # Don't install the man page again in %doc
-%{__rm} docs/gentoo.1x
+rm -frv docs/gentoo.1x
 # Our own desktop entry, with its icon
-%{__install} -D -p -m 0644 %{SOURCE2} \
+install -pDm0644 %{SOURCE2} \
     %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/gentoo.png
-%{__mkdir_p} %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor "" --dir %{buildroot}%{_datadir}/applications \
-    %{SOURCE1}
 
+desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1}
 
-%clean
-%{__rm} -rf %{buildroot}
-
+%find_lang %{name}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -81,11 +68,10 @@ fi
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
-
 %files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS BUGS ChangeLog CONFIG-CHANGES COPYING CREDITS docs/
+%doc AUTHORS BUGS ChangeLog CONFIG-CHANGES CREDITS docs/
 %doc NEWS README* TODO
+%license COPYING
 %config %{_sysconfdir}/gentoo*
 %{_bindir}/gentoo
 %{_datadir}/applications/gentoo.desktop
@@ -93,8 +79,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/64x64/apps/gentoo.png
 %{_mandir}/man1/gentoo.1*
 
-
 %changelog
+* Fri Feb 13 2015 Christopher Meng <rpm at cicku.me> - 0.20.6-1
+- Update to 0.20.6
+- Switching to GTK+3
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.19.13-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
@@ -198,7 +187,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 - Update to 0.11.55.
 - Replace gnome-db-icon.png used until now with included gentoo.png.
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Thu Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 
 * Wed Nov 10 2004 Matthias Saou <http://freshrpms.net/> 0.11.53.2
diff --git a/sources b/sources
index fc77549..d751da0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-58761945ab938fbf563a5a30223fe281  gentoo-0.19.13.tar.gz
+3532dfc03abacbe06ba6639160ed46d7  gentoo-0.20.6.tar.gz
