Accepting request 586214 from GNOME:Factory

Update to 3.28.0 (forwarded request 586013 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/586214
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gedit?expand=0&rev=122
This commit is contained in:
Dominique Leuenberger 2018-03-14 18:28:45 +00:00 committed by Git OBS Bridge
commit 9c016b506e
6 changed files with 121 additions and 70 deletions

View File

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

3
gedit-3.28.0.tar.xz Normal file
View File

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

View File

@ -1,8 +1,8 @@
Index: data/org.gnome.gedit.desktop.in.in
Index: gedit-3.27.92/data/org.gnome.gedit.desktop.in.in
===================================================================
--- data/org.gnome.gedit.desktop.in.in.orig
+++ data/org.gnome.gedit.desktop.in.in
@@ -6,7 +6,7 @@ Exec=gedit %U
--- gedit-3.27.92.orig/data/org.gnome.gedit.desktop.in.in 2017-11-08 18:49:04.000000000 +0100
+++ gedit-3.27.92/data/org.gnome.gedit.desktop.in.in 2018-03-06 22:09:32.816610068 +0100
@@ -5,7 +5,7 @@ Exec=gedit %U
Terminal=false
Type=Application
StartupNotify=true

View File

@ -0,0 +1,10 @@
Index: gedit-3.27.92/plugins/externaltools/data/send-to-fpaste.tool.in
===================================================================
--- gedit-3.27.92.orig/plugins/externaltools/data/send-to-fpaste.tool.in 2018-02-01 14:58:38.000000000 +0100
+++ gedit-3.27.92/plugins/externaltools/data/send-to-fpaste.tool.in 2018-03-06 22:46:20.502284840 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python3
import os, urllib, json, sys, urllib.request
from gi.repository import Gtk, Gdk

View File

@ -1,3 +1,57 @@
-------------------------------------------------------------------
Mon Mar 12 16:10:39 UTC 2018 - dimstar@opensuse.org
- Update to version 3.28.0:
+ Updated translations.
-------------------------------------------------------------------
Sat Mar 10 08:53:58 UTC 2018 - jengelh@inai.de
- Update descriptions.
-------------------------------------------------------------------
Tue Mar 6 21:10:40 UTC 2018 - bjorn.lie@gmail.com
- Add gedit-plugins-python-env.patch: Set python env to explicit
python3, do not depend on env variable. We can't have random
python interpreters be executed.
- Refresh downstream gedit-desktop.patch, use autosetup and
make_build macros.
-------------------------------------------------------------------
Sun Mar 4 23:10:11 UTC 2018 - luc14n0@linuxmail.org
- Update to version 3.27.92:
+ Updated translations.
- Update URL tag to https://wiki.gnome.org/Apps/Gedit, the current
Gedit web page.
- Drop:
+ glib2_gsettings_schema_* and desktop_database_* post/postun
scriptlets and glib2_gsettings_schema_requires macro: their
functionality has been moved to RPM file triggers
(RPM 4.13, suse_version >= 1330).
+ update-desktop-files BuildRequires and its macro: they are no
longer needed anymore.
+ ice and sm pkgconfig BuildRequires: they are no longer used
anymore.
- Add glib-2.0 and gmodules-2.0 pkgconfig modules and
gobject-introspection-devel BuildRequires to avoid implicit
dependencies.
- Point fdupes to the prefix directory instead of directly to the
buildroot, which is a practice that must be avoided.
-------------------------------------------------------------------
Wed Feb 28 16:26:14 UTC 2018 - dimstar@opensuse.org
- Modernize spec-file by calling spec-cleaner
-------------------------------------------------------------------
Tue Feb 6 13:27:27 UTC 2018 - dimstar@opensuse.org
- Update to version 3.27.90:
+ Misc bugfixes.
+ Updated translations.
-------------------------------------------------------------------
Sat Aug 5 14:08:20 UTC 2017 - zaitor@opensuse.org

View File

@ -1,7 +1,7 @@
#
# spec file for package gedit
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,49 +16,44 @@
#
%define _with_gi_python 1
%bcond_without python_bindings
Name: gedit
Version: 3.22.1
Version: 3.28.0
Release: 0
Summary: Small and lightweight UTF-8 text editor
License: GPL-2.0+
Summary: UTF-8 text editor
License: GPL-2.0-or-later
Group: Productivity/Text/Editors
Url: http://www.gnome.org
Source: http://download.gnome.org/sources/gedit/3.22/%{name}-%{version}.tar.xz
URL: https://wiki.gnome.org/Apps/Gedit
Source0: http://download.gnome.org/sources/gedit/3.28/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE gedit-desktop.patch -- Adds more MIME types.
Patch0: gedit-desktop.patch
# PATCH-FIX-OPENSUSE gedit-plugins-python-env.patch bjorn.lie@gmail.com -- Fix python env
Patch1: gedit-plugins-python-env.patch
BuildRequires: fdupes
BuildRequires: gettext
BuildRequires: gobject-introspection-devel >= 0.9.3
BuildRequires: gtk-doc
BuildRequires: hicolor-icon-theme
BuildRequires: intltool >= 0.50.1
BuildRequires: iso-codes-devel
BuildRequires: python >= 3.2.3
%if !0%{?is_opensuse}
BuildRequires: translation-update-upstream
%endif
BuildRequires: update-desktop-files
BuildRequires: pkgconfig
BuildRequires: python3-base >= 3.2.3
BuildRequires: yelp-tools
BuildRequires: pkgconfig(gio-2.0) >= 2.44
BuildRequires: pkgconfig(glib-2.0) >= 2.44
BuildRequires: pkgconfig(gmodule-2.0)
BuildRequires: pkgconfig(gsettings-desktop-schemas)
BuildRequires: pkgconfig(gspell-1) >= 0.2.5
BuildRequires: pkgconfig(gtk+-3.0) >= 3.21.3
BuildRequires: pkgconfig(gtksourceview-3.0) >= 3.19.4
BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0
BuildRequires: pkgconfig(gtksourceview-3.0) >= 3.22.0
BuildRequires: pkgconfig(libpeas-1.0) >= 1.14.1
BuildRequires: pkgconfig(libpeas-gtk-1.0) >= 1.14.1
BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: pkgconfig(libxml-2.0) >= 2.5.0
BuildRequires: pkgconfig(pygobject-3.0) >= 3.0.0
BuildRequires: pkgconfig(sm) >= 1.0.0
BuildRequires: pkgconfig(vapigen) >= 0.25.1
BuildRequires: pkgconfig(x11)
Requires: python3-cairo
%if %{_with_gi_python}
# See bnc#847114 - plugins generally depend on it
Requires: python3-gedit
%endif
Requires: python3-gobject
#bnc#910913 - plugin snippets depend on this package
Requires: python3-gobject-cairo
@ -66,83 +61,76 @@ Recommends: %{name}-lang
Recommends: iso-codes
Provides: gedit2 = %{version}
Obsoletes: gedit2 < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%glib2_gsettings_schema_requires
%if !0%{?is_opensuse}
BuildRequires: translation-update-upstream
%endif
%if %{with python_bindings}
# See bnc#847114 - plugins generally depend on it
Requires: python3-gedit
%endif
%description
Gedit is a small and lightweight UTF-8 text editor for the GNOME
environment.
Gedit is a UTF-8 text editor for the GNOME environment.
It features a multi-document frame, syntax highlighting, autoindent
options, autosave, and plugins.
%if %{_with_gi_python}
%package -n python3-gedit
Summary: Python bindings for gedit
Group: Development/Languages/Python
%description -n python3-gedit
Gedit is a small and lightweight UTF-8 text editor for the GNOME
Gedit is a UTF-8 text editor for the GNOME
environment.
This package provides the python bindings, based on gobject-introspection.
%endif
%package devel
Summary: Small and lightweight UTF-8 text editor
Summary: Development files for the gedit text editor
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
Requires: gtksourceview-devel
%if %{_with_gi_python}
Requires: python3-gedit
%endif
Provides: gedit2-devel = %{version}
Obsoletes: gedit2-devel < %{version}
Provides: %{name}-doc = %{version}
Obsoletes: %{name}-doc < %{version}
%if %{with python_bindings}
Requires: python3-gedit
%endif
%description devel
Gedit is a small and lightweight UTF-8 text editor for the GNOME
Gedit is a UTF-8 text editor for the GNOME
environment.
This subpackage contains the header files for creating gedit plugins.
%lang_package
%prep
%setup -q
%autosetup -p1
%if !0%{?is_opensuse}
translation-update-upstream
%endif
%patch0 -p0
%build
%configure \
--enable-python
make %{?_smp_mflags}
--enable-python \
%{nil}
%make_build
%install
%make_install
find %{buildroot} -type f -name '*.la' -delete -print
%suse_update_desktop_file org.gnome.gedit
find %{buildroot} -type f -name "*.la" -delete -print
%find_lang %{name} %{?no_lang_C}
%fdupes %{buildroot}
%clean
rm -rf %{buildroot}
%post
/sbin/ldconfig
%desktop_database_post
%glib2_gsettings_schema_post
%postun
/sbin/ldconfig
%desktop_database_postun
%glib2_gsettings_schema_postun
%fdupes %{buildroot}%{_prefix}
%files
%defattr(-, root, root)
%doc AUTHORS ChangeLog COPYING MAINTAINERS NEWS README
%license COPYING
%doc NEWS README
%doc %{_datadir}/help/C/%{name}/
%{_bindir}/gedit
%{_bindir}/gnome-text-editor
%dir %{_datadir}/appdata
%{_datadir}/appdata/org.gnome.gedit.appdata.xml
%{_datadir}/metainfo/org.gnome.gedit.appdata.xml
%{_datadir}/applications/*.desktop
%{_datadir}/dbus-1/services/org.gnome.gedit.service
%{_datadir}/GConf/gsettings/gedit.convert
@ -186,20 +174,17 @@ rm -rf %{buildroot}
%dir %{_libexecdir}/gedit
%endif
%{_libexecdir}/gedit/gedit-bugreport.sh
%doc %{_mandir}/man1/gedit*
%{_mandir}/man1/gedit.1%{?ext_man}
%{_datadir}/icons/hicolor/*/apps/*
%files lang -f %{name}.lang
%if %{_with_gi_python}
%if %{with python_bindings}
%files -n python3-gedit
%defattr(-,root,root)
%{python3_sitearch}/gi/overrides/Gedit*
%{python3_sitearch}/gi/overrides/__pycache__/Gedit*
%endif
%files devel
%defattr(-, root, root)
%doc AUTHORS ChangeLog HACKING MAINTAINERS
%doc %{_datadir}/gtk-doc/html/gedit/
%{_datadir}/gedit/gir-1.0/
%{_includedir}/*
@ -207,4 +192,6 @@ rm -rf %{buildroot}
%{_datadir}/vala/vapi/gedit.deps
%{_datadir}/vala/vapi/gedit.vapi
%files lang -f %{name}.lang
%changelog