- updated to 2.91.7

- removed obsolete gtkspell3 patch
- added pc patch (update dependencies in .pc file)

diff --git a/gtranslator-disable-desktop-update.patch b/gtranslator-disable-desktop-update.patch
deleted file mode 100644 (file)
index 4e7c44d..0000000
--- a/gtranslator-disable-desktop-update.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- gtranslator-1.9.8/data/desktop/Makefile.am~        2010-02-07 20:38:35.000000000 +0100
-+++ gtranslator-1.9.8/data/desktop/Makefile.am 2010-02-12 10:27:44.371499317 +0100
-@@ -19,16 +19,4 @@
- 
- CLEANFILES = $(Application_DATA)
- 
--UPDATE_DESKTOP = \
--      if [ -f $(Applicationdir)/defaults.list ] ; then \
--              if which update-desktop-database>/dev/null 2>&1 ; then \
--                      update-desktop-database $(Applicationdir); \
--              fi \
--      fi
--
--install-data-hook:
--      $(UPDATE_DESKTOP)
--
--uninstall-hook:
--      $(UPDATE_DESKTOP) 
- -include $(top_srcdir)/git.mk

diff --git a/gtranslator-gtkspell3.patch b/gtranslator-gtkspell3.patch
deleted file mode 100644 (file)
index c9a19dd..0000000
--- a/gtranslator-gtkspell3.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -84,7 +84,7 @@ GDL_REQUIRED=3.6.0
- GDA_REQUIRED=4.2.3
- PEAS_REQUIRED=1.2.0
- GDICT_OPTIONAL=0.11.0
--GTKSPELL_OPTIONAL=2.99.99
-+GTKSPELL_OPTIONAL=3.0.0
- JSON_GLIB_OPTIONAL=0.12.0
- 
- AC_ARG_WITH(gda,
-@@ -174,14 +174,14 @@ dnl -------------------------------------------------------------------
- dnl Check for gtkspell >= 3.0 and use it if found
- dnl -------------------------------------------------------------------
- have_gtkspell=no
--AC_ARG_WITH(gtkspell3,
-+AC_ARG_WITH(gtkspell,
-             AS_HELP_STRING([--with-gtkspell],[Build with spell support]),,
-             with_gtkspell=auto)
- 
- if test x"$with_gtkspell" != "xno"
- then
-         PKG_CHECK_MODULES([GTKSPELL], [
--                gtkspell-3.0 >= $GTKSPELL_OPTIONAL
-+                gtkspell3-3.0 >= $GTKSPELL_OPTIONAL
-         ], have_gtkspell=yes, have_gtkspell=no)
- 
-         if test x"$have_gtkspell" = "xyes"
-@@ -339,7 +339,7 @@ if [ test x"$have_gtkspell" = "xyes" ]; then
-       echo "Building spell support: ................................YES"
- else
-       echo "Building spell support: ................................NO"
--              echo "        Requires gtkspell >= $GTKSPELL_OPTIONAL"
-+              echo "        Requires gtkspell3 >= $GTKSPELL_OPTIONAL"
- fi
- 
- echo "
---- a/src/gtr-view.c
-+++ b/src/gtr-view.c
-@@ -65,7 +65,7 @@ struct _GtrViewPrivate
-   gchar *search_text;
- 
- #ifdef HAVE_GTKSPELL
--  GtkSpell *spell;
-+  GtkSpellChecker *spell;
- #endif
- };
- 
-@@ -75,11 +75,10 @@ gtr_attach_gtkspell (GtrView * view)
- {
-   GError *error = NULL;
-   gchar *errortext = NULL;
--  view->priv->spell = NULL;
- 
--  view->priv->spell =
--    gtkspell_new_attach (GTK_TEXT_VIEW (view), NULL, &error);
--  if (view->priv->spell == NULL)
-+  view->priv->spell = gtk_spell_checker_new ();
-+  gtk_spell_checker_set_language (view->priv->spell, NULL, &error);
-+  if (error)
-     {
-       g_warning (_("gtkspell error: %s\n"), error->message);
-       errortext =
-@@ -90,6 +89,11 @@ gtr_attach_gtkspell (GtrView * view)
-       g_error_free (error);
-       g_free (errortext);
-     }
-+  else
-+    {
-+      gtk_spell_checker_attach (view->priv->spell,
-+                                GTK_TEXT_VIEW (view));
-+    }
- }
- #endif
- 
-@@ -263,7 +267,7 @@ gtr_view_enable_spellcheck (GtrView * view, gboolean enable)
- #ifdef HAVE_GTKSPELL
-       if (!view->priv->spell)
-         return;
--      gtkspell_detach (view->priv->spell);
-+      gtk_spell_checker_detach (view->priv->spell);
- #endif
-     }
- }

