diff --git a/.gitignore b/.gitignore index f2a5385..43085e0 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /eom-1.13.1.tar.xz /eom-1.14.0.tar.xz /eom-1.14.1.tar.xz +/eom-1.15.0.tar.xz diff --git a/eom.spec b/eom.spec index 4c9ed93..8596ab4 100644 --- a/eom.spec +++ b/eom.spec @@ -2,7 +2,7 @@ %global rel_build 1 # This is needed, because src-url contains branched part of versioning-scheme. -%global branch 1.14 +%global branch 1.15 # Settings used for build from snapshots. %{!?rel_build:%global commit 7ba7e03f4d5e2ecd3c77f9d9394521b7608ca05f} @@ -13,7 +13,7 @@ %{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz} Name: eom -Version: %{branch}.1 +Version: %{branch}.0 %if 0%{?rel_build} Release: 1%{?dist} %else @@ -29,21 +29,19 @@ URL: http://mate-desktop.org # Source for snapshot-builds. %{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}} +BuildRequires: mate-common BuildRequires: zlib-devel -BuildRequires: cairo-gobject-devel -BuildRequires: gtk2-devel -BuildRequires: libexif-devel -BuildRequires: exempi-devel BuildRequires: gobject-introspection-devel +BuildRequires: libjpeg-turbo-devel BuildRequires: libxml2-devel -BuildRequires: librsvg2-devel +BuildRequires: gtk3-devel BuildRequires: mate-desktop-devel +BuildRequires: libexif-devel +BuildRequires: exempi-devel +BuildRequires: librsvg2-devel BuildRequires: lcms2-devel -BuildRequires: pygtk2-devel BuildRequires: dbus-glib-devel -BuildRequires: libjpeg-turbo-devel BuildRequires: desktop-file-utils -BuildRequires: mate-common #fix rhbz (#1008249) Requires: mate-desktop-libs @@ -86,8 +84,8 @@ NOCONFIGURE=1 ./autogen.sh %build %configure \ - --with-gtk=2.0 \ - --enable-python \ + --with-gtk=3.0 \ + --disable-python \ --with-x \ --disable-schemas-compile \ --enable-introspection=yes @@ -106,15 +104,11 @@ find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' %find_lang %{name} --with-gnome --all-name -# remove needless gsettings convert file -rm -f $RPM_BUILD_ROOT%{_datadir}/MateConf/gsettings/eom.convert - %post /usr/bin/update-desktop-database &> /dev/null || : /bin/touch --no-create %{_datadir}/icons/hicolor >&/dev/null || : - %postun /usr/bin/update-desktop-database &> /dev/null || : if [ $1 -eq 0 ]; then @@ -153,6 +147,10 @@ fi %changelog +* Thu Jun 09 2016 Wolfgang Ulbrich - 1.15.0-1 +- update to 1.15.0 release +- switch to gtk+3 + * Sat May 21 2016 Wolfgang Ulbrich - 1.14.1-1 - update to 1.14.1 release diff --git a/sources b/sources index 2494ca6..e26e1ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f812879081f1392e97dade169daa5ad eom-1.14.1.tar.xz +4b88842b83f03926bd4b646631884b86 eom-1.15.0.tar.xz