commit 4602e6c45c4718d8c6493e31631bdfabadede5d4
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Fri Jun 19 17:49:44 2020 +0200
- updated to 1.10.3
- updated flags patch
gnome-commander-flags.patch | 75 ++++++++++++++++++++++-----------------------
gnome-commander.spec | 16 ++++------
2 files changed, 42 insertions(+), 49 deletions(-)
---
diff --git a/gnome-commander.spec b/gnome-commander.spec
index 16483af..c12f2c5 100644
--- a/gnome-commander.spec
+++ b/gnome-commander.spec
@@ -1,12 +1,12 @@
Summary: A GNOME filemanager similar to the Midnight Commander
Summary(pl.UTF-8): Zarządca plików dla środowiska GNOME w stylu Midnight
Commandera
Name: gnome-commander
-Version: 1.10.2
+Version: 1.10.3
Release: 1
License: GPL v2+
Group: X11/Applications
Source0:
http://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.10/%{name}-%{version}.tar.xz
-# Source0-md5: e1ce66c5e64972943fcb51a3a9a74731
+# Source0-md5: 7dd034567c14cfd49ec60f722ecd7368
Patch0: %{name}-flags.patch
Patch1: %{name}-am.patch
Patch2: %{name}-gsf.patch
@@ -20,10 +20,7 @@ BuildRequires: flex
BuildRequires: gettext-tools >= 0.19.7
BuildRequires: glib2-devel >= 1:2.44.0
BuildRequires: gnome-vfs2-devel >= 2.0.0
-BuildRequires: gtk+2-devel >= 2:2.18.0
-BuildRequires: libgnome-devel >= 2.0.0
-BuildRequires: libgnome-keyring-devel >= 2.22
-BuildRequires: libgnomeui-devel >= 2.4.0
+BuildRequires: gtk+2-devel >= 2:2.24.0
BuildRequires: libgsf-devel >= 1.14.26
BuildRequires: libstdc++-devel >= 6:4.7
BuildRequires: libtool >= 2:2
@@ -40,7 +37,7 @@ Requires(post,postun): /sbin/ldconfig
Requires(post,postun): glib2 >= 1:2.44.0
Requires: exiv2-libs >= 0.14
Requires: glib2 >= 1:2.44.0
-Requires: gtk+2 >= 2:2.18.0
+Requires: gtk+2 >= 2:2.24.0
Requires: libgnome-keyring >= 2.22
Requires: libgnomeui >= 2.4.0
Requires: libgsf >= 1.14.26
@@ -76,7 +73,6 @@ kilka dodatkowych jak np. klienta FTP.
%{__autoheader}
%{__automake}
%configure \
- --disable-scrollkeeper \
--disable-static
%{__make}
@@ -88,7 +84,7 @@ rm -rf $RPM_BUILD_ROOT
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/{plugins/,}*.la
-%find_lang %{name} --with-gnome --with-omf
+%find_lang %{name} --with-gnome
%clean
rm -rf $RPM_BUILD_ROOT
@@ -110,10 +106,10 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_libdir}/%{name}/plugins
%attr(755,root,root) %{_libdir}/%{name}/libgcmd.so*
%attr(755,root,root) %{_libdir}/%{name}/plugins/libfileroller.so
-%{_datadir}/appdata/gnome-commander.appdata.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gnome-commander.enums.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gnome-commander.gschema.xml
%{_datadir}/gnome-commander
+%{_datadir}/metainfo/gnome-commander.appdata.xml
%{_desktopdir}/gnome-commander.desktop
%{_pixmapsdir}/gnome-commander.svg
%{_pixmapsdir}/gnome-commander
diff --git a/gnome-commander-flags.patch b/gnome-commander-flags.patch
index df4db3c..223fd9c 100644
--- a/gnome-commander-flags.patch
+++ b/gnome-commander-flags.patch
@@ -29,80 +29,77 @@
CLEANFILES = \
gnome-cmd-advrename-lexer.cc
---- gnome-commander-1.10.2/libgcmd/Makefile.am.orig 2019-11-28
19:07:07.498742034 +0100
-+++ gnome-commander-1.10.2/libgcmd/Makefile.am 2019-11-28 19:22:31.153738166
+0100
+--- gnome-commander-1.10.3/libgcmd/Makefile.am.orig 2020-06-19
16:28:11.056464167 +0200
++++ gnome-commander-1.10.3/libgcmd/Makefile.am 2020-06-19 16:29:17.959435056
+0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
--AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses
-Werror=cast-function-type -Wno-cast-function-type
-+AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses
+-AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses
-Werror=cast-function-type -Wno-cast-function-type -Wno-deprecated-declarations
++AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses
-Wno-deprecated-declarations
AM_LDFLAGS = $(WARN_LDFLAGS)
AM_CPPFLAGS = \
---- gnome-commander-1.10.2/src/Makefile.am.orig 2019-11-28
19:07:07.498742034 +0100
-+++ gnome-commander-1.10.2/src/Makefile.am 2019-11-28 19:21:37.357362939
+0100
-@@ -3,8 +3,7 @@
- SUBDIRS = dialogs tags intviewer
+--- gnome-commander-1.10.3/src/Makefile.am.orig 2020-06-19
16:28:11.056464167 +0200
++++ gnome-commander-1.10.3/src/Makefile.am 2020-06-19 16:30:23.615746032
+0200
+@@ -4,7 +4,7 @@
AM_CXXFLAGS = $(WARN_CXXFLAGS) -Wno-error=switch-default -Wno-switch-default \
-- -Werror=parentheses -Wno-parentheses \
-- -Werror=cast-function-type
-Wno-cast-function-type
-+ -Werror=parentheses -Wno-parentheses
+ -Werror=parentheses -Wno-parentheses \
+- -Werror=cast-function-type
-Wno-cast-function-type -Wno-deprecated-declarations
++ -Wno-deprecated-declarations
AM_LDFLAGS = $(WARN_LDFLAGS)
AM_CPPFLAGS = \
---- gnome-commander-1.10.2/src/dialogs/Makefile.am.orig 2019-02-27
20:06:31.000000000 +0100
-+++ gnome-commander-1.10.2/src/dialogs/Makefile.am 2019-11-28
19:50:07.528098149 +0100
-@@ -2,8 +2,7 @@
-
+--- gnome-commander-1.10.3/src/dialogs/Makefile.am.orig 2020-06-19
16:28:11.056464167 +0200
++++ gnome-commander-1.10.3/src/dialogs/Makefile.am 2020-06-19
16:30:56.828899435 +0200
+@@ -3,7 +3,7 @@
noinst_LIBRARIES = libgcmd-dialogs.a
--AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses \
-- -Werror=cast-function-type
-Wno-cast-function-type
-+AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses
+ AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses \
+- -Werror=cast-function-type
-Wno-cast-function-type -Wno-deprecated-declarations
++ -Wno-deprecated-declarations
AM_LDFLAGS = $(WARN_LDFLAGS)
AM_CPPFLAGS = \
---- gnome-commander-1.10.2/src/tags/Makefile.am.orig 2019-02-27
20:06:31.000000000 +0100
-+++ gnome-commander-1.10.2/src/tags/Makefile.am 2019-11-28
19:52:00.240820866 +0100
-@@ -2,8 +2,7 @@
-
+--- gnome-commander-1.10.3/src/tags/Makefile.am.orig 2020-06-19
16:28:11.059797483 +0200
++++ gnome-commander-1.10.3/src/tags/Makefile.am 2020-06-19
16:31:22.348761182 +0200
+@@ -3,7 +3,7 @@
noinst_LIBRARIES = libgcmd-tags.a
--AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses \
-- -Werror=cast-function-type
-Wno-cast-function-type
-+AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses
+ AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses \
+- -Werror=cast-function-type
-Wno-cast-function-type -Wno-deprecated-declarations
++ -Wno-deprecated-declarations
AM_LDFLAGS = $(WARN_LDFLAGS)
AM_CPPFLAGS = \
---- gnome-commander-1.10.2/src/intviewer/Makefile.am.orig 2019-02-27
20:06:31.000000000 +0100
-+++ gnome-commander-1.10.2/src/intviewer/Makefile.am 2019-11-28
19:55:11.363118801 +0100
-@@ -1,7 +1,6 @@
+--- gnome-commander-1.10.3/src/intviewer/Makefile.am.orig 2020-06-19
16:28:11.059797483 +0200
++++ gnome-commander-1.10.3/src/intviewer/Makefile.am 2020-06-19
16:31:50.898606514 +0200
+@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
--AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses \
-- -Werror=cast-function-type
-Wno-cast-function-type
-+AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses
+ AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses \
+- -Werror=cast-function-type
-Wno-cast-function-type -Wno-deprecated-declarations
++ -Wno-deprecated-declarations
AM_LDFLAGS = $(WARN_LDFLAGS)
AM_CPPFLAGS = \
---- gnome-commander-1.10.2/plugins/test/Makefile.am.orig 2019-02-27
20:06:31.000000000 +0100
-+++ gnome-commander-1.10.2/plugins/test/Makefile.am 2019-11-28
20:26:12.119704884 +0100
+--- gnome-commander-1.10.3/plugins/test/Makefile.am.orig 2020-06-19
16:28:11.059797483 +0200
++++ gnome-commander-1.10.3/plugins/test/Makefile.am 2020-06-19
16:32:28.171737921 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
--AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses
-Werror=cast-function-type -Wno-cast-function-type
-+AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses
+-AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses
-Werror=cast-function-type -Wno-cast-function-type -Wno-deprecated-declarations
++AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses
-Wno-deprecated-declarations
AM_LDFLAGS = $(WARN_LDFLAGS)
AM_CPPFLAGS = \
---- gnome-commander-1.10.2/plugins/fileroller/Makefile.am.orig 2019-02-27
20:06:31.000000000 +0100
-+++ gnome-commander-1.10.2/plugins/fileroller/Makefile.am 2019-11-28
20:36:44.592945150 +0100
+--- gnome-commander-1.10.3/plugins/fileroller/Makefile.am.orig 2020-06-19
16:28:11.059797483 +0200
++++ gnome-commander-1.10.3/plugins/fileroller/Makefile.am 2020-06-19
16:32:54.294929733 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
--AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses
-Werror=cast-function-type -Wno-cast-function-type
-+AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses
+-AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses
-Werror=cast-function-type -Wno-cast-function-type -Wno-deprecated-declarations
++AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses
-Wno-deprecated-declarations
AM_LDFLAGS = $(WARN_LDFLAGS)
AM_CPPFLAGS = \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnome-commander.git/commitdiff/4602e6c45c4718d8c6493e31631bdfabadede5d4
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