diff --git a/gtranslator-pc.patch b/gtranslator-pc.patch
new file mode 100644 (file)
index 0000000..ad677d3
--- /dev/null
+++ b/gtranslator-pc.patch
@@ -0,0 +1,10 @@
+--- gtranslator-2.91.7/data/gtranslator.pc.in.orig     2015-03-15 13:09:29.000000000 +0100
++++ gtranslator-2.91.7/data/gtranslator.pc.in  2017-07-30 17:25:58.516380027 +0200
+@@ -5,6 +5,6 @@
+ 
+ Name: gtranslator
+ Description: gtranslator
+-Requires: libglade-2.0 gtksourceview-2.0
++Requires: glib-2.0 gio-2.0 gtk+-3.0 gtksourceview-3.0
+ Version: @VERSION@
+ Cflags: -I${includedir}/gtranslator-@GTR_API_VERSION@

diff --git a/gtranslator.spec b/gtranslator.spec
index 7b1d6338505f93aa18087bf95e9782d93d2bb7c3..e0a9599bfe50a711e4c68dbc9b62813879a36e11 100644 (file)
--- a/gtranslator.spec
+++ b/gtranslator.spec
@@ -1,44 +1,52 @@
 Summary:       gtranslator - a comfortable po file editor with many bells and whistles
 Summary(pl.UTF-8):     gtranslator - wygodny edytor plików po z różnymi wodotryskami
 Name:          gtranslator
-Version:       2.91.6
+Version:       2.91.7
 Release:       1
 Epoch:         1
-License:       GPL
+License:       GPL v3+
 Group:         Development/Tools
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gtranslator/2.91/%{name}-%{version}.tar.xz
-# Source0-md5: 4a86eacdbc4bb0bc09191b8a110f6d39
-Patch0:                %{name}-gtkspell3.patch
+# Source0-md5: 1607fc1fe0c4990ac348783baba32753
+Patch0:                %{name}-pc.patch
 URL:           http://gtranslator.sourceforge.net/
-BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: autoconf >= 2.64
+BuildRequires: automake >= 1:1.11
 BuildRequires: db-devel >= 4.3
 BuildRequires: docbook-dtd412-xml
-BuildRequires: gdl-devel >= 2.26.0
+BuildRequires: gdl-devel >= 3.6.0
+# libgettextpo
+BuildRequires: gettext-devel
 BuildRequires: gettext-tools
+BuildRequires: glib2-devel >= 1:2.32.0
 BuildRequires: gnome-common >= 2.8.0
-BuildRequires: gnome-doc-utils >= 0.3.2
 BuildRequires: gnome-vfs2-devel >= 2.0.0
+BuildRequires: gobject-introspection-devel >= 0.9.3
 BuildRequires: gsettings-desktop-schemas-devel
-BuildRequires: gtk+3-devel
-BuildRequires: gtk-doc
-BuildRequires: gtksourceview3-devel
-BuildRequires: gtkspell3-devel
-BuildRequires: intltool
-BuildRequires: json-glib-devel
-BuildRequires: libbonoboui-devel >= 2.0.0
-BuildRequires: libgda5-devel
-BuildRequires: libgdict-devel
-BuildRequires: libgnomeui-devel >= 2.0.0
-BuildRequires: libpeas-gtk-devel
-BuildRequires: libunique-devel >= 1.0
+BuildRequires: gtk+3-devel >= 3.4.2
+BuildRequires: gtk-doc >= 1.0
+BuildRequires: gtksourceview3-devel >= 3.0.0
+BuildRequires: gtkspell3-devel >= 3.0.0
+BuildRequires: intltool >= 0.50.1
+BuildRequires: iso-codes >= 0.35
+BuildRequires: json-glib-devel >= 0.12.0
+BuildRequires: libgda5-devel >= 5.0
+BuildRequires: libgdict-devel >= 0.11.0
+BuildRequires: libpeas-gtk-devel >= 1.2.0
+BuildRequires: libtool >= 2:2.2.6
 BuildRequires: libxml2-devel >= 2.4.12
 BuildRequires: pkgconfig
-BuildRequires: scrollkeeper
+BuildRequires: yelp-tools
 Requires(post,postun): gtk-update-icon-cache
-Requires(post,postun): hicolor-icon-theme
-Requires(post,postun): scrollkeeper
-Provides:      %{name} = %{version}-%{release}
+Requires:      gdl >= 3.6.0
+Requires:      glib2 >= 1:2.32.0
+Requires:      gtk+3 >= 3.4.2
+Requires:      hicolor-icon-theme
+Requires:      iso-codes >= 0.35
+Requires:      json-glib >= 0.12.0
+Requires:      libgdict >= 0.11.0
+Requires:      libpeas-gtk >= 1.2.0
+Requires:      libxml2 >= 2.4.12
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -52,35 +60,55 @@ Dostarcza dużo użytecznych funkcji ułatwiających pracę przy
 tłumaczeniach plików po.
 
 %package devel
