X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=vte.spec;h=371e79cf5120551b6182322174f1b5942fa51ed5;hb=26218dfca596cbd06befa94998ff472ec5d13d81;hp=376cdc3625d3df948cf96d9c8515596d241f0d0d;hpb=8cd2778fe612a0d05e1412fcbf716860cc916159;p=packages%2Fvte.git

diff --git a/vte.spec b/vte.spec
index 376cdc3..371e79c 100644
--- a/vte.spec
+++ b/vte.spec
@@ -1,111 +1,159 @@
 #
 # Conditional build:
-%bcond_with	glx	# drawing using GLX
-#
+%bcond_without	glade	# Glade catalog
+%bcond_with	gtk4	# GTK+ 4 based library [doesn't build with 3.90]
+
 Summary:	VTE terminal widget library
 Summary(pl.UTF-8):	Biblioteka z kontrolką terminala VTE
 Name:		vte
-Version:	0.17.4
-Release:	2
-License:	LGPL v2+
+Version:	0.54.2
+Release:	1
+License:	LGPL v2.1+
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/vte/0.17/%{name}-%{version}.tar.bz2
-# Source0-md5:	ec6cb2668db7146eae7cfc48af98f3ed
-# http://bugzilla.gnome.org/show_bug.cgi?id=552096
-Patch0:		%{name}-link.patch
-%{?with_glx:BuildRequires:	OpenGL-GLU-devel}
-%{?with_glx:BuildRequires:	OpenGL-GLX-devel}
-BuildRequires:	autoconf >= 2.59-9
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/vte/0.54/%{name}-%{version}.tar.xz
+# Source0-md5:	054a8a46b9de9078f81931311cf27a68
+Patch0:		%{name}-wordsep.patch
+BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.9
+BuildRequires:	docbook-dtd412-xml
+BuildRequires:	gdk-pixbuf2-devel
 BuildRequires:	gettext-devel
-BuildRequires:	gtk+2-devel >= 2:2.14.0
-BuildRequires:	gtk-doc >= 1.8
-BuildRequires:	gtk-doc-automake
+%{?with_glade:BuildRequires:	glade-devel >= 3}
+BuildRequires:	glib2-devel >= 1:2.40.0
+BuildRequires:	gnutls-devel >= 3.2.7
+BuildRequires:	gobject-introspection-devel >= 0.10.0
+BuildRequires:	gperf
+BuildRequires:	gtk+3-devel >= 3.8.0
+%{?with_gtk4:BuildRequires:	gtk+4-devel >= 3.89}
+BuildRequires:	gtk-doc >= 1.13
+BuildRequires:	gtk-doc-automake >= 1.13
 BuildRequires:	intltool >= 0.40.0
-BuildRequires:	libtool
+BuildRequires:	libstdc++-devel >= 6:4.7
+BuildRequires:	libtool >= 2:2.2
+BuildRequires:	libxml2-progs >= 2
 BuildRequires:	ncurses-devel
+BuildRequires:	pango-devel >= 1:1.22.0
+BuildRequires:	pcre2-8-devel >= 10.21
 BuildRequires:	pkgconfig
-BuildRequires:	python-pygtk-devel >= 2:2.12.0
-BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.197
-Requires(pre):	utempter
+BuildRequires:	rpmbuild(macros) >= 1.592
+BuildRequires:	tar >= 1:1.22
+# for test application
+#BuildRequires:	vala >= 2:0.24
+BuildRequires:	xz
+BuildRequires:	zlib-devel
+Requires:	glib2 >= 1:2.40.0
+Requires:	gnutls >= 3.2.7
+Requires:	gtk+3 >= 3.8.0
+Requires:	pango >= 1:1.22.0
+Obsoletes:	vte-common < 0.42.0
 # sr@Latn vs. sr@latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-The vte package contains a terminal widget for GTK+. It's used by
+The vte package contains a terminal widget for GTK+ 3.x. It's used by
 gnome-terminal among other programs.
 
 %description -l pl.UTF-8
