diff --git a/.gitignore b/.gitignore index 72b8e8d..962ed00 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /eom-1.10.5.tar.xz /eom-1.11.0.tar.xz /eom-1.12.0.tar.xz +/eom-1.12.1.tar.xz diff --git a/eom.spec b/eom.spec index 79a2446..61b8254 100644 --- a/eom.spec +++ b/eom.spec @@ -13,7 +13,7 @@ %{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz} Name: eom -Version: %{branch}.0 +Version: %{branch}.1 %if 0%{?rel_build} Release: 1%{?dist} %else @@ -29,6 +29,9 @@ 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}} +# https://github.com/mate-desktop/eom/pull/113 +Patch0: eom_fix-gir-compilation.patch + BuildRequires: zlib-devel BuildRequires: cairo-gobject-devel BuildRequires: gtk2-devel @@ -77,6 +80,9 @@ Development files for eom %prep %setup -q%{!?rel_build:n %{name}-%{commit}} +%patch0 -p1 -b .fix-gir-compilation +NOCONFIGURE=1 ./autogen.sh + %if 0%{?rel_build} #NOCONFIGURE=1 ./autogen.sh %else # 0%{?rel_build} @@ -90,7 +96,7 @@ NOCONFIGURE=1 ./autogen.sh --enable-python \ --with-x \ --disable-schemas-compile \ - --enable-introspection=no + --enable-introspection=yes make %{?_smp_mflags} V=1 @@ -135,7 +141,7 @@ fi %dir %{_libdir}/eom %dir %{_libdir}/eom/plugins %{_libdir}/eom/plugins/* -#%{_libdir}/girepository-1.0/Eom-1.0.typelib +%{_libdir}/girepository-1.0/Eom-1.0.typelib %{_datadir}/applications/eom.desktop %{_datadir}/eom/ %{_datadir}/icons/hicolor/* @@ -149,10 +155,14 @@ fi %dir %{_includedir}/eom-2.20/eom %{_includedir}/eom-2.20/eom/*.h %{_datadir}/gtk-doc/html/eom/ -#%{_datadir}/gir-1.0/*.gir +%{_datadir}/gir-1.0/*.gir %changelog +* Mon Dec 14 2015 Wolfgang Ulbrich - 1.12.1-1 +- update to 1.12.1 release +- fix gir compilation + * Fri Nov 06 2015 Wolfgang Ulbrich - 1.12.0-1 - update to 1.12.0 release diff --git a/eom_fix-gir-compilation.patch b/eom_fix-gir-compilation.patch new file mode 100644 index 0000000..9c1851c --- /dev/null +++ b/eom_fix-gir-compilation.patch @@ -0,0 +1,27 @@ +diff --git a/configure.ac b/configure.ac +index 9b829d0..b3d398f 100644 +--- 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) + # *************** +diff --git a/src/main.c b/src/main.c +index cc999e2..f1b92f7 100644 +--- 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/sources b/sources index 1396d91..6ce4e90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a9d7ec3ff7ed08f25454b6e3315d380 eom-1.12.0.tar.xz +b43c8ce9a7b4fc2f744fef91d2eb39ec eom-1.12.1.tar.xz