- updated to 3.34.0

- added gtkdocdir patch

diff --git a/gedit-gtkdocdir.patch b/gedit-gtkdocdir.patch
new file mode 100644 (file)
index 0000000..5e80069
--- /dev/null
+++ b/gedit-gtkdocdir.patch
@@ -0,0 +1,11 @@
+--- gedit-3.34.0/meson.build.orig      2019-09-09 15:33:23.000000000 +0200
++++ gedit-3.34.0/meson.build   2019-11-07 19:11:38.130835763 +0100
+@@ -42,7 +42,7 @@
+ 
+ dbusdir = join_paths(datadir, 'dbus-1')
+ glibdir = join_paths(datadir, 'glib-2.0')
+-gtkdocdir = join_paths(datadir, 'gtk-doc')
++gtkdocdir = join_paths(datadir, 'doc', 'gtk-doc')
+ localdir = join_paths(datadir, 'local')
+ vapidir = join_paths(datadir, 'vala', 'vapi')
+ 

diff --git a/gedit.spec b/gedit.spec
index c7e6eb2a8a7f49e37db470f918dc56917ab331ee..9fe0505785c8551650434e592063409744e29147 100644 (file)
--- a/gedit.spec
+++ b/gedit.spec
@@ -1,41 +1,40 @@
 Summary:       gedit - small but powerful text editor for X Window
 Summary(pl.UTF-8):     gedit - mały ale potężny edytor tekstu dla X Window
 Name:          gedit
-Version:       3.30.2
-Release:       3
+Version:       3.34.0
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Editors
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gedit/3.30/%{name}-%{version}.tar.xz
-# Source0-md5: efdaa2432770ac2693d6391ceddff7be
-URL:           http://www.gnome.org/projects/gedit/
-BuildRequires: autoconf >= 2.63.2
-BuildRequires: automake >= 1:1.11
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gedit/3.34/%{name}-%{version}.tar.xz
+# Source0-md5: ec6632fa73d9ea6c817e74a98d16eab6
+Patch0:                %{name}-gtkdocdir.patch
+URL:           https://wiki.gnome.org/Apps/Gedit
 BuildRequires: docbook-dtd412-xml
 BuildRequires: gettext-tools >= 0.18
 BuildRequires: glib2-devel >= 1:2.44.0
-BuildRequires: gnome-common >= 2.24.0
 BuildRequires: gobject-introspection-devel >= 0.10.0
 BuildRequires: gspell-devel >= 0.2.5
 BuildRequires: gsettings-desktop-schemas-devel >= 3.2.0
 BuildRequires: gtk+3-devel >= 3.22.0
 BuildRequires: gtk-doc >= 1.0
-BuildRequires: gtksourceview3-devel >= 3.22
-BuildRequires: intltool >= 0.50.1
+BuildRequires: gtksourceview4-devel >= 4.0.2
 BuildRequires: iso-codes >= 0.35
 BuildRequires: libpeas-devel >= 1.14.1
 BuildRequires: libpeas-gtk-devel >= 1.14.1
-BuildRequires: libtool >= 2:2.2.6
+BuildRequires: libsoup-devel >= 2.60.0
 BuildRequires: libxml2-devel >= 1:2.6.31
+BuildRequires: meson >= 0.46.0
+BuildRequires: ninja >= 1.5
 BuildRequires: pkgconfig
 BuildRequires: python3-devel >= 1:3.2.3
 BuildRequires: python3-pygobject3-devel >= 3.0.0
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(find_lang) >= 1.23
-BuildRequires: rpmbuild(macros) >= 1.601
+BuildRequires: rpmbuild(macros) >= 1.736
 BuildRequires: sed >= 4.0
 BuildRequires: tar >= 1:1.22
 BuildRequires: vala >= 2:0.25.1
-BuildRequires: vala-gtksourceview
+BuildRequires: vala-gtksourceview4 >= 4.0.2
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xz
 BuildRequires: yelp-tools
@@ -46,22 +45,19 @@ Requires:   glib2 >= 1:2.44.0
 Requires:      gspell >= 0.2.5
 Requires:      gsettings-desktop-schemas >= 3.2.0
 Requires:      gtk+3 >= 3.22.0
-Requires:      gtksourceview3 >= 3.22
+Requires:      gtksourceview4 >= 4.0.2
 Requires:      hicolor-icon-theme
 Requires:      iso-codes >= 0.35
 Requires:      libpeas-loader-python3 >= 1.14.1
