- removing unnecessary patches

[packages/geeqie.git] / geeqie.spec

diff --git a/geeqie.spec b/geeqie.spec
index 73d79392ff70b384e278e657a50b492431803e8a..a959af2dc17fc5bf74642e6f6cc33200fe6375ff 100644 (file)
--- a/geeqie.spec
+++ b/geeqie.spec
@@ -1,25 +1,65 @@
+#
+# 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.2.3
+Version:       1.6
 Release:       1
-License:       GPL v2
+License:       GPL v2+
 Group:         X11/Applications/Graphics
 Source0:       http://www.geeqie.org/%{name}-%{version}.tar.xz
-# Source0-md5: fab78be9fca02b68cd670e5359457b88
+# Source0-md5: e7401c0e117c423456d5fab468c3149c
 Patch0:                libdir-fix.patch
-URL:           http://www.geeqie.org
-BuildRequires: autoconf
+Patch1:                exiv2-0.27.patch
+Patch2:                no-changelog.patch
+Patch3:                x32.patch
+Patch4:                0001-Fix-829-segfault-with-clutter-gtk.patch
+URL:           http://www.geeqie.org/
+BuildRequires: autoconf >= 2.57
 BuildRequires: automake
-BuildRequires: exiv2-devel
+%{?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: gtk+2-devel >= 2:2.4.0
+BuildRequires: glib2-devel >= 1:2.24.0
+BuildRequires: gnome-doc-utils
+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: lcms2-devel >= 2.0
+%{?with_champlain:BuildRequires:       libchamplain-devel >= 0.12}
+BuildRequires: libheif-devel >= 1.3.2
+BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
-BuildRequires: libtool
+BuildRequires: libstdc++-devel
+BuildRequires: libtiff-devel
+BuildRequires: lirc-devel
+BuildRequires: lua53-devel >= 5.3
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.197
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
+BuildRequires: yelp-tools
+Requires:      desktop-file-utils
+Requires:      exiv2-libs >= 0.11
+Requires:      glib2 >= 1:2.24.0
+%{?with_gtk2:Requires: gtk+2 >= 2:2.20.0}
+%{!?with_gtk2:Requires:        gtk+3 >= 3.0.0}
+%{?with_champlain:Requires:    libchamplain >= 0.12}
 Requires:      libjpeg-progs
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -49,50 +89,64 @@ i opcje filtrowania, jak również wsparcie dla zewnętrznego edytora.
 %prep
 %setup -q
 %patch0 -p1
+%patch4 -p1
 
 %build
+%{__sed} -i '1s,/usr/bin/awk,/bin/awk,' \
+       plugins/geocode-parameters/geocode-parameters.awk
+install -d auxdir
 %{__intltoolize}
-%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+       %{!?with_clutter:--disable-gpu-accel} \
+       --enable-gtk3%{?with_gtk2:=no} \
+       %{?with_champlain:--enable-map} 
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/html
 
 %{__make} install \
-       helpdir=/html \
+       GNOME_DOC_TOOL=/disable-install-hook \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/applications/*.desktop $RPM_BUILD_ROOT%{_desktopdir}
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{name}/{applications,template.desktop}
-%{__rm} -r $RPM_BUILD_ROOT/html
-
-(cd doc/html ; ln -s GuideIndex.html index.html)
-
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 %find_lang %{name}
 
 %post
-[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1 ||:
+%update_desktop_database
 
 %postun
-[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1
+%update_desktop_database
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS README TODO ChangeLog doc/html
+%doc AUTHORS README.md TODO doc/html
 %attr(755,root,root) %{_bindir}/%{name}
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*
-%{_desktopdir}/*.desktop
+%{_mandir}/man1/%{name}.1*
+%{_desktopdir}/%{name}.desktop
 %{_pixmapsdir}/%{name}.png
-%{_mandir}/man1/*
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/geeqie-camera-import
+%attr(755,root,root) %{_libdir}/%{name}/geeqie-camera-import-hook-script
+%attr(755,root,root) %{_libdir}/%{name}/geeqie-export-jpeg
+%attr(755,root,root) %{_libdir}/%{name}/geeqie-image-crop
+%attr(755,root,root) %{_libdir}/%{name}/geeqie-random-image
+%attr(755,root,root) %{_libdir}/%{name}/geeqie-rotate
+%attr(755,root,root) %{_libdir}/%{name}/geeqie-symlink
+%attr(755,root,root) %{_libdir}/%{name}/geeqie-tethered-photography
+%attr(755,root,root) %{_libdir}/%{name}/geeqie-tethered-photography-hook-script
+%attr(755,root,root) %{_libdir}/%{name}/geeqie-ufraw
+%attr(755,root,root) %{_libdir}/%{name}/geocode-parameters.awk
+%attr(755,root,root) %{_libdir}/%{name}/lensID
+%{_libdir}/%{name}/geocode-parameters.awk
+%{_datadir}/metainfo/org.geeqie.Geeqie.appdata.xml