Accepting request 71194 from home:dimstar:branches:GNOME:Apps

Update to 2.90.4 - Fixes build on Factory, move to GTK3. libgtranslator-private is not to be consisderd a 'shared library', thus leaving it in the main package. gtkspell is currently not enabled (requires gtkspell > 100, disabled by upstream)

OBS-URL: https://build.opensuse.org/request/show/71194
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gtranslator?expand=0&rev=18

gtranslator-1.9.13.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c0b371b81630cf2e4efb6968c20f7580c62c34d9161c852a5d008622cd91408e
-size 4655865

gtranslator-2.90.4.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6b9d0eeb4fc9ee3a98f84dad7a7112186a0bffa8d4262f72febf2ba52dcd32c7
+size 4681958

gtranslator-disable-update-db.patch

@@ -1,40 +0,0 @@
-Index: gtranslator-1.9.13/configure.ac
-===================================================================
---- gtranslator-1.9.13.orig/configure.ac
-+++ gtranslator-1.9.13/configure.ac
-@@ -239,6 +239,16 @@ fi
- AC_MSG_RESULT($enable_debug)
- 
- dnl -------------------------------------------------------------------
-+dnl Use update-desktop-database?
-+dnl -------------------------------------------------------------------
-+
-+AC_ARG_ENABLE(update-mimedb,
-+   AC_HELP_STRING([--disable-update-mimedb],
-+                   [disable the update-mime-database after install [default=no]]),,
-+    enable_update_mimedb=yes)
-+AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
-+
-+dnl -------------------------------------------------------------------
- dnl Get the date for the man-page and substitute it there and anywhere.
- dnl -------------------------------------------------------------------
- MY_DATE=`date +%Y-%m-%d`
-Index: gtranslator-1.9.13/data/desktop/Makefile.am
-===================================================================
---- gtranslator-1.9.13.orig/data/desktop/Makefile.am
-+++ gtranslator-1.9.13/data/desktop/Makefile.am
-@@ -19,6 +19,7 @@ EXTRA_DIST = $(Application_DATA) \
- 
- CLEANFILES = $(Application_DATA)
- 
-+if ENABLE_UPDATE_MIMEDB
- UPDATE_DESKTOP = \
- 	if [ -f $(Applicationdir)/defaults.list ] ; then \
- 		if which update-desktop-database>/dev/null 2>&1 ; then \
-@@ -31,4 +32,6 @@ install-data-hook:
- 
- uninstall-hook:
- 	$(UPDATE_DESKTOP) 
-+endif
-+
- -include $(top_srcdir)/git.mk

gtranslator.changes

@@ -1,3 +1,45 @@
+-------------------------------------------------------------------
+Tue May 24 19:36:30 CEST 2011 - dimstar@opensuse.org
+
+- Update to version 2.90.4:
+  + Misc bugfixes
+- Changes from version 2.90.3:
+  + Put the gdl container inside the tab
+  + Add a tab activatable extension point
+- Changes from version 2.90.2:
+  + UI cleanup
+- Changes from version 2.90.1:
+  + Automatize profile generation
+  + Fix preferences dialog space
+  + Remove interface tab from preferences dialog
+  + Fix remaining issues in the gtk+ 3 port.
+- Changes from version 2.90.0:
+  + Port to gtk+ 3
+  + Port to libpeas
+  + Added support for python plugins
+  + Ported charmap to python
+  + Remove --window-new command line option
+  + Port to gsettings
+  + Merge insert-tags plugin into insert-params plugin
+  + Port to GtkApplication
+  + Misc Bugfixes
+  + Updated translations.
+- Change BuildRequires to pkgconfig()-style:
+  + Old ones: libxml2-devel, gdl-devel, glib2-devel, libgda-devel,
+    gtksourceview-devel, gtk2-devel, gtkspell-devel
+  + New ones: libxml-2.0, gdl-3.0, glib-2.0, libgda-4.0,
+    gtksourceview-3.0, gtk+-3.0, gtkspell-2.0
+- Drop no longer needed BuildRequires:
+  + libunique-devel, libsoup-devel, gucharmap-devel, 
+    and gnome-utils-devel
+- Add new BuildRequires:
+  + iso-codes-devel, pkgconfig(libpeas-1.0), pkgconfig(gdict-1.0),
+    pkgconfig(libpeas-gtk-1.0), pkgconfig(json-glib-1.0)
+- Drop gtranslator-disable-update-db.patch: no longer required
+- Drop gnome-common BuildRequires, gnome-autogen.sh call during
+  build and --disable-update-mimedb configure flag: obsoleted.
+- Move .gir file to -devel package.
+
 -------------------------------------------------------------------
 Mon Feb 14 19:49:23 CET 2011 - sbrabec@suse.cz
 

