Accepting request 516878 from GNOME:Apps

- Run just autoreconf and intltoolize, to avoid double configure run
- Add deps for post/postun scriptlets
- Remove dep on lcms and depend on lcms2 (forwarded request 512815 from scarabeus_iv)

OBS-URL: https://build.opensuse.org/request/show/516878
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/geeqie?expand=0&rev=14
This commit is contained in:
Dominique Leuenberger 2017-08-16 14:18:08 +00:00 committed by Git OBS Bridge
commit 0571ba852b
2 changed files with 17 additions and 8 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jul 27 16:51:31 UTC 2017 - tchvatal@suse.com
- Run just autoreconf and intltoolize, to avoid double configure run
- Add deps for post/postun scriptlets
- Remove dep on lcms and depend on lcms2
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 7 11:59:13 UTC 2017 - zaitor@opensuse.org Tue Mar 7 11:59:13 UTC 2017 - zaitor@opensuse.org

View File

@ -1,7 +1,7 @@
# #
# spec file for package geeqie # spec file for package geeqie
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -34,16 +34,18 @@ BuildRequires: libtiff-devel
# Needed to bootstrap the tarball # Needed to bootstrap the tarball
BuildRequires: libtool BuildRequires: libtool
BuildRequires: lirc-devel BuildRequires: lirc-devel
BuildRequires: pkgconfig
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
# Disabled as libchamplain support is still marked as experimental # Disabled as libchamplain support is still marked as experimental
#BuildRequires: pkgconfig(champlain-0.12) >= 0.12 #BuildRequires: pkgconfig(champlain-0.12) >= 0.12
BuildRequires: pkgconfig(exiv2) >= 0.11 BuildRequires: pkgconfig(exiv2) >= 0.11
BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(lcms) >= 1.14 BuildRequires: pkgconfig(lcms2)
# FIXME! Blasted configure does not find it..... - looks for lua5.1 Requires(post): update-desktop-files
Requires(postun): update-desktop-files
# FIXME: Enable when new lua layout lands in TW
#BuildRequires: pkgconfig(lua-5.1) >= 5.1 #BuildRequires: pkgconfig(lua-5.1) >= 5.1
Recommends: %{name}-lang Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
Geeqie is a lightweight image viewer for Linux, BSDs and compatibles. Geeqie is a lightweight image viewer for Linux, BSDs and compatibles.
@ -55,10 +57,12 @@ Geeqie is a lightweight image viewer for Linux, BSDs and compatibles.
%build %build
# Needed to bootstrap # Needed to bootstrap
./autogen.sh intltoolize --copy --force --automake
autoreconf -fvi
%configure \ %configure \
--enable-lirc \ --enable-lirc \
--with-readmedir=%{_defaultdocdir}/%{name} --with-readmedir=%{_defaultdocdir}/%{name} \
--disable-lua
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
@ -74,7 +78,6 @@ make %{?_smp_mflags}
%desktop_database_postun %desktop_database_postun
%files %files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README TODO README.lirc %doc AUTHORS COPYING ChangeLog NEWS README TODO README.lirc
%{_bindir}/geeqie %{_bindir}/geeqie
%{_datadir}/applications/geeqie.desktop %{_datadir}/applications/geeqie.desktop
@ -84,6 +87,5 @@ make %{?_smp_mflags}
%{_mandir}/man1/geeqie.1%{?ext_man} %{_mandir}/man1/geeqie.1%{?ext_man}
%files lang -f %{name}.lang %files lang -f %{name}.lang
%defattr(-,root,root)
%changelog %changelog