X-Git-Url: http://git.pld-linux.org/?p=packages%2Fvte.git;a=blobdiff_plain;f=vte.spec;h=8e8ae385777d57c2a7fad492c35bd0a8a8cdccb2;hp=749ee1e3a6ffacb2ed77f5026b91adb2ca85a04e;hb=2f64a3b;hpb=36add1638efed7227865c24aa38998fbc7e51b6d diff --git a/vte.spec b/vte.spec index 749ee1e..8e8ae38 100644 --- a/vte.spec +++ b/vte.spec @@ -1,49 +1,60 @@ # # Conditional build: +%bcond_without apidocs # API documentation %bcond_without glade # Glade catalog +%bcond_with gtk4 # GTK+ 4 based library [not supported yet in 0.66.0] Summary: VTE terminal widget library Summary(pl.UTF-8): Biblioteka z kontrolką terminala VTE Name: vte -Version: 0.48.1 -Release: 3 -License: LGPL v2.1+ +Version: 0.66.0 +Release: 1 +# some files have LGPL v2.1+ signature, but some LGPL v3+ +License: LGPL v3+ (library), GPL v3+ (app) Group: X11/Libraries -Source0: http://ftp.gnome.org/pub/GNOME/sources/vte/0.48/%{name}-%{version}.tar.xz -# Source0-md5: de6dcb6af34ffe18763d17da3900fb20 +Source0: https://download.gnome.org/sources/vte/0.66/%{name}-%{version}.tar.xz +# Source0-md5: b06eb2592012e5689ddf44faf6d5df4a Patch0: %{name}-wordsep.patch -BuildRequires: autoconf >= 2.63 -BuildRequires: automake >= 1:1.9 +URL: https://wiki.gnome.org/Apps/Terminal/VTE +BuildRequires: cairo-gobject-devel BuildRequires: docbook-dtd412-xml +BuildRequires: fribidi-devel >= 1.0.0 +# C11 +BuildRequires: gcc >= 6:4.7 +BuildRequires: gdk-pixbuf2-devel BuildRequires: gettext-devel -%{?with_glade:BuildRequires: glade-devel >= 3} -BuildRequires: glib2-devel >= 1:2.40.0 +BuildRequires: glib2-devel >= 1:2.52.0 BuildRequires: gnutls-devel >= 3.2.7 BuildRequires: gobject-introspection-devel >= 0.10.0 -BuildRequires: gtk+3-devel >= 3.8.0 -BuildRequires: gtk-doc >= 1.13 -BuildRequires: gtk-doc-automake >= 1.13 +BuildRequires: gperf +BuildRequires: gtk+3-devel >= 3.20.0 +%{?with_gtk4:BuildRequires: gtk4-devel >= 4.0.1} +%{?with_apidocs:BuildRequires: gtk-doc >= 1.13} BuildRequires: intltool >= 0.40.0 -BuildRequires: libstdc++-devel >= 6:4.7 -BuildRequires: libtool >= 2:2.2 +BuildRequires: libicu-devel >= 4.8 +# C++20 support (-std=gnu++2a) +BuildRequires: libstdc++-devel >= 6:8.0 BuildRequires: libxml2-progs >= 2 -BuildRequires: ncurses-devel +BuildRequires: meson >= 0.50.0 +BuildRequires: ninja >= 1.5 BuildRequires: pango-devel >= 1:1.22.0 BuildRequires: pcre2-8-devel >= 10.21 BuildRequires: pkgconfig -BuildRequires: rpmbuild(macros) >= 1.592 +BuildRequires: rpm-build >= 4.6 +BuildRequires: rpmbuild(macros) >= 1.752 +BuildRequires: systemd-devel >= 1:220 BuildRequires: tar >= 1:1.22 -# for test application -#BuildRequires: vala >= 2:0.24 +BuildRequires: vala >= 2:0.24 BuildRequires: xz BuildRequires: zlib-devel -Requires: glib2 >= 1:2.40.0 +Requires: fribidi >= 1.0.0 +Requires: glib2 >= 1:2.52.0 Requires: gnutls >= 3.2.7 -Requires: gtk+3 >= 3.8.0 +Requires: gtk+3 >= 3.20.0 +Requires: libicu >= 4.8 Requires: pango >= 1:1.22.0 +Requires: systemd-libs >= 1:220 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 @@ -54,30 +65,15 @@ gnome-terminal among other programs. 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: Header files for VTE for GTK+ 3 Summary(pl.UTF-8): Pliki nagłówkowe VTE dla GTK+ 3 +License: LGPL v3+ Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: glib2-devel >= 1:2.40.0 -Requires: gnutls-devel >= 3.2.7 -Requires: gtk+3-devel >= 3.8.0 -Requires: ncurses-devel +Requires: glib2-devel >= 1:2.52.0 +Requires: gtk+3-devel >= 3.20.0 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 @@ -87,19 +83,6 @@ This package contains header files for GTK+ 3 based vte library. Pliki nagłówkowe potrzebne do kompilowania programów używających biblioteki vte opartej na GTK+ 3. -%package static -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 library for GTK+ 3. - -%description static -l pl.UTF-8 -Statyczna wersja biblioteki VTE dla GTK+ 3. - %package glade Summary: VTE catalog file for Glade Summary(pl.UTF-8): Plik katalogu VTE dla Glade @@ -116,12 +99,11 @@ 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 +License: LGPL v3+ Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: vala >= 2:0.24 -%if "%{_rpmversion}" >= "5" BuildArch: noarch -%endif %description -n vala-vte Vala API for VTE library. @@ -134,9 +116,7 @@ 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 (GTK+ 3 version). @@ -148,30 +128,25 @@ Dokumentacja API VTE (wersja dla GTK+ 3). %setup -q %patch0 -p1 +# it seems 8.0 with -std=gnu++2a is sufficient for 0.66.x (-std=gnu++20 option was added in 10.0) +%{__sed} -i -e '/cxx_req_std/ s/gnu++20/gnu++2a/; /gxx_req_version/ s/10\.0/8.0/' meson.build + +# adjust for PLD %{_gtkdocdir} +%{__sed} -i -e '/HTML_DIR/ s,/gtk-doc/,/doc/gtk-doc/,' doc/reference/Makefile.docs + %build -%{__gtkdocize} -%{__glib_gettextize} -%{__intltoolize} -%{__libtoolize} -%{__aclocal} -%{__autoheader} -%{__automake} -%{__autoconf} -%configure \ - --disable-silent-rules \ - %{?with_glade:--enable-glade-catalogue} \ - --enable-gtk-doc \ - --enable-introspection \ - --with-html-dir=%{_gtkdocdir} -%{__make} +%meson build \ + %{?with_apidocs:-Ddocs=true} \ + %{!?with_glade:-Dglade=false} \ + -Dgtk3=true \ + -Dgtk4=%{__true_false gtk4} + +%ninja_build -C build %install rm -rf $RPM_BUILD_ROOT -%{__make} install \ - DESTDIR=$RPM_BUILD_ROOT - -%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la +%ninja_install -C build %find_lang %{name}-2.91 @@ -183,12 +158,16 @@ rm -rf $RPM_BUILD_ROOT %files -f vte-2.91.lang %defattr(644,root,root,755) -%doc AUTHORS ChangeLog NEWS README +%doc AUTHORS ChangeLog README.md %attr(755,root,root) %{_bindir}/vte-2.91 +%attr(755,root,root) %{_libexecdir}/vte-urlencode-cwd %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.csh %config(noreplace) %verify(not md5 mtime size) /etc/profile.d/vte.sh +%dir %{systemduserunitdir}/vte-spawn-.scope.d +%{systemduserunitdir}/vte-spawn-.scope.d/defaults.conf %files devel %defattr(644,root,root,755) @@ -197,22 +176,20 @@ rm -rf $RPM_BUILD_ROOT %{_pkgconfigdir}/vte-2.91.pc %{_datadir}/gir-1.0/Vte-2.91.gir -%files static -%defattr(644,root,root,755) -%{_libdir}/libvte-2.91.a - %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 +%{_datadir}/glade/pixmaps/hicolor/*x*/actions/widget-vte-terminal.png %endif %files -n vala-vte %defattr(644,root,root,755) +%{_datadir}/vala/vapi/vte-2.91.deps %{_datadir}/vala/vapi/vte-2.91.vapi +%if %{with apidocs} %files apidocs %defattr(644,root,root,755) -%{_gtkdocdir}/vte-2.91 +%{_gtkdocdir}/vte-gtk3-2.91 +%endif