- updated to 3.4.1

diff --git a/gthumb.spec b/gthumb.spec
index f76a921d092a2a8bae5896687d2d7464c4bd36f4..4e1b3853491503a0d5e1d48882539c4cb5f0f4b0 100644 (file)
--- a/gthumb.spec
+++ b/gthumb.spec
@@ -1,57 +1,69 @@
 Summary:       An image viewer and browser for GNOME
 Summary(pl.UTF-8):     Przeglądarka obrazków dla GNOME
 Name:          gthumb
-Version:       3.2.9.1
+Version:       3.4.1
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Graphics
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gthumb/3.2/%{name}-%{version}.tar.xz
-# Source0-md5: f39956e0ab61cd87902cfa16d650ab2c
-URL:           http://gthumb.sourceforge.net/
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gthumb/3.4/%{name}-%{version}.tar.xz
+# Source0-md5: 18a69695434c5066719223b69c96a16e
+URL:           https://wiki.gnome.org/Apps/gthumb
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.11
 BuildRequires: bison
 BuildRequires: brasero-devel >= 3.2.0
-BuildRequires: clutter-devel >= 1.0.0
+BuildRequires: clutter-devel >= 1.12.0
 BuildRequires: clutter-gtk-devel >= 1.0.0
 BuildRequires: docbook-dtd412-xml
 BuildRequires: exiv2-devel >= 0.21
 BuildRequires: flex
 BuildRequires: gettext-tools
-BuildRequires: glib2-devel >= 1:2.34.0
+BuildRequires: glib2-devel >= 1:2.36.0
 BuildRequires: gnome-common >= 2.20.0
 BuildRequires: gsettings-desktop-schemas-devel
 BuildRequires: gstreamer-devel >= 1.0.0
 BuildRequires: gstreamer-plugins-base-devel >= 1.0.0
-BuildRequires: gtk+3-devel >= 3.4.0
-BuildRequires: gtk-webkit3-devel >= 1.10
+BuildRequires: gtk+3-devel >= 3.10.0
+BuildRequires: gtk-webkit3-devel >= 1.10.0
 BuildRequires: intltool >= 0.35.5
 BuildRequires: json-glib-devel >= 0.16
+BuildRequires: lcms2-devel >= 2.6
 BuildRequires: libchamplain-devel >= 0.12
 BuildRequires: libjpeg-devel
-BuildRequires: libopenraw-devel >= 0.0.8
 BuildRequires: libpng-devel
+BuildRequires: libraw-devel >= 0.14
 BuildRequires: librsvg-devel >= 2.34.0
 BuildRequires: libsecret-devel >= 0.11
-BuildRequires: libsoup-gnome-devel >= 2.36.0
+BuildRequires: libsoup-devel >= 2.42
 BuildRequires: libtiff-devel
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2
 BuildRequires: libwebp-devel >= 0.2.0
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.311
-BuildRequires: sed >= 4.0
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz >= 1:4.999.7
 BuildRequires: yelp-tools
 BuildRequires: zlib-devel
 Requires(post,postun): desktop-file-utils
-Requires(post,postun): glib2 >= 1:2.34.0
+Requires(post,postun): glib2 >= 1:2.36.0
 Requires(post,postun): gtk-update-icon-cache
 Requires(post,postun): hicolor-icon-theme
+Requires:      brasero-libs >= 3.2.0
+Requires:      clutter >= 1.12.0
+Requires:      exiv2 >= 0.21
+Requires:      glib2 >= 1:2.36.0
 Requires:      gsettings-desktop-schemas
-Requires:      gtk+3 >= 3.4.0
+Requires:      gtk+3 >= 3.10.0
+Requires:      gtk-webkit3 >= 1.10.0
 Requires:      hicolor-icon-theme
+Requires:      json-glib >= 0.16
+Requires:      lcms2 >= 2.6
+Requires:      libchamplain >= 0.12
+Requires:      librsvg >= 2.34.0
+Requires:      libsecret >= 0.11
+Requires:      libsoup >= 2.42
+Requires:      libwebp >= 0.2.0
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -72,7 +84,7 @@ w katalogi, drukować obrazki, oglądać slajdy, ustawiać tło biurka itd.
 Summary:       gThumb development files
 Summary(pl.UTF-8):     Pliki programistyczne gThumb
 Group:         X11/Development/Libraries
-Requires:      gtk+3-devel >= 3.4.0
+Requires:      gtk+3-devel >= 3.10.0
 
 %description devel
 This package provides header files for developing gThumb extensions.
@@ -84,11 +96,7 @@ rozszerzeń gThumb.
 %prep
 %setup -q
 
-sed -i -e 's#sr@Latn#sr@latin#' po/LINGUAS
-mv -f po/sr@{Latn,latin}.po
-
 %build
-%{__gnome_doc_common}
 %{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I m4
@@ -96,8 +104,7 @@ mv -f po/sr@{Latn,latin}.po
 %{__automake}
 %{__autoconf}
 %configure \
-       --disable-silent-rules \
-       --enable-libopenraw
+       --disable-silent-rules
 %{__make}
 
 %install
@@ -108,7 +115,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions/*.{a,la}
 
-%find_lang %{name} --with-gnome --all-name
+%find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -125,24 +132,28 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_bindir}/*
+%doc AUTHORS ChangeLog MAINTAINERS NEWS README
+%attr(755,root,root) %{_bindir}/gthumb
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/extensions
 %attr(755,root,root) %{_libdir}/%{name}/extensions/*.so
 %{_libdir}/%{name}/extensions/*.extension
 %{_datadir}/%{name}
+%{_datadir}/appdata/gthumb.appdata.xml
 %{_datadir}/GConf/gsettings/gthumb.convert
-%{_datadir}/glib-2.0/schemas/*.gschema.xml
-%{_datadir}/glib-2.0/schemas/*.enums.xml
-%{_iconsdir}/hicolor/*/apps/*.png
-%{_iconsdir}/hicolor/*/apps/*.svg
+%{_datadir}/glib-2.0/schemas/org.gnome.gthumb.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gthumb.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gthumb.*.gschema.xml
+%{_iconsdir}/hicolor/*x*/apps/gthumb.png
+# wrong dir?
+%{_iconsdir}/hicolor/16x16/apps/gthumb-symbolic.svg
+%{_iconsdir}/hicolor/scalable/apps/gthumb.svg
 %{_desktopdir}/gthumb.desktop
 %{_desktopdir}/gthumb-import.desktop
 %{_mandir}/man1/gthumb.1*
 
 %files devel
 %defattr(644,root,root,755)
+%{_includedir}/gthumb-3.4
+%{_pkgconfigdir}/gthumb-3.4.pc
 %{_aclocaldir}/gthumb.m4
-%{_includedir}/gthumb-*
-%{_pkgconfigdir}/gthumb-*.pc