Accepting request 106589 from home:vuntz:branches:GNOME:Factory

Update to 3.3.4

OBS-URL: https://build.opensuse.org/request/show/106589
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gedit?expand=0&rev=112

gedit-3.3.3.tar.xz

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

gedit-3.3.4.tar.xz

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

gedit.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Feb 23 07:10:33 UTC 2012 - vuntz@opensuse.org
+
+- Update to version 3.3.4:
+  + Fix many memory leaks
+  + Use Yelp Tools for docs generation
+  + Docs updates
+  + Misc bugfixes
+  + Updated translations.
+- Change gnome-doc-utils-devel BuildRequires to yelp-tools,
+  following the build system change for user documentation.
+- Manually list the translated help documents as %find_lang doesn't
+  support the new XDG help system yet.
+
 -------------------------------------------------------------------
 Sun Feb 19 16:51:21 UTC 2012 - dimstar@opensuse.org
 

gedit.spec

@@ -17,8 +17,9 @@
 
 
 Name:           gedit
-Version:        3.3.3
+Version:        3.3.4
 Release:        0
+# FIXME: the %%{_datadir}/help/$locale/ files be found by %%find_lang
 Summary:        Small and lightweight UTF-8 text editor
 License:        GPL-2.0+
 Group:          Productivity/Text/Editors
@@ -29,12 +30,12 @@ Patch0:         gedit-desktop.patch
 BuildRequires:  enchant-devel
 BuildRequires:  fdupes
 BuildRequires:  gettext
-BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  gtk-doc
 BuildRequires:  intltool
 BuildRequires:  iso-codes-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
+BuildRequires:  yelp-tools
 BuildRequires:  pkgconfig(gsettings-desktop-schemas)
 BuildRequires:  pkgconfig(gtksourceview-3.0)
 BuildRequires:  pkgconfig(ice)
@@ -94,10 +95,18 @@ make %{?jobs:-j%jobs} V=1
 
 %install
 %makeinstall
-%suse_update_desktop_file -N gedit -G "Text Editor" gedit TextEditor
-%find_lang %{name} %{?no_lang_C}
 rm %{buildroot}%{_libdir}/*/*/*.*a
 rm %{buildroot}%{_libdir}/*.la
+%suse_update_desktop_file -N gedit -G "Text Editor" gedit TextEditor
+%find_lang %{name} %{?no_lang_C}
+# Localized help
+for help in %{buildroot}%{_datadir}/help/*/%{name}/; do
+    LOCALE=`echo $help | sed "s:.*%{_datadir}/help/\([^/]*\)/%{name}/:\1:g"`
+    echo "%%lang($LOCALE) %%dir %%{_datadir}/help/$LOCALE" >> %{name}.help-lang.tmp
+    echo "%%lang($LOCALE) %%doc /${help##%{buildroot}}" >> %{name}.help-lang.tmp
+done
+sort -u %{name}.help-lang.tmp | grep -v "^%%lang(C)" > %{name}.help-lang
+rm %{name}.help-lang.tmp
 %fdupes %{buildroot}
 
 %clean
@@ -116,10 +125,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-, root, root)
 %doc AUTHORS BUGS ChangeLog COPYING MAINTAINERS NEWS README
-%dir %{_datadir}/gnome/
-%dir %{_datadir}/gnome/help/
-%dir %{_datadir}/gnome/help/%{name}/
-%doc %{_datadir}/gnome/help/%{name}/C/
+%doc %{_datadir}/help/C/%{name}/
 %{_bindir}/gedit
 %{_bindir}/gnome-text-editor
 %{_datadir}/applications/*.desktop
@@ -168,7 +174,7 @@ rm -rf %{buildroot}
 %{py_sitedir}/gi/overrides/Gedit.py*
 %doc %{_mandir}/man1/gedit*
 
-%files lang -f %{name}.lang
+%files lang -f %{name}.lang -f %{name}.help-lang
 
 %files plugin-zeitgeist
 %defattr(-, root, root)