- updated to 0.28.0; merged from DEVEL

Changed files:
    vte.spec -> 1.163

diff --git a/vte.spec b/vte.spec
index 40cd27191bf594ae7f3ba8912ac35653fd80b58b..0800795017228e57875e23c394309786a63d66b8 100644 (file)
--- a/vte.spec
+++ b/vte.spec
@@ -1,30 +1,31 @@
 Summary:       VTE terminal widget library
 Summary(pl.UTF-8):     Biblioteka z kontrolką terminala VTE
 Name:          vte
-Version:       0.26.2
+Version:       0.28.0
 Release:       1
 License:       LGPL v2+
 Group:         X11/Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/vte/0.26/%{name}-%{version}.tar.bz2
-# Source0-md5: 54bf0d31851fa942758e700d5b6bc96c
-BuildRequires: autoconf >= 2.59-9
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/vte/0.28/%{name}-%{version}.tar.bz2
+# Source0-md5: c21e08e973a47a9d105c24506e537848
+BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.9
 BuildRequires: docbook-dtd412-xml
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.22.0
+BuildRequires: glib2-devel >= 1:2.28.0
 BuildRequires: gnome-common
-BuildRequires: gobject-introspection-devel >= 0.6.7
-BuildRequires: gtk+2-devel >= 2:2.14.0
+BuildRequires: gobject-introspection-devel >= 0.10.0
+BuildRequires: gtk+3-devel >= 3.0.0
 BuildRequires: gtk-doc >= 1.13
 BuildRequires: gtk-doc-automake
 BuildRequires: intltool >= 0.40.0
 BuildRequires: libtool
 BuildRequires: ncurses-devel
 BuildRequires: pkgconfig
-BuildRequires: python-pygtk-devel >= 2:2.12.0
 BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.197
+BuildRequires: rpmbuild(macros) >= 1.592
 Requires(pre): utempter
+Obsoletes:     python-vte
+Obsoletes:     python-vte-devel
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -42,8 +43,8 @@ Summary:      Headers for VTE
 Summary(pl.UTF-8):     Pliki nagłówkowe VTE
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      glib2-devel >= 1:2.22.0
-Requires:      gtk+2-devel >= 2:2.14.0
+Requires:      glib2-devel >= 1:2.28.0
+Requires:      gtk+3-devel >= 3.0.0
 Requires:      ncurses-devel
 Conflicts:     gnome-libs-devel < 1.4.1.2
 
@@ -71,33 +72,6 @@ Static version of VTE libraries.
 %description static -l pl.UTF-8
 Statyczna wersja bibliotek VTE.
 
-%package -n python-vte
-Summary:       Python VTE module
-Summary(pl.UTF-8):     Moduł VTE dla pythona
-Group:         Libraries/Python
-%pyrequires_eq python-libs
-Requires:      %{name} = %{version}-%{release}
-Requires:      python-pygtk-gtk >= 2:2.12.0
-
-%description -n python-vte
-Python VTE library.
-
-%description -n python-vte -l pl.UTF-8
-Biblioteka VTE dla pythona.
-
-%package -n python-vte-devel
-Summary:       Development files for VTE Python bindings
-Summary(pl.UTF-8):     Pliki programistyczne wiązań Pythona do VTE
-Group:         Development/Languages/Python
-Requires:      %{name}-devel = %{version}-%{release}
-Requires:      python-vte = %{version}-%{release}
-
-%description -n python-vte-devel
-Development files for VTE Python bindings.
-
-%description -n python-vte-devel -l pl.UTF-8
-Pliki programistyczne wiązań Pythona do VTE.
-
 %package apidocs
 Summary:       VTE API documentation
 Summary(pl.UTF-8):     Dokumentacja API VTE
@@ -132,6 +106,8 @@ cd ..
 %configure \
        --disable-silent-rules \
        --enable-gtk-doc \
+       --with-gtk=3.0 \
+       --enable-introspection \
        --with-default-emulation=xterm \
        --with-html-dir=%{_gtkdocdir}
 %{__make}
@@ -142,9 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/gtk-2.0/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
-%find_lang %{name}-0.0
+%find_lang %{name}-2.90
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -152,41 +128,27 @@ rm -rf $RPM_BUILD_ROOT
 %post  -p /sbin/ldconfig
 %postun        -p /sbin/ldconfig
 
-%files -f vte-0.0.lang
+%files -f vte-2.90.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog MAINTAINERS NEWS README
-%attr(755,root,root) %{_bindir}/vte
-%attr(755,root,root) %{_libdir}/libvte.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libvte.so.9
-%dir %{_libdir}/vte-0.0
-%attr(755,root,root) %{_libdir}/vte-0.0/decset
-%attr(755,root,root) %{_libdir}/vte-0.0/interpret
-%attr(755,root,root) %{_libdir}/vte-0.0/osc
-%attr(755,root,root) %{_libdir}/vte-0.0/slowcat
-%attr(755,root,root) %{_libdir}/vte-0.0/window
+%attr(755,root,root) %{_bindir}/vte2_90
+%attr(755,root,root) %{_libdir}/libvte2_90.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libvte2_90.so.9
+%{_libdir}/girepository-1.0/Vte-2.90.typelib
 %attr(2755,root,utmp) %{_libdir}/gnome-pty-helper
 %{_datadir}/vte
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libvte.so
-%{_libdir}/libvte.la
-%{_includedir}/vte-0.0
-%{_pkgconfigdir}/vte.pc
+%attr(755,root,root) %{_libdir}/libvte2_90.so
+%{_includedir}/vte-2.90
+%{_pkgconfigdir}/vte-2.90.pc
+%{_datadir}/gir-1.0/Vte-2.90.gir
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libvte.a
+%{_libdir}/libvte2_90.a
 
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/vte-0.0
-
-%files -n python-vte
-%defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/gtk-2.0/vtemodule.so
-
-%files -n python-vte-devel
-%defattr(644,root,root,755)
-%{_datadir}/pygtk/2.0/defs/*.defs
-%{_pkgconfigdir}/pyvte.pc
+%{_gtkdocdir}/vte-2.90