- up to 2.0

diff --git a/geeqie.spec b/geeqie.spec
index 5257bedfebd49f4b30757a014386d1d7430a5485..a0a57684a1a0de09bf872897536746649d22ea52 100644 (file)
--- a/geeqie.spec
+++ b/geeqie.spec
@@ -1,39 +1,26 @@
 #
 # Conditional build:
-%bcond_with    gtk2            # use GTK+ 2.x instead of 3.x
 %bcond_without champlain       # maps support via libchamplain [gtk+3 only]
-%bcond_without clutter         # GPU accelleration via clutter [gtk+3 only]
 #
-%if %{with gtk2}
-%undefine      with_champlain
-%undefine      with_clutter
-%endif
 Summary:       Graphics file browser utility
 Summary(hu.UTF-8):     Képfájl-böngésző eszköz
 Summary(pl.UTF-8):     Narzędzie do przeglądania plików graficznych
 Name:          geeqie
-Version:       1.7.3
-Release:       1
+Version:       2.0
+Release:       0.1
 License:       GPL v2+
 Group:         X11/Applications/Graphics
 Source0:       https://github.com/BestImageViewer/geeqie/releases/download/v%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 1a54d7fe8c993c40c2e4c07a03c39d03
-Patch0:                libdir-fix.patch
+# Source0-md5: 2d7a8e40a0216330f38262a31a5fa725
 URL:           http://www.geeqie.org/
-BuildRequires: autoconf >= 2.57
-BuildRequires: automake >= 1:1.14.1
-%{?with_clutter:BuildRequires: clutter-devel >= 1.0}
-%{?with_clutter:BuildRequires: clutter-gtk-devel >= 1.0}
 BuildRequires: djvulibre-devel >= 3.5.27
 BuildRequires: exiv2-devel >= 0.11
 BuildRequires: ffmpegthumbnailer-devel >= 2.1.0
 BuildRequires: gdk-pixbuf2-devel >= 2
 BuildRequires: gettext-tools
 BuildRequires: glib2-devel >= 1:2.52.0
-BuildRequires: graphviz
-%{?with_gtk2:BuildRequires:    gtk+2-devel >= 2:2.20.0}
-%{!?with_gtk2:BuildRequires:   gtk+3-devel >= 3.0.0}
-BuildRequires: intltool >= 0.40.0
+BuildRequires: gspell-devel >= 1.6
+BuildRequires: gtk+3-devel >= 3.22}
 BuildRequires: lcms2-devel >= 2.0
 BuildRequires: libarchive-devel >= 3.4.0
 %{?with_champlain:BuildRequires:       libchamplain-devel >= 0.12}
@@ -42,16 +29,17 @@ BuildRequires:      libjpeg-devel
 BuildRequires: libjxl-devel >= 0.3.7
 BuildRequires: libpng-devel
 BuildRequires: libraw-devel >= 0.20
-BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
 BuildRequires: libwebp-devel >= 0.6.1
-BuildRequires: lirc-devel
 BuildRequires: lua53-devel >= 5.3
+BuildRequires: meson
+BuildRequires: ninja
 BuildRequires: openjpeg2-devel >= 2.3.0
 BuildRequires: pkgconfig
 BuildRequires: poppler-glib-devel >= 0.62
 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: tar >= 1:1.22
+BuildRequires: xxd
 BuildRequires: xz
 BuildRequires: yelp-tools
 Requires:      desktop-file-utils
@@ -59,8 +47,7 @@ Requires:     djvulibre >= 3.5.27
 Requires:      exiv2-libs >= 0.11
 Requires:      ffmpegthumbnailer >= 2.1.0
 Requires:      glib2 >= 1:2.24.0
-%{?with_gtk2:Requires: gtk+2 >= 2:2.20.0}
-%{!?with_gtk2:Requires:        gtk+3 >= 3.0.0}
+Requires:      gtk+3 >= 3.22
 Requires:      lcms2 >= 2.0
 Requires:      libarchive >= 3.4.0
 %{?with_champlain:Requires:    libchamplain >= 0.12}
@@ -98,34 +85,27 @@ i opcje filtrowania, jak również wsparcie dla zewnętrznego edytora.
 
 %prep
 %setup -q
-%patch0 -p1
+%{__rm} -rf build
 
 %build
-%{__sed} -i '1s,/usr/bin/awk,/bin/awk,' \
+%{__sed} -i '1s,%{_bindir}/awk,/bin/awk,' \
        plugins/geocode-parameters/geocode-parameters.awk
-install -d auxdir
-%{__intltoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-       %{!?with_clutter:--disable-gpu-accel} \
-       %{?with_gtk2:--disable-gtk3} \
-       --enable-lirc \
-       %{?with_champlain:--enable-map} \
-       --disable-silent-rules
-
-%{__make}
+
+%meson build -Dgq_bindir=%{_libdir}/%{name} %{!?with_champlain:-Dgps-map=disabled}
+
+%ninja_build -C build
+
+cd build/doc/html
+ln -sf GuideIndex.html index.html
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
 
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{name}/{applications,template.desktop}
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
+
 
 %find_lang %{name}
 
@@ -140,7 +120,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS README.md TODO NEWS doc/html
+%doc AUTHORS README.md TODO NEWS build/doc/html
 %attr(755,root,root) %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
 %{_desktopdir}/%{name}.desktop

diff --git a/libdir-fix.patch b/libdir-fix.patch
deleted file mode 100644 (file)
index b7193fb..0000000
--- a/libdir-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- geeqie-1.6/configure.ac~   2020-11-20 21:36:33.000000000 +0000
-+++ geeqie-1.6/configure.ac    2021-04-08 22:29:09.742491746 +0000
-@@ -253,7 +253,7 @@
- AC_DEFINE_UNQUOTED([GQ_APP_DIR], "$appdir", [Location of application data])
- AC_SUBST(appdir)
- 
--eval "eval gq_bindir=${prefix}/lib/${PACKAGE}"
-+eval "eval gq_bindir=${libdir}/${PACKAGE}"
- AC_DEFINE_UNQUOTED([GQ_BIN_DIR], "$gq_bindir", [Location of helper scripts and executables])
- AC_SUBST(gq_bindir)
-