X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgedit.git;a=blobdiff_plain;f=gedit.spec;h=ccd9a743fe4edc42a1a02ccba03f36351c2334c8;hp=98c031e7d4fcd71c8699a39c97d86b6e0e0ee974;hb=5050e6cbac7b0b6d97804602a508237c640d1921;hpb=b826373e0560a6041ef300ae3b11db328691f3a8

diff --git a/gedit.spec b/gedit.spec
index 98c031e..ccd9a74 100644
--- a/gedit.spec
+++ b/gedit.spec
@@ -1,51 +1,66 @@
 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:		gedit2
-Version:	2.22.1
-Release:	1
-License:	GPL v2
+Name:		gedit
+Version:	3.16.3
+Release:	2
+License:	GPL v2+
 Group:		X11/Applications/Editors
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gedit/2.22/gedit-%{version}.tar.bz2
-# Source0-md5:	ee797f4e2eed291dc28ef8ff7082445e
-URL:		http://gedit.sourceforge.net/
-BuildRequires:	GConf2-devel >= 2.22.0
-BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake >= 1:1.8
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gedit/3.16/%{name}-%{version}.tar.xz
+# Source0-md5:	23c67110f2be200c304b31ef833b5a27
+URL:		http://www.gnome.org/projects/gedit/
+BuildRequires:	autoconf >= 2.63.2
+BuildRequires:	automake >= 1:1.11
+BuildRequires:	docbook-dtd412-xml
 BuildRequires:	enchant-devel >= 1.2.0
-BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.16.0
-BuildRequires:	gnome-common >= 2.20.0
-BuildRequires:	gnome-doc-utils >= 0.12.2
-BuildRequires:	gnome-vfs2-devel >= 2.22.0
-BuildRequires:	gtk+2-devel >= 2:2.12.9
-BuildRequires:	gtk-doc >= 1.8
-BuildRequires:	gtksourceview2-devel >= 2.2.0
-BuildRequires:	intltool >= 0.36.2
+BuildRequires:	gettext-tools >= 0.18
+BuildRequires:	glib2-devel >= 1:2.40.0
+BuildRequires:	gnome-common >= 2.24.0
+BuildRequires:	gnome-doc-utils >= 0.14.0
+BuildRequires:	gobject-introspection-devel >= 0.10.0
+BuildRequires:	gsettings-desktop-schemas-devel >= 3.2.0
+BuildRequires:	gtk+3-devel >= 3.16.0
+BuildRequires:	gtk-doc >= 1.0
+BuildRequires:	gtksourceview3-devel >= 3.16
+BuildRequires:	intltool >= 0.50.1
 BuildRequires:	iso-codes >= 0.35
-BuildRequires:	libglade2-devel >= 1:2.6.2
-BuildRequires:	libgnomeui-devel >= 2.22.1
-BuildRequires:	libtool
+BuildRequires:	libpeas-devel >= 1.7.0
+BuildRequires:	libpeas-gtk-devel >= 1.7.0
+BuildRequires:	libtool >= 2:2.2.6
+BuildRequires:	libxml2-devel >= 1:2.6.31
 BuildRequires:	pkgconfig
-BuildRequires:	python-devel >= 2.3
-BuildRequires:	python-gtksourceview2-devel >= 2.2.0
-BuildRequires:	python-pygtk-devel >= 2:2.12.0
+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.197
-BuildRequires:	scrollkeeper >= 0.3.12
+BuildRequires:	rpmbuild(macros) >= 1.601
 BuildRequires:	sed >= 4.0
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	vala >= 2:0.25.1
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xz
+BuildRequires:	yelp-tools
+BuildRequires:	zeitgeist-devel >= 0.9.12
 Requires(post,postun):	desktop-file-utils
-Requires(post,postun):	scrollkeeper
-Requires(post,preun):	GConf2
-Requires:	gnome-vfs2 >= 2.22.0
-Requires:	libgnomeui >= 2.22.1
-Requires:	python-gtksourceview2 >= 2.2.0
-Suggests:	python-vte
-Obsoletes:	gedit-devel
+Requires(post,postun):	glib2 >= 1:2.40.0
+Requires:	enchant >= 1.2.0
+Requires:	glib2 >= 1:2.40.0
+Requires:	gsettings-desktop-schemas >= 3.2.0
+Requires:	gtk+3 >= 3.16.0
+Requires:	gtksourceview3 >= 3.16
+Requires:	iso-codes >= 0.35
+Requires:	libpeas-loader-python3 >= 1.7.0
+Requires:	python3-libs >= 1:3.2.3
+Requires:	python3-pycairo
+Requires:	python3-pygobject3 >= 3.0.0
+Requires:	zeitgeist-libs >= 0.9.12
 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
@@ -63,10 +78,13 @@ dokumentów naraz i wiele innych.
 Summary:	gedit header files
 Summary(pl.UTF-8):	Pliki nagłówkowe gedit
 Group:		X11/Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	gtksourceview2-devel >= 2.2.0
-Requires:	libglade2-devel >= 1:2.6.2
-Requires:	libgnomeui-devel >= 2.22.1
+# doesn't require base
+Requires:	glib2-devel >= 1:2.40.0
+Requires:	gtk+3-devel >= 3.16.0
+Requires:	gtksourceview3-devel >= 3.16
+Requires:	libpeas-devel >= 1.7.0
+Requires:	libpeas-gtk-devel >= 1.7.0
+Obsoletes:	gedit2-devel
 
 %description devel
 gedit header files.