-Ten pakiet zawiera kontrolkę terminala dla GTK+. Jest używany przez
-gnome-terminal oraz inne programy.
+Ten pakiet zawiera kontrolkę terminala dla GTK+ 3.x. Jest używany
+przez gnome-terminal oraz inne programy.
+
+%package common
+Summary:	Common files for vte and vte0
+Summary(pl.UTF-8):	Pliki wspólne dla vte i vte0
+Group:		X11/Libraries
+Requires(pre):	utempter
+
+%description common
+Common files for GTK+ 3 based vte and GTK+ 2 based vte0.
+
+%description common -l pl.UTF-8
+Pliki wspólne dla vte opartego na GTK+ 3 oraz vte0 opartego na GTK+ 2.
 
 %package devel
-Summary:	Headers for VTE
-Summary(pl.UTF-8):	Pliki nagłówkowe VTE
+Summary:	Header files for VTE for GTK+ 3
+Summary(pl.UTF-8):	Pliki nagłówkowe VTE dla GTK+ 3
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-%{?with_glx:Requires:	OpenGL-GLU-devel}
-Requires:	gtk+2-devel >= 2:2.14.0
+Requires:	glib2-devel >= 1:2.40.0
+Requires:	gnutls-devel >= 3.2.7
+Requires:	gtk+3-devel >= 3.8.0
 Requires:	ncurses-devel
+Requires:	pango-devel >= 1:1.22.0
+Requires:	pcre2-8-devel >= 10.21
+Requires:	zlib-devel
 Conflicts:	gnome-libs-devel < 1.4.1.2
 
 %description devel
-The vte package contains a terminal widget for GTK+. It's used by
-gnome-terminal among other programs.
-
-You should install the vte-devel package if you would like to compile
-applications that use the vte terminal widget. You do not need to
-install vte-devel if you just want to use precompiled applications.
+This package contains header files for GTK+ 3 based vte library.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe potrzebne do kompilowania programów używających vte.
+Pliki nagłówkowe potrzebne do kompilowania programów używających
+biblioteki vte opartej na GTK+ 3.
 
 %package static
-Summary:	Static VTE library
-Summary(pl.UTF-8):	Statyczna biblioteka VTE
+Summary:	Static VTE library for GTK+ 3
+Summary(pl.UTF-8):	Statyczna biblioteka VTE dla GTK+ 3
 Group:		X11/Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 Conflicts:	gnome-libs-static < 1.4.1.2
 
 %description static
-Static version of VTE libraries.
+Static version of VTE library for GTK+ 3.
 
 %description static -l pl.UTF-8
-Statyczna wersja bibliotek VTE.
+Statyczna wersja biblioteki VTE dla GTK+ 3.
 
-%package -n python-vte
-Summary:	Python VTE module
-Summary(pl.UTF-8):	Moduł VTE dla pythona
-Group:		Libraries
-%pyrequires_eq	python-libs
-Requires:	%{name} = %{version}-%{release}
-Requires:	python-pygtk-gtk >= 2:2.12.0
+%package glade
+Summary:	VTE catalog file for Glade
+Summary(pl.UTF-8):	Plik katalogu VTE dla Glade
+Group:		X11/Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	glade >= 3
+
+%description glade
+VTE catalog file for Glade.
+
+%description glade -l pl.UTF-8
+Plik katalogu VTE dla Glade.
+
+%package -n vala-vte
+Summary:	Vala API for VTE library
+Summary(pl.UTF-8):	API języka Vala dla biblioteki VTE
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	vala >= 2:0.24
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
-%description -n python-vte
-Python VTE library.
+%description -n vala-vte
+Vala API for VTE library.
 
-%description -n python-vte -l pl.UTF-8
-Biblioteka VTE dla pythona.
+%description -n vala-vte -l pl.UTF-8
+API języka Vala dla biblioteki VTE.
 
 %package apidocs
