- updated to 1.10.2

- updated flags patch

diff --git a/gnome-commander-flags.patch b/gnome-commander-flags.patch
index 0feb0e4572fecacdca1db99051f16689fb4aec1b..df4db3ca64572a86cba95a16529b82b94d599a84 100644 (file)
--- a/gnome-commander-flags.patch
+++ b/gnome-commander-flags.patch
@@ -1,27 +1,25 @@
---- gnome-commander-1.2.8.6/libgcmd/Makefile.am~       2010-03-04 21:06:22.000000000 +0100
-+++ gnome-commander-1.2.8.6/libgcmd/Makefile.am        2010-06-13 19:06:12.175915557 +0200
-@@ -3,7 +3,9 @@
+--- gnome-commander-1.10.2/libgcmd/Makefile.am.orig    2019-11-28 18:39:39.931001008 +0100
++++ gnome-commander-1.10.2/libgcmd/Makefile.am 2019-11-28 18:53:32.773155781 +0100
+@@ -6,6 +6,8 @@
  AM_CPPFLAGS = \
-       $(CC_WARNINGS) \
        $(GNOMEUI_CFLAGS) \
--      $(GNOMEVFS_CFLAGS)
-+      $(GNOMEVFS_CFLAGS) \
+       $(GNOMEVFS_CFLAGS) \
 +      $(GNOME_CFLAGS) \
-+      $(GTK_CFLAGS)
- 
- pkglib_LTLIBRARIES = libgcmd.la
++      $(GTK_CFLAGS) \
+       -DGTK_DISABLE_SINGLE_INCLUDES \
+       -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES
  
---- gnome-commander-1.2.8.6/src/Makefile.am~   2010-06-01 20:53:06.000000000 +0200
-+++ gnome-commander-1.2.8.6/src/Makefile.am    2010-06-13 19:16:19.139206776 +0200
-@@ -8,6 +8,7 @@
-       $(GNOMEUI_CFLAGS) \
-       $(GNOMEVFS_CFLAGS) \
+--- gnome-commander-1.10.2/src/Makefile.am.orig        2019-04-13 12:03:20.000000000 +0200
++++ gnome-commander-1.10.2/src/Makefile.am     2019-11-28 18:59:10.237994244 +0100
+@@ -14,6 +14,7 @@
+       $(GNOME_KEYRING_CFLAGS) \
+       $(UNIQUE_CFLAGS) \
        $(PYTHON_CFLAGS) \
 +      $(IPTCDATA_CFLAGS) \
+       -DGTK_DISABLE_SINGLE_INCLUDES \
+       -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
        -DDATADIR=\""$(datadir)"\"\
-       -DPLUGIN_DIR=\""$(libdir)/$(PACKAGE)/plugins"\"
- 
-@@ -111,6 +112,7 @@
+@@ -107,7 +108,8 @@
        $(GSF_LIBS) \
        $(POPPLER_LIBS) \
        $(PYTHON_LIBS) \
@@ -29,4 +27,82 @@
 +      $(PYTHON_EXTRA_LIBS) \
 +      $(IPTCDATA_LIBS)
  
- gcmd_block_SOURCES = block.cc
+ 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
+@@ -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_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
+ 
+ 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
+ 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 @@
+ 
+ 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_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 @@
+ 
+ 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_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 @@
+ ## 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_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
+@@ -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_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
+@@ -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_LDFLAGS = $(WARN_LDFLAGS)
+ 
+ AM_CPPFLAGS = \

diff --git a/gnome-commander.spec b/gnome-commander.spec
index 3a0705d81ed2c47c96a685ad5fbcddc01496fac5..16483af1b03d70cbb5f73033d471dd94ef2a0ec1 100644 (file)
--- a/gnome-commander.spec
+++ b/gnome-commander.spec
@@ -1,56 +1,52 @@
 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.6.4
-Release:       3
+Version:       1.10.2
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.6/%{name}-%{version}.tar.xz
-# Source0-md5: 753c8ae940229085871aec17cec1dae5
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.10/%{name}-%{version}.tar.xz
+# Source0-md5: e1ce66c5e64972943fcb51a3a9a74731
 Patch0:                %{name}-flags.patch
 Patch1:                %{name}-am.patch
 Patch2:                %{name}-gsf.patch
-URL:           http://www.nongnu.org/gcmd/
+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: gettext-tools
+BuildRequires: gettext-tools >= 0.19.7
 BuildRequires: glib2-devel >= 1:2.44.0
-BuildRequires: gnome-doc-utils
 BuildRequires: gnome-vfs2-devel >= 2.0.0
-BuildRequires: gtk+2-devel >= 2:2.8.0
-BuildRequires: intltool >= 0.50.1
+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: libgsf-devel >= 1.14.26
-BuildRequires: libstdc++-devel
-BuildRequires: libtool
+BuildRequires: libstdc++-devel >= 6:4.7
+BuildRequires: libtool >= 2:2
 BuildRequires: libunique-devel >= 0.9.3
 BuildRequires: libxslt-progs
 BuildRequires: pkgconfig
 BuildRequires: poppler-devel >= 0.18
-BuildRequires: python-devel >= 1:2.5
 BuildRequires: rpmbuild(macros) >= 1.592
 BuildRequires: taglib-devel >= 1.4
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
+BuildRequires: yelp-tools
 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.8.0
+Requires:      gtk+2 >= 2:2.18.0
 Requires:      libgnome-keyring >= 2.22
 Requires:      libgnomeui >= 2.4.0
 Requires:      libgsf >= 1.14.26
 Requires:      libunique >= 0.9.3
 Requires:      poppler >= 0.18
 Requires:      taglib >= 1.4
-# sr@Latn vs. sr@latin
-Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # symbol main_win_widget is provided by gnome-commander binary
@@ -74,9 +70,7 @@ kilka dodatkowych jak np. klienta FTP.
 %patch2 -p1
 
 %build
-%{__glib_gettextize}
 %{__libtoolize}
-%{__intltoolize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
@@ -114,14 +108,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/gnome-commander
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
-%attr(755,root,root) %{_libdir}/%{name}/lib*.so*
-%{_libdir}/%{name}/plugins/*.py*
-%attr(755,root,root) %{_libdir}/%{name}/plugins/lib*.so*
+%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
-%{_pixmapsdir}/gnome-commander.png
-%{_pixmapsdir}/gnome-commander
 %{_desktopdir}/gnome-commander.desktop
+%{_pixmapsdir}/gnome-commander.svg
+%{_pixmapsdir}/gnome-commander
 %{_mandir}/man1/gnome-commander.1*