[packages/gentoo] - up to 0.20.7

mrozowik mrozowik at pld-linux.org
Sun Jun 18 02:22:36 CEST 2023


commit 036d535210237292c1995f19ce774d9d703fd558
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date:   Sat Jun 17 22:25:56 2023 +0000

    - up to 0.20.7

 gentoo-home_etc.patch     | 61 -----------------------------------------------
 gentoo-locale_names.patch | 11 ++++-----
 gentoo.spec               | 20 ++++++++--------
 3 files changed, 15 insertions(+), 77 deletions(-)
---
diff --git a/gentoo.spec b/gentoo.spec
index 4f8c77b..7c9bc34 100644
--- a/gentoo.spec
+++ b/gentoo.spec
@@ -1,21 +1,21 @@
 Summary:	gentoo - a GTK+ file manager for Linux
 Summary(pl.UTF-8):	gentoo - oparty na GTK+ zarządca plików pod Linuksa
 Name:		gentoo
-Version:	0.15.5
+Version:	0.20.7
 Release:	1
 License:	GPL
 Group:		X11/Applications
-Source0:	http://dl.sourceforge.net/gentoo/%{name}-%{version}.tar.gz
-# Source0-md5:	94366fb19df7b2f7db1707606a01630e
+Source0:	http://downloads.sourceforge.net/gentoo/%{name}-%{version}.tar.gz
+# Source0-md5:	a3878a900205c57f8816b3cade3fc17c
 Source1:	%{name}.desktop
 Source2:	%{name}.png
-Patch0:		%{name}-home_etc.patch
-Patch1:		%{name}-locale_names.patch
+Patch0:		%{name}-locale_names.patch
 URL:		http://www.obsession.se/gentoo/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gettext-tools
-BuildRequires:	gtk+2-devel
+BuildRequires:	glib2-devel
+BuildRequires:	gtk+3-devel >= 3.12.0
 BuildRequires:	libtool
 Requires:	file
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -48,11 +48,11 @@ trochę ze swojego wyglądu od klasycznego zarządcy plików Amigi --
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 mv -f po/ru{_RU.utf8,}.po
 rm -f po/ru_RU.*
 mv -f po/ja{_JP.UTF-8,}.po
+mv -f po/ja{_JP.UTF-8,}.gmo
 
 %build
 %{__gettextize}
@@ -69,9 +69,9 @@ install -d $RPM_BUILD_ROOT{%{_mandir}/man1,%{_desktopdir},%{_pixmapsdir}}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install docs/gentoo.1x $RPM_BUILD_ROOT%{_mandir}/man1
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
+cp -p docs/gentoo.1x $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 %find_lang %{name}
 
diff --git a/gentoo-home_etc.patch b/gentoo-home_etc.patch
deleted file mode 100644
index 02c1735..0000000
--- a/gentoo-home_etc.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -u -r --from-file=gentoo-0.11.55/ gentoo-0.11.55/src/configure.c gentoo-0.11.55-home_etc/src/configure.c
---- gentoo-0.11.55/src/configure.c	2003-10-12 15:45:23.000000000 +0200
-+++ gentoo-0.11.55-home_etc/src/configure.c	2005-06-24 00:11:12.000000000 +0200
-@@ -173,14 +173,22 @@
- 	guint		i;
- 	const CfgModule	*page;
- 
-+	if((home = getenv("HOME_ETC")) != NULL)
-+	{
-+		strcpy(rcname, home);
-+		strcat(rcname, "/" RCNAME);
-+	}
-+
-+	else { 
- 	if((home = getenv("HOME")) != NULL)
- 	{
- 		strcpy(rcname, home);
- 		strcat(rcname, "/" RCNAME);
-+
- 	}
- 	else
- 		return;
--
-+	}
- 	cfg_modified_clear(min);
- 	if((out = xml_put_open(rcname)) != NULL)
- 	{
-@@ -440,9 +448,15 @@
- 	gchar	name[PATH_MAX] = "", *hpath;
- 	guint32	i, flags = 0UL;
- 
--	if((hpath = getenv("HOME")) != NULL)
-+	if((hpath = getenv("HOME_ETC")) != NULL) {
- 		g_snprintf(name, sizeof name, "%s" G_DIR_SEPARATOR_S "%s", hpath, RCNAME);
--
-+	}
-+	else {
-+	if((hpath = getenv("HOME")) != NULL) {
-+		g_snprintf(name, sizeof name, "%s" G_DIR_SEPARATOR_S "%s", hpath, RCNAME);
-+		}
-+	}
-+	
- 	/* Does the user seem to have a local config? */
- 	if(!fut_can_read_named(name))
- 		g_snprintf(name, sizeof name, PATH_CFG G_DIR_SEPARATOR_S "%s", RCNAME + 1);	/* Nope, check for global one. */
-@@ -464,9 +478,14 @@
- 	{
- 		gchar	homename[PATH_MAX] = "", syscfg[PATH_MAX], whine[2 * PATH_MAX];
- 
-+		if((hpath = getenv("HOME_ETC")) != NULL) {
-+			g_snprintf(homename, sizeof homename, "%s/%s", hpath, RCNAME);
-+		}
-+		else {
- 		if((hpath = getenv("HOME")) != NULL)
- 			g_snprintf(homename, sizeof homename, "%s/%s", hpath, RCNAME);
--
-+		}
-+		
- 		g_snprintf(syscfg, sizeof syscfg, PATH_CFG G_DIR_SEPARATOR_S "%s", RCNAME + 1);
- 		g_snprintf(whine, sizeof whine, _("Couldn't find any configuration file; checked\n"
- 				"both \"%s\" and \"%s\".\n"
diff --git a/gentoo-locale_names.patch b/gentoo-locale_names.patch
index 9d429d0..68e3733 100644
--- a/gentoo-locale_names.patch
+++ b/gentoo-locale_names.patch
@@ -1,7 +1,6 @@
-diff -burN gentoo-0.11.54.orig/po/LINGUAS gentoo-0.11.54/po/LINGUAS
---- gentoo-0.11.54.orig/po/LINGUAS	2004-12-31 22:19:35.291339544 +0100
-+++ gentoo-0.11.54/po/LINGUAS	2004-12-31 22:33:59.444968224 +0100
-@@ -1,2 +1,2 @@
+--- gentoo-0.20.7/po/LINGUAS~	2014-03-14 20:25:05.000000000 +0000
++++ gentoo-0.20.7/po/LINGUAS	2023-06-17 22:04:53.814357645 +0000
+@@ -1,2 +1,3 @@
  # Set of available languages for gentoo.
--de es_MX fr it ja_JP.UTF-8 pl ru_RU.cp1251 ru_RU.CP1251 ru_RU.KOI8-R ru_RU.koi8r ru_RU.UTF-8 ru_RU.utf8 sv
-+de es fr it ja pl ru sv
+ ca de es es_MX fr it ja_JP.UTF-8 pl ru_RU.cp1251 ru_RU.CP1251 ru_RU.KOI8-R ru_RU.koi8r ru_RU.UTF-8 ru_RU.utf8 sv
++ca de es fr it ja pl ru sv
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gentoo.git/commitdiff/036d535210237292c1995f19ce774d9d703fd558



More information about the pld-cvs-commit mailing list