-Summary:	VTE API documentation
-Summary(pl.UTF-8):	Dokumentacja API VTE
+Summary:	VTE API documentation (GTK+ 3 version)
+Summary(pl.UTF-8):	Dokumentacja API VTE (wersja dla GTK+ 3)
 Group:		Documentation
 Requires:	gtk-doc-common
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description apidocs
-VTE API documentation.
+VTE API documentation (GTK+ 3 version).
 
 %description apidocs -l pl.UTF-8
-Dokumentacja API VTE.
+Dokumentacja API VTE (wersja dla GTK+ 3).
 
 %prep
 %setup -q
 %patch0 -p1
 
 %build
+%{__gtkdocize}
 %{__glib_gettextize}
 %{__intltoolize}
 %{__libtoolize}
@@ -113,32 +161,44 @@ Dokumentacja API VTE.
 %{__autoheader}
 %{__automake}
 %{__autoconf}
-cd gnome-pty-helper
-%{__libtoolize}
-%{__aclocal}
-%{__autoheader}
-%{__automake}
-%{__autoconf}
-cd ..
-%configure \
+install -d build-gtk3
+cd build-gtk3
+../%configure \
+	--disable-silent-rules \
+	%{?with_glade:--enable-glade-catalogue} \
 	--enable-gtk-doc \
-	--with-default-emulation=xterm \
-	%{?with_glx:--with-glX} \
-	--with-html-dir=%{_gtkdocdir} \
-	--with-pangox \
-	--with-xft2
+	--enable-introspection \
+	--with-html-dir=%{_gtkdocdir}
+%{__make}
+cd ..
 
+%if %{with gtk4}
+install -d build-gtk4
+cd build-gtk4
+# note: "3.902468" is a result of configure.ac bug (unquoted brackets)
+../%configure \
+	--disable-silent-rules \
+	--enable-gtk-doc \
+	--enable-introspection \
+	--with-gtk=3.902468 \
+	--with-html-dir=%{_gtkdocdir}
 %{__make}
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%if %{with gtk4}
+%{__make} -C build-gtk4 install \
+	DESTDIR=$RPM_BUILD_ROOT
+%endif
+
+%{__make} -C build-gtk3 install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/gtk-2.0/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
-%find_lang %{name}
+%find_lang %{name}-2.91
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -146,32 +206,38 @@ rm -rf $RPM_BUILD_ROOT
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
-%files -f vte.lang
+%files -f vte-2.91.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
-%attr(755,root,root) %{_libdir}/vte/*
-%attr(2755,root,utmp) %{_libdir}/gnome-pty-helper
-%{_datadir}/vte
+%doc AUTHORS ChangeLog NEWS
+%attr(755,root,root) %{_bindir}/vte-2.91
+%attr(755,root,root) %{_libdir}/libvte-2.91.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libvte-2.91.so.0
+%{_libdir}/girepository-1.0/Vte-2.91.typelib
+%config(noreplace) %verify(not md5 mtime size) /etc/profile.d/vte.sh
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libvte.so
-%{_libdir}/libvte.la
-%{_includedir}/vte
-%{_pkgconfigdir}/vte.pc
+%attr(755,root,root) %{_libdir}/libvte-2.91.so
+%{_includedir}/vte-2.91
+%{_pkgconfigdir}/vte-2.91.pc
+%{_datadir}/gir-1.0/Vte-2.91.gir
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libvte.a
+%{_libdir}/libvte-2.91.a
 
-%files apidocs
+%if %{with glade}
+%files glade
+%defattr(644,root,root,755)
+%{_datadir}/glade/catalogs/vte-2.91.xml
+%{_datadir}/glade/pixmaps/hicolor/16x16/actions/widget-vte-terminal.png
+%{_datadir}/glade/pixmaps/hicolor/22x22/actions/widget-vte-terminal.png
+%endif
+
+%files -n vala-vte
 %defattr(644,root,root,755)
-%{_gtkdocdir}/vte
+%{_datadir}/vala/vapi/vte-2.91.vapi
 
-%files -n python-vte
+%files apidocs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/gtk-2.0/vtemodule.so
+%{_gtkdocdir}/vte-2.91