X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=gedit.spec;h=c5de6bb4c524d7506aa2b6a0076fc9eb9e8be773;hb=527fbbd1f50581f337c5a0bc0f8a261b41fe2c12;hp=684ba10bc1fc912796ae80c16e5a61f66134529f;hpb=7e783bb06c2fff3ad11451b03a321afdde8a3c4c;p=packages%2Fgedit.git

diff --git a/gedit.spec b/gedit.spec
index 684ba10..c5de6bb 100644
--- a/gedit.spec
+++ b/gedit.spec
@@ -1,52 +1,59 @@
 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:	3.0.1
-Release:	1
-License:	GPL v2
+Name:		gedit
+Version:	3.18.3
+Release:	2
+License:	GPL v2+
 Group:		X11/Applications/Editors
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gedit/3.0/gedit-%{version}.tar.bz2
-# Source0-md5:	6a86ac3c53818b880c99b2f3235dc6b7
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gedit/3.18/%{name}-%{version}.tar.xz
+# Source0-md5:	f42f979245daf2115f9741c1d4ebd3d1
 URL:		http://www.gnome.org/projects/gedit/
-BuildRequires:	autoconf >= 2.64
-BuildRequires:	automake >= 1:1.10
+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.28.0
+BuildRequires:	gettext-tools >= 0.18
+BuildRequires:	glib2-devel >= 1:2.44.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.0.0
-BuildRequires:	gtk+3-devel >= 3.0.2
-BuildRequires:	gtk-doc >= 1.8
-BuildRequires:	gtksourceview3-devel >= 3.0.0
-BuildRequires:	intltool >= 0.40.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.18
+BuildRequires:	intltool >= 0.50.1
 BuildRequires:	iso-codes >= 0.35
-BuildRequires:	libpeas-devel >= 1.0.0
-BuildRequires:	libpeas-gtk-devel >= 1.0.0
-BuildRequires:	libsoup-devel
+BuildRequires:	libpeas-devel >= 1.14.1
+BuildRequires:	libpeas-gtk-devel >= 1.14.1
 BuildRequires:	libtool >= 2:2.2.6
 BuildRequires:	libxml2-devel >= 1:2.6.31
-BuildRequires:	libzeitgeist-devel >= 0.3.2
 BuildRequires:	pkgconfig
-BuildRequires:	python-devel >= 2.3
+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:	scrollkeeper >= 0.3.12
 BuildRequires:	sed >= 4.0
-BuildRequires:	xorg-lib-libSM-devel
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	vala >= 2:0.25.1
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xz
+BuildRequires:	yelp-tools
 Requires(post,postun):	desktop-file-utils
-Requires(post,postun):	scrollkeeper
-Requires(post,postun):	glib2 >= 1:2.26.0
-Requires:	gsettings-desktop-schemas >= 3.0.0
-Requires:	libpeas-loader-python >= 1.0.0
-Requires:	python-pycairo
-Requires:	python-pygobject >= 2.28.0
-Obsoletes:	gedit-devel
+Requires(post,postun):	glib2 >= 1:2.44.0
+Requires:	enchant >= 1.2.0
+Requires:	glib2 >= 1:2.44.0
+Requires:	gsettings-desktop-schemas >= 3.2.0
+Requires:	gtk+3 >= 3.16.0
+Requires:	gtksourceview3 >= 3.18
+Requires:	iso-codes >= 0.35
+Requires:	libpeas-loader-python3 >= 1.14.1
+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)
 
@@ -69,10 +76,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:	gtksourceview3-devel >= 3.0.0
-Requires:	libpeas-devel >= 1.0.0
-Requires:	libpeas-gtk-devel >= 1.0.0
+# doesn't require base
+Requires:	glib2-devel >= 1:2.44.0
+Requires:	gtk+3-devel >= 3.16.0
+Requires:	gtksourceview3-devel >= 3.18
+Requires:	libpeas-devel >= 1.14.1
+Requires:	libpeas-gtk-devel >= 1.14.1
+Obsoletes:	gedit2-devel
 
 %description devel
 gedit header files.
@@ -85,6 +95,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.
@@ -92,22 +106,38 @@ gedit API documentation.
 %description apidocs -l pl.UTF-8
 Dokumentacja API gedit.
 
+%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
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
+
+%description -n vala-gedit
+gedit API for Vala language.
+
+%description -n vala-gedit -l pl.UTF-8
+API gedit dla języka Vala.
+
 %prep
-%setup -q -n gedit-%{version}
+%setup -q
 
 %build
 %{__gtkdocize}
 %{__libtoolize}
 %{__intltoolize}
-%{__aclocal} -I m4
+%{__aclocal} -I m4 -I libgd
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
-	--disable-scrollkeeper \
 	--disable-silent-rules \
-	--enable-gtk-doc \
 	--disable-static \
+	--disable-updater \
+	--enable-gtk-doc \
 	--with-html-dir=%{_gtkdocdir}
 %{__make}
 
@@ -118,50 +148,39 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/gedit/plugins/*.la \
-	$RPM_BUILD_ROOT%{_libdir}/gedit/plugins/*/*.py \
-	$RPM_BUILD_ROOT%{_libdir}/*.la
-
-%py_postclean
+	$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
-%scrollkeeper_update_post
 %update_desktop_database_post
 %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
+%doc AUTHORS ChangeLog MAINTAINERS NEWS README
 %attr(755,root,root) %{_bindir}/gedit
 %attr(755,root,root) %{_bindir}/gnome-text-editor
-%attr(755,root,root) %{_libdir}/libgedit-private.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgedit-private.so.0
 %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
-%dir %{_libdir}/gedit/plugins/externaltools
-%{_libdir}/gedit/plugins/externaltools/*.py[co]
-%dir %{_libdir}/gedit/plugins/pythonconsole
-%{_libdir}/gedit/plugins/pythonconsole/*.py[co]
-%dir %{_libdir}/gedit/plugins/snippets
-%{_libdir}/gedit/plugins/snippets/*.py[co]
-%dir %{_libdir}/gedit/plugins/quickopen
-%{_libdir}/gedit/plugins/quickopen/*.py[co]
+%{_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
@@ -173,16 +192,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_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}/gedit.desktop
+%{_desktopdir}/org.gnome.gedit.desktop
 %{_mandir}/man1/gedit.1*
-%{py_sitedir}/gi/overrides/*.py[co]
+%{py3_sitedir}/gi/overrides/*.py
+%{py3_sitedir}/gi/overrides/__pycache__/*.py[co]
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgedit-private.so
-%{_includedir}/gedit-3.0
+%{_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