@@ -79,6 +97,10 @@ Summary:	gedit API documentation
 Summary(pl.UTF-8):	Dokumentacja API gedit
 Group:		Documentation
 Requires:	gtk-doc-common
+Obsoletes:	gedit2-apidocs
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description apidocs
 gedit API documentation.
@@ -86,25 +108,34 @@ gedit API documentation.
 %description apidocs -l pl.UTF-8
 Dokumentacja API gedit.
 
-%prep
-%setup -q -n gedit-%{version}
-sed -i 's/codegen.py/codegen.pyc/' configure.ac
+%package -n vala-gedit
+Summary:	gedit API for Vala language
+Summary(pl.UTF-8):	API gedit dla języka Vala
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	vala >= 2:0.25.1
+
+%description -n vala-gedit
+gedit API for Vala language.
+
+%description -n vala-gedit -l pl.UTF-8
+API gedit dla języka Vala.
 
-sed -i -e 's#sr@Latn#sr@latin#' po/LINGUAS
-mv po/sr@{Latn,latin}.po
+%prep
+%setup -q
 
 %build
-%{__gnome_doc_common}
+%{__gtkdocize}
 %{__libtoolize}
 %{__intltoolize}
-%{__aclocal} -I m4
+%{__aclocal} -I m4 -I libgd
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
-	--disable-schemas-install \
-	--disable-scrollkeeper \
-	--enable-python \
+	--disable-silent-rules \
+	--disable-static \
+	--disable-updater \
 	--enable-gtk-doc \
 	--with-html-dir=%{_gtkdocdir}
 %{__make}
@@ -112,65 +143,69 @@ mv po/sr@{Latn,latin}.po
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -j1 install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-# Remove obsoleted *.la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins/*.py
-rm -f $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins/*/*.py
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gedit/plugins/*.la \
+	$RPM_BUILD_ROOT%{_libdir}/gedit/*.la
 
-%find_lang gedit --with-gnome --with-omf
+%find_lang gedit --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
-%gconf_schema_install gedit-file-browser.schemas
-%gconf_schema_install gedit.schemas
-%scrollkeeper_update_post
 %update_desktop_database_post
-
-%preun
-%gconf_schema_uninstall gedit-file-browser.schemas
-%gconf_schema_uninstall gedit.schemas
+%glib_compile_schemas
 
 %postun
-/sbin/ldconfig
-%scrollkeeper_update_postun
 %update_desktop_database_postun
+%glib_compile_schemas
 
 %files -f gedit.lang
 %defattr(644,root,root,755)
-%doc README ChangeLog AUTHORS
-%{_sysconfdir}/gconf/schemas/gedit.schemas
-%{_sysconfdir}/gconf/schemas/gedit-file-browser.schemas
+%doc AUTHORS BUGS ChangeLog MAINTAINERS NEWS README
 %attr(755,root,root) %{_bindir}/gedit
 %attr(755,root,root) %{_bindir}/gnome-text-editor
-%dir %{_libdir}/gedit-2
-%dir %{_libdir}/gedit-2/plugins
-%dir %{_libdir}/gedit-2/plugins/externaltools
-%dir %{_libdir}/gedit-2/plugins/pythonconsole
-%dir %{_libdir}/gedit-2/plugins/snippets
-%attr(755,root,root) %{_libdir}/gedit-2/gedit-bugreport.sh
-%attr(755,root,root) %{_libdir}/gedit-2/plugins/*.so
-%{_libdir}/gedit-2/plugins/externaltools/*.glade
-%{_libdir}/gedit-2/plugins/externaltools/*.py[co]
-%{_libdir}/gedit-2/plugins/*.gedit-plugin
-%{_libdir}/gedit-2/plugins/pythonconsole/*.py[co]
-%{_libdir}/gedit-2/plugins/snippets/*.glade
-%{_libdir}/gedit-2/plugins/snippets/*.py[co]
-%{_datadir}/gedit-2
-%{_desktopdir}/gedit.desktop
+%dir %{_libdir}/gedit
+%attr(755,root,root) %{_libdir}/gedit/libgedit.so
+%dir %{_libdir}/gedit/plugins
+%attr(755,root,root) %{_libdir}/gedit/gedit-bugreport.sh
+%attr(755,root,root) %{_libdir}/gedit/plugins/*.so
+%{_libdir}/gedit/plugins/*.plugin
+%{_libdir}/gedit/plugins/externaltools
+%{_libdir}/gedit/plugins/pythonconsole
+%{_libdir}/gedit/plugins/snippets
+%{_libdir}/gedit/plugins/quickopen
+%dir %{_libdir}/gedit/girepository-1.0
+%{_libdir}/gedit/girepository-1.0/Gedit-3.0.typelib
+%{_datadir}/appdata/org.gnome.gedit.appdata.xml
+%{_datadir}/gedit
+%{_datadir}/GConf/gsettings/gedit.convert
+%{_datadir}/dbus-1/services/org.gnome.gedit.service
+%{_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.time.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.gschema.xml
+%{_desktopdir}/org.gnome.gedit.desktop
 %{_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-2.20
-%{_pkgconfigdir}/gedit-2.20.pc
+%{_includedir}/gedit-3.14
+%{_pkgconfigdir}/gedit.pc
 
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/gedit
+
+%files -n vala-gedit
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/gedit.deps
+%{_datadir}/vala/vapi/gedit.vapi