-Summary:       A GNOME po file editor with many bells and whistles
-Summary(pl.UTF-8):     Pliki programistyczne edytora gtranslator
+Summary:       Header files for gtranslator plugins development
+Summary(pl.UTF-8):     Pliki nagłówkowe do tworzenia wtyczek edytora gtranslator
 Group:         Development/Tools
-Requires:      %{name} = %{version}-%{release}
+# libgettextpo
+Requires:      gettext-devel
+Requires:      glib2-devel >= 1:2.32.0
+Requires:      gtk+3-devel >= 3.4.2
+Requires:      gtksourceview3-devel >= 3.0.0
+
+Requires:      gtksourceview2-devel >= 2.0
+Requires:      libglade-devel >= 2.0
 
 %description devel
-Development files for gtranslator libraries.
+Header files for gtranslator plugins development.
 
 %description devel -l pl.UTF-8
-Pliki programistyczne dla bibliotek granslatora.
+Pliki nagłówkowe do tworzenia wtyczek edytora gtranslator.
+
+%package apidocs
+Summary:       API documentation for gtranslator
+Summary(pl.UTF-8):     Dokumentacja API gtranslatora
+Group:         Documentation
+
+%description apidocs
+API documentation for gtranslator.
 
+%description apidocs -l pl.UTF-8
+Dokumentacja API gtranslatora.
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 
 %build
 %{__glib_gettextize}
 %{__intltoolize}
+%{__libtoolize}
 %{__aclocal} -I m4
+%{__autoconf}
 %{__autoheader}
 %{__automake}
-%{__autoconf}
 %configure \
+       --disable-silent-rules \
        --disable-static \
        --with-dictionary \
        --with-gda=5.0 \
        --disable-gtk-doc-html \
-       --with-gtkspell
+       --with-gtkspell \
+       --with-html-dir=%{_gtkdocdir}
 
 %{__make}
 
@@ -90,31 +118,30 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/charmap/*.py[co]
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gtk-doc
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gtranslator/*.la \
+       $RPM_BUILD_ROOT%{_libdir}/gtranslator/plugins/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/charmap/*.py[co]
 
-%find_lang %{name} --with-gnome --with-omf
+%find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_icon_cache hicolor
-/usr/bin/scrollkeeper-update
 
 %postun
 %update_icon_cache hicolor
-/usr/bin/scrollkeeper-update
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog HACKING NEWS README THANKS
-%attr(755,root,root) %{_bindir}/*
+%doc AUTHORS ChangeLog NEWS README THANKS
+%attr(755,root,root) %{_bindir}/gtranslator
 %dir %{_libdir}/%{name}
 %{_libdir}/gtranslator/libgtranslator-private.so
 %dir %{_libdir}/%{name}/plugins
 %attr(755,root,root) %{_libdir}/%{name}/plugins/lib*.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/gtr*.plugin
+%{_libdir}/%{name}/plugins/gtr-*.plugin
 %dir %{_libdir}/gtranslator/plugins/charmap
 %{_libdir}/gtranslator/plugins/charmap/*.py
 %dir %{_libdir}/%{name}/girepository-1.0
@@ -123,19 +150,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/dtd
 %{_datadir}/%{name}/pixmaps
 %{_datadir}/%{name}/ui
-%{_datadir}/glib-2.0/schemas/*.xml
-%{_iconsdir}/hicolor/*/*/*.png
-%{_iconsdir}/hicolor/*/*/*.svg
-%{_desktopdir}/*.desktop
-%{_mandir}/man1/*
+%{_datadir}/appdata/gtranslator.appdata.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gtranslator*.gschema.xml
+%{_iconsdir}/hicolor/*x*/apps/gtranslator.png
+%{_iconsdir}/hicolor/scalable/apps/gtranslator.svg
+%{_desktopdir}/gtranslator.desktop
+%{_mandir}/man1/gtranslator.1*
 
 %files devel
 %defattr(644,root,root,755)
-%dir %{_includedir}/gtranslator-3.0
-%dir %{_includedir}/gtranslator-3.0/gtranslator
-%{_includedir}/gtranslator-3.0/gtranslator/*.h
-%{_pkgconfigdir}/gtranslator.pc
-%{_libdir}/gtranslator/libgtranslator-private.la
-%{_libdir}/gtranslator/plugins/*.la
+%{_includedir}/gtranslator-3.0
+# dir shared with base
+%dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/gir-1.0
-%{_datadir}/%{name}/gir-1.0/*
+%{_datadir}/%{name}/gir-1.0/Gtranslator-3.0.gir
+%{_pkgconfigdir}/gtranslator.pc
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/gtranslator