- updated to 1.14.0

- updated flags patch
- removed obsolete am patch

diff --git a/gnome-commander-am.patch b/gnome-commander-am.patch
deleted file mode 100644 (file)
index d1021d0..0000000
--- a/gnome-commander-am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-commander-1.12.0/configure.ac.orig   2021-04-02 21:45:34.957633296 +0200
-+++ gnome-commander-1.12.0/configure.ac        2021-04-02 21:46:03.789121762 +0200
-@@ -7,7 +7,7 @@
- YELP_HELP_INIT
- 
- AM_MAINTAINER_MODE
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS([config.h])
- 
- AC_USE_SYSTEM_EXTENSIONS
- 

diff --git a/gnome-commander-flags.patch b/gnome-commander-flags.patch
index 27a0ae1782f2db6785b8d6fc3b4ac64b5118cbf2..8b45294df4db3ec6dfb3ed9a6a3d35980f7495a5 100644 (file)
--- a/gnome-commander-flags.patch
+++ b/gnome-commander-flags.patch
@@ -1,74 +1,74 @@
---- 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
+--- gnome-commander-1.14.0/libgcmd/Makefile.am.orig    2022-02-06 19:56:23.379517062 +0100
++++ gnome-commander-1.14.0/libgcmd/Makefile.am 2022-02-06 19:57:14.269241369 +0100
 @@ -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 -Wno-deprecated-declarations
-+AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses -Wno-deprecated-declarations
+-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 \
+                               -Wno-inline
  AM_LDFLAGS = $(WARN_LDFLAGS)
  
- AM_CPPFLAGS = \
---- 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 @@
+--- gnome-commander-1.14.0/src/Makefile.am.orig        2022-02-06 19:57:37.085784427 +0100
++++ gnome-commander-1.14.0/src/Makefile.am     2022-02-06 19:59:26.431858716 +0100
+@@ -4,7 +4,7 @@ SUBDIRS = dialogs tags intviewer
  
  AM_CXXFLAGS = $(WARN_CXXFLAGS) -Wno-error=switch-default -Wno-switch-default \
                                -Werror=parentheses -Wno-parentheses \
--                              -Werror=cast-function-type -Wno-cast-function-type -Wno-deprecated-declarations
-+                              -Wno-deprecated-declarations
+-                              -Werror=cast-function-type -Wno-cast-function-type -Wno-deprecated-declarations \
++                              -Wno-deprecated-declarations \
+                               -Wno-inline
  AM_LDFLAGS = $(WARN_LDFLAGS)
  
- AM_CPPFLAGS = \
---- 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
+--- gnome-commander-1.14.0/src/dialogs/Makefile.am.orig        2022-02-06 19:59:57.568356702 +0100
++++ gnome-commander-1.14.0/src/dialogs/Makefile.am     2022-02-06 20:05:44.376477881 +0100
 @@ -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 -Wno-deprecated-declarations
-+                              -Wno-deprecated-declarations
+-                              -Werror=cast-function-type -Wno-cast-function-type -Wno-deprecated-declarations \
++                              -Wno-deprecated-declarations \
+                               -Wno-inline
  AM_LDFLAGS = $(WARN_LDFLAGS)
  
- AM_CPPFLAGS = \
---- 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
+--- gnome-commander-1.14.0/src/tags/Makefile.am.orig   2022-02-06 20:06:21.566276406 +0100
++++ gnome-commander-1.14.0/src/tags/Makefile.am        2022-02-06 20:07:56.779093928 +0100
 @@ -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 -Wno-deprecated-declarations
-+                              -Wno-deprecated-declarations
+-                              -Werror=cast-function-type -Wno-cast-function-type -Wno-deprecated-declarations \
++                              -Wno-deprecated-declarations \
+                               -Wno-inline
  AM_LDFLAGS = $(WARN_LDFLAGS)
  
- AM_CPPFLAGS = \
---- 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
+--- gnome-commander-1.14.0/src/intviewer/Makefile.am.orig      2022-02-06 20:08:19.415637962 +0100
++++ gnome-commander-1.14.0/src/intviewer/Makefile.am   2022-02-06 20:09:02.795402954 +0100
 @@ -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 -Wno-deprecated-declarations
