From b44b2d44d7d4a2e34095ce1ef7ac0d34364d48fcb71c626b622179f6ec3eba46 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Mon, 7 Dec 2015 17:18:11 +0000 Subject: [PATCH 1/4] - Update to 1.12.1. OBS-URL: https://build.opensuse.org/package/show/X11:MATE:Factory/eom?expand=0&rev=16 --- eom-1.12.0.tar.xz | 3 --- eom-1.12.1.tar.xz | 3 +++ eom.changes | 7 +++++++ eom.spec | 4 +++- 4 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 eom-1.12.0.tar.xz create mode 100644 eom-1.12.1.tar.xz diff --git a/eom-1.12.0.tar.xz b/eom-1.12.0.tar.xz deleted file mode 100644 index 05da2c5..0000000 --- a/eom-1.12.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d8967853bcef555cebf5c22e613ee4681392fbdc38db035bbf2e80e125473a6 -size 2218924 diff --git a/eom-1.12.1.tar.xz b/eom-1.12.1.tar.xz new file mode 100644 index 0000000..5a58e8e --- /dev/null +++ b/eom-1.12.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1bc839c5f5314b3d8e9e78bdca885dfc1160ea00cc80c39842944c959df5b645 +size 2213420 diff --git a/eom.changes b/eom.changes index de9b248..78a51cf 100644 --- a/eom.changes +++ b/eom.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Dec 7 15:13:31 UTC 2015 - sor.alexei@meowr.ru + +- Update to 1.12.1: + * Fix shortcuts for several menu items in en_US locale. + * Some more fixes and cleanups. + ------------------------------------------------------------------- Thu Nov 5 20:43:01 UTC 2015 - sor.alexei@meowr.ru diff --git a/eom.spec b/eom.spec index fc2a94e..cac5c1e 100644 --- a/eom.spec +++ b/eom.spec @@ -18,7 +18,7 @@ %define _version 1.12 Name: eom -Version: 1.12.0 +Version: 1.12.1 Release: 0 Summary: MATE Desktop graphics viewer License: GPL-2.0+ and LGPL-2.1+ @@ -45,6 +45,7 @@ BuildRequires: pkgconfig(pygobject-2.0) BuildRequires: pkgconfig(pygtk-2.0) Requires: mate-desktop-gsettings-schemas >= %{_version} Recommends: %{name}-lang +# mate-image-viewer was last used in openSUSE 13.1. Provides: mate-image-viewer = %{version} Obsoletes: mate-image-viewer < %{version} Obsoletes: mate-image-viewer-lang < %{version} @@ -75,6 +76,7 @@ simplicity and standards compliance. %setup -q %build +NOCONFIGURE=1 mate-autogen %configure \ --libexecdir=%{_libexecdir}/%{name} make %{?_smp_mflags} From 15682e5740a863f30e2495f2fcd8ad804f64b8e4a7f381fb860c71da98d06fad Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Wed, 9 Dec 2015 19:13:36 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/X11:MATE:Factory/eom?expand=0&rev=17 --- eom.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/eom.spec b/eom.spec index cac5c1e..2b55561 100644 --- a/eom.spec +++ b/eom.spec @@ -34,6 +34,7 @@ BuildRequires: yelp-tools BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(exempi-2.0) BuildRequires: pkgconfig(gdk-pixbuf-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-unix-print-2.0) BuildRequires: pkgconfig(lcms2) From 22503cca9893d97fcd2baded34729a2d42117a29d8fea9b784d9f201f6b25d45 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Wed, 9 Dec 2015 20:31:42 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/X11:MATE:Factory/eom?expand=0&rev=18 --- eom.changes | 1 + eom.spec | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/eom.changes b/eom.changes index 78a51cf..4fff88f 100644 --- a/eom.changes +++ b/eom.changes @@ -4,6 +4,7 @@ Mon Dec 7 15:13:31 UTC 2015 - sor.alexei@meowr.ru - Update to 1.12.1: * Fix shortcuts for several menu items in en_US locale. * Some more fixes and cleanups. +- Enable GObject Introspection. ------------------------------------------------------------------- Thu Nov 5 20:43:01 UTC 2015 - sor.alexei@meowr.ru diff --git a/eom.spec b/eom.spec index 2b55561..fb5fd65 100644 --- a/eom.spec +++ b/eom.spec @@ -16,6 +16,7 @@ # +%define typelib typelib-1_0-Eom-1_0 %define _version 1.12 Name: eom Version: 1.12.1 @@ -73,6 +74,16 @@ which uses the gdk-pixbuf library. It can deal with large images, and zoom and scroll with constant memory usage. Its goals are simplicity and standards compliance. +%package -n %{typelib} +Summary: MATE Desktop graphics viewer typelib +Group: SSystem/Libraries + +%description -n %{typelib} +The Eye of MATE is a simple graphics viewer for the MATE Desktop +which uses the gdk-pixbuf library. It can deal with large images, +and zoom and scroll with constant memory usage. Its goals are +simplicity and standards compliance. + %prep %setup -q @@ -116,13 +127,18 @@ fi %{_datadir}/icons/hicolor/*/apps/%{name}.* %{_mandir}/man?/%{name}.?%{?ext_man} +%files lang -f %{name}.lang +%defattr(-,root,root) + %files devel %defattr(-,root,root) %{_includedir}/%{name}-2.20/ %{_libdir}/pkgconfig/%{name}.pc +%{_datadir}/gir-1.0/Eom-1.0.gir %{_datadir}/gtk-doc/html/%{name}/ -%files lang -f %{name}.lang +%files -n %{typelib} %defattr(-,root,root) +%{_libdir}/girepository-1.0/Eom-1.0.typelib %changelog From 7b8c5a269d2d4d572d4244cdd2c861ef5106f7554b8fb51fa040095eae13c0b4 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Sat, 12 Dec 2015 13:46:34 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/X11:MATE:Factory/eom?expand=0&rev=19 --- eom-fix-introspection.patch | 22 ++++++++++++++++++++++ eom.changes | 2 ++ eom.spec | 3 +++ 3 files changed, 27 insertions(+) create mode 100644 eom-fix-introspection.patch diff --git a/eom-fix-introspection.patch b/eom-fix-introspection.patch new file mode 100644 index 0000000..77c9d49 --- /dev/null +++ b/eom-fix-introspection.patch @@ -0,0 +1,22 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -142,6 +142,8 @@ else + have_introspection=no + fi + ++AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$have_introspection" = xyes) ++ + # *************** + # ZLIB (required) + # *************** +--- a/src/main.c ++++ b/src/main.c +@@ -30,7 +30,7 @@ + #include + #include + #endif +-#ifdef HAVE_INSTROSPECTION ++#ifdef HAVE_INTROSPECTION + #include + #endif + diff --git a/eom.changes b/eom.changes index 4fff88f..f18d007 100644 --- a/eom.changes +++ b/eom.changes @@ -5,6 +5,8 @@ Mon Dec 7 15:13:31 UTC 2015 - sor.alexei@meowr.ru * Fix shortcuts for several menu items in en_US locale. * Some more fixes and cleanups. - Enable GObject Introspection. +- Add eom-fix-introspection.patch: fixes compilation with + GObject Introspection enabled. ------------------------------------------------------------------- Thu Nov 5 20:43:01 UTC 2015 - sor.alexei@meowr.ru diff --git a/eom.spec b/eom.spec index fb5fd65..ab7ad87 100644 --- a/eom.spec +++ b/eom.spec @@ -26,6 +26,8 @@ License: GPL-2.0+ and LGPL-2.1+ Group: System/GUI/Other Url: http://mate-desktop.org/ Source: http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM eom-fix-introspection.patch -- Fix compilation with GObject Introspection enabled. +Patch0: %{name}-fix-introspection.patch BuildRequires: hicolor-icon-theme BuildRequires: libjpeg-devel BuildRequires: libxml2-python @@ -86,6 +88,7 @@ simplicity and standards compliance. %prep %setup -q +%patch0 -p1 %build NOCONFIGURE=1 mate-autogen