gtranslator.spec

@@ -15,41 +15,37 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:           gtranslator
-Version:        1.9.13
+Version:        2.90.4
-Release:        7
+Release:        1
 License:        GPLv3+
 Summary:        A GNOME po file editor with many bells and whistles
-Group:          Development/Tools/Other
 Url:            http://gtranslator.sourceforge.net
+Group:          Development/Tools/Other
 Source:         http://www.kabalak.net/gtranslator/download/releases/%{version}/%{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM gtranslator-disable-update-db.patch bgo#636749 vuntz@opensuse.org -- Add --disable-update-mimedb configure option
-Patch0:         gtranslator-disable-update-db.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  fdupes
 BuildRequires:  gnome-doc-utils-devel
-BuildRequires:  gdl-devel
-BuildRequires:  glib2-devel
-# Needed for patch0
-BuildRequires:  gnome-common
-BuildRequires:  gnome-utils-devel
-BuildRequires:  gtk2-devel >= 2.16
-BuildRequires:  gtksourceview-devel
-BuildRequires:  gtkspell-devel
-BuildRequires:  gucharmap-devel
 BuildRequires:  intltool
-BuildRequires:  libgda-devel
+BuildRequires:  iso-codes-devel
-BuildRequires:  libsoup-devel
+BuildRequires:  pkgconfig(gdict-1.0)
-BuildRequires:  libunique-devel
+BuildRequires:  pkgconfig(gdl-3.0)
-BuildRequires:  libxml2-devel
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gsettings-desktop-schemas)
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(gtksourceview-3.0)
+BuildRequires:  pkgconfig(gtkspell-2.0)
+BuildRequires:  pkgconfig(json-glib-1.0)
+BuildRequires:  pkgconfig(libgda-4.0)
+BuildRequires:  pkgconfig(libpeas-1.0)
+BuildRequires:  pkgconfig(libpeas-gtk-1.0)
+BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
-BuildRequires:  pkgconfig(gsettings-desktop-schemas)
 Requires:       gsettings-desktop-schemas
 Recommends:     %{name}-lang
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %glib2_gsettings_schema_requires
 
 %description
@@ -57,11 +53,10 @@ gtranslator is a comfortable po file editor with many bells and whistles.
 It features many useful function which ease the work of translators of po
 files imminently.
 
-
 %package devel
+License:        GPLv3+
 Summary:        A GNOME po file editor with many bells and whistles
 Group:          Development/Tools/Other
-License:        GPLv3+
 
 %description devel
 gtranslator is a comfortable po file editor with many bells and whistles.
@@ -72,34 +67,33 @@ files imminently.
 %prep
 %setup -q
 translation-update-upstream
-%patch0 -p1
 
 %build
-# Needed for patch0
-NOCONFIGURE=1 gnome-autogen.sh
 %configure \
 	--disable-static \
 	--disable-scrollkeeper \
-	--disable-update-mimedb \
 	--with-gtkspell \
 	--with-dictionary
-%{__make} %{?jobs:-j%jobs}
+%{__make} %{?_smp_mflags}
 
 %install
 %makeinstall
+find %{buildroot}%{_libdir} -type f -name "*.la" -delete -print
 %suse_update_desktop_file %{name}
 %find_lang %{name} %{?no_lang_C}
-%fdupes $RPM_BUILD_ROOT
+%fdupes %{buildroot}
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %post
+/sbin/ldconfig
 %glib2_gsettings_schema_post
 %desktop_database_post
 %icon_theme_cache_post
 
 %postun
+/sbin/ldconfig
 %glib2_gsettings_schema_postun
 %desktop_database_postun
 %icon_theme_cache_postun
@@ -117,7 +111,10 @@ NOCONFIGURE=1 gnome-autogen.sh
 %doc %{_mandir}/man?/*
 %{_bindir}/%{name}
 %{_libdir}/%{name}/
+%{_libdir}/libgtranslator-private.so.0*
 %{_datadir}/%{name}/
+# .gir file goes to -devel package
+%exclude %{_datadir}/%{name}/gir-1.0/Gtranslator-3.0.gir
 %{_datadir}/applications/*.desktop
 %{_datadir}/glib-2.0/schemas/*.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/gtranslator.*
@@ -125,7 +122,9 @@ NOCONFIGURE=1 gnome-autogen.sh
 
 %files devel
 %defattr(-, root, root)
-%{_includedir}/gtranslator-2.0/
+%{_datadir}/%{name}/gir-1.0/Gtranslator-3.0.gir
+%{_includedir}/gtranslator-3.0/
+%{_libdir}/libgtranslator-private.so
 %{_libdir}/pkgconfig/gtranslator.pc
 %{_datadir}/gtk-doc/html/%{name}/