-+                              -Wno-deprecated-declarations
+-                              -Werror=cast-function-type -Wno-cast-function-type -Wno-deprecated-declarations \
++                              -Wno-deprecated-declarations \
+                               -Wno-inline
  AM_LDFLAGS = $(WARN_LDFLAGS)
  
- AM_CPPFLAGS = \
---- 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
+--- gnome-commander-1.14.0/plugins/test/Makefile.am.orig       2022-02-06 20:09:24.661951159 +0100
++++ gnome-commander-1.14.0/plugins/test/Makefile.am    2022-02-06 20:10:09.435041936 +0100
 @@ -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 -Wno-deprecated-declarations
-+AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses -Wno-deprecated-declarations
+-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 \
+                               -Wno-inline
  AM_LDFLAGS = $(WARN_LDFLAGS)
  
- AM_CPPFLAGS = \
---- 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
+--- gnome-commander-1.14.0/plugins/fileroller/Makefile.am.orig 2022-02-06 20:10:34.914903899 +0100
++++ gnome-commander-1.14.0/plugins/fileroller/Makefile.am      2022-02-06 20:21:05.311488749 +0100
 @@ -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 -Wno-deprecated-declarations
-+AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses -Wno-deprecated-declarations
+-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 \
+                               -Wno-inline
  AM_LDFLAGS = $(WARN_LDFLAGS)
  
- AM_CPPFLAGS = \

diff --git a/gnome-commander.spec b/gnome-commander.spec
index 5d16cee700be8d088b585225233d26c6a9d943d7..6ac14dc5cc44ab3434d304872ea29c5113439d94 100644 (file)
--- a/gnome-commander.spec
+++ b/gnome-commander.spec
@@ -1,24 +1,23 @@
 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.12.3.1
+Version:       1.14.0
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       https://download.gnome.org/sources/gnome-commander/1.12/%{name}-%{version}.tar.xz
-# Source0-md5: f88ba89a6baaf901f45728d19e04a20e
+Source0:       https://download.gnome.org/sources/gnome-commander/1.14/%{name}-%{version}.tar.xz
+# Source0-md5: 4c74efb40b28ab7e9d189c807c04ca32
 Patch0:                %{name}-flags.patch
-Patch1:                %{name}-am.patch
-Patch2:                %{name}-gsf.patch
+Patch1:                %{name}-gsf.patch
 URL:           https://gcmd.github.io/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: chmlib-devel
 BuildRequires: docbook-dtd412-xml
 BuildRequires: exiv2-devel >= 0.14
-BuildRequires: flex
+BuildRequires: flex >= 2.0.0
 BuildRequires: gettext-tools >= 0.19.7
-BuildRequires: glib2-devel >= 1:2.44.0
+BuildRequires: glib2-devel >= 1:2.70.0
 BuildRequires: gnome-vfs2-devel >= 2.0.0
 BuildRequires: gtk+2-devel >= 2:2.24.0
 BuildRequires: libgsf-devel >= 1.14.26
@@ -34,9 +33,9 @@ BuildRequires:        tar >= 1:1.22
 BuildRequires: xz
 BuildRequires: yelp-tools
 Requires(post,postun): /sbin/ldconfig
-Requires(post,postun): glib2 >= 1:2.44.0
+Requires(post,postun): glib2 >= 1:2.70.0
 Requires:      exiv2-libs >= 0.14
-Requires:      glib2 >= 1:2.44.0
+Requires:      glib2 >= 1:2.70.0
 Requires:      gtk+2 >= 2:2.24.0
 Requires:      libgnome-keyring >= 2.22
 Requires:      libgnomeui >= 2.4.0
@@ -64,7 +63,6 @@ kilka dodatkowych jak np. klienta FTP.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -106,8 +104,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/plugins/libfileroller.so
 %{_datadir}/glib-2.0/schemas/org.gnome.gnome-commander.enums.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.gnome-commander.gschema.xml
-%{_datadir}/metainfo/gnome-commander.appdata.xml
-%{_desktopdir}/gnome-commander.desktop
+%{_datadir}/metainfo/org.gnome.gnome-commander.appdata.xml
+%{_desktopdir}/org.gnome.gnome-commander.desktop
 %{_pixmapsdir}/gnome-commander.svg
 %{_pixmapsdir}/gnome-commander
 %{_mandir}/man1/gnome-commander.1*