+Requires:      libsoup >= 2.60.0
 Requires:      libxml2 >= 1:2.6.31
 Requires:      python3-libs >= 1:3.2.3
 Requires:      python3-pycairo
 Requires:      python3-pygobject3 >= 3.0.0
 Obsoletes:     gedit-plugins < 2.3.3-2
-# sr@Latn vs. sr@latin
 Obsoletes:     gedit2
-Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define        skip_post_check_so libgedit-private.so.0.0.0
-
 %description
 gedit is a small but powerful text editor for GTK+ and/or GNOME. It
 includes such features as split-screen mode, a plugin API, which
@@ -82,7 +78,7 @@ Group:                X11/Development/Libraries
 # doesn't require base
 Requires:      glib2-devel >= 1:2.44.0
 Requires:      gtk+3-devel >= 3.22.0
-Requires:      gtksourceview3-devel >= 3.22
+Requires:      gtksourceview4-devel >= 4.0.2
 Requires:      libpeas-devel >= 1.14.1
 Requires:      libpeas-gtk-devel >= 1.14.1
 Obsoletes:     gedit2-devel
@@ -115,6 +111,7 @@ Summary(pl.UTF-8):  API gedit dla języka Vala
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 Requires:      vala >= 2:0.25.1
+Requires:      vala-gtksourceview4 >= 4.0.2
 %if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
 %endif
@@ -127,32 +124,21 @@ API gedit dla języka Vala.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%{__gtkdocize}
-%{__libtoolize}
-%{__intltoolize}
-%{__aclocal} -I m4 -I libgd
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-       --disable-silent-rules \
-       --disable-updater \
-       --enable-gtk-doc \
-       --with-html-dir=%{_gtkdocdir}
-%{__make}
+%meson build \
+       -Ddocumentation=true
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gedit/plugins/*.la \
-       $RPM_BUILD_ROOT%{_libdir}/gedit/*.la
+%ninja_install -C build
 
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ln
+%py3_comp $RPM_BUILD_ROOT%{py3_sitedir}
+%py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}
 
 %find_lang gedit --with-gnome
 
@@ -171,15 +157,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f gedit.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog MAINTAINERS NEWS README
+%doc AUTHORS NEWS README.md
 %attr(755,root,root) %{_bindir}/gedit
-%attr(755,root,root) %{_bindir}/gnome-text-editor
 %dir %{_libdir}/gedit
-%attr(755,root,root) %{_libdir}/gedit/libgedit.so
+%attr(755,root,root) %{_libdir}/gedit/libgedit-3.14.so
 %dir %{_libdir}/gedit/plugins
 %attr(755,root,root) %{_libdir}/gedit/plugins/*.so
-%dir %{_libexecdir}/gedit
-%attr(755,root,root) %{_libexecdir}/gedit/gedit-bugreport.sh
 %{_libdir}/gedit/plugins/*.plugin
 %{_libdir}/gedit/plugins/externaltools
 %{_libdir}/gedit/plugins/pythonconsole
@@ -187,28 +170,31 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gedit/plugins/quickopen
 %dir %{_libdir}/gedit/girepository-1.0
 %{_libdir}/gedit/girepository-1.0/Gedit-3.0.typelib
-%{_datadir}/metainfo/org.gnome.gedit.appdata.xml
-%{_datadir}/gedit
-%{_datadir}/GConf/gsettings/gedit.convert
+%{py3_sitedir}/gi/overrides/Gedit.py
+%{py3_sitedir}/gi/overrides/__pycache__/Gedit.cpython-*.py[co]
 %{_datadir}/dbus-1/services/org.gnome.gedit.service
+%dir %{_datadir}/gedit
+%{_datadir}/gedit/plugins
 %{_datadir}/glib-2.0/schemas/org.gnome.gedit.enums.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.gedit.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.externaltools.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.enums.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.pythonconsole.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.spell.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.enums.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.gschema.xml
+%{_datadir}/metainfo/org.gnome.gedit.appdata.xml
 %{_desktopdir}/org.gnome.gedit.desktop
-%{_iconsdir}/hicolor/*/apps/gedit.png
-%{_iconsdir}/hicolor/symbolic/apps/gedit-symbolic.svg
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.gedit.svg
+%{_iconsdir}/hicolor/symbolic/apps/org.gnome.gedit-symbolic.svg
 %{_mandir}/man1/gedit.1*
-%{py3_sitedir}/gi/overrides/*.py
-%{py3_sitedir}/gi/overrides/__pycache__/*.py[co]
 
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/gedit-3.14
+%dir %{_datadir}/gedit/gir-1.0
+%{_datadir}/gedit/gir-1.0/Gedit-3.0.gir
 %{_pkgconfigdir}/gedit.pc
 
 %files apidocs