X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=vte.spec;h=d1513c9035b4bb70a64cf492813f9d1ba7bd2a28;hb=6f473ed;hp=457473975a78ac9f8f858897c1623872b880b2c7;hpb=94e980521d75fdb698046be064edd2ef6647655a;p=packages%2Fvte.git diff --git a/vte.spec b/vte.spec index 4574739..d1513c9 100644 --- a/vte.spec +++ b/vte.spec @@ -1,52 +1,53 @@ # # Conditional build: -%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.56.2 +Version: 0.60.1 Release: 1 -License: LGPL v2.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.56/%{name}-%{version}.tar.xz -# Source0-md5: 4bd4d5bd721cfa365f91f7f68a72e4da +Source0: http://ftp.gnome.org/pub/GNOME/sources/vte/0.60/%{name}-%{version}.tar.xz +# Source0-md5: d3071fb3cfc893c0577924b1a41634d9 Patch0: %{name}-wordsep.patch -Patch1: %{name}-pthread.patch -BuildRequires: autoconf >= 2.63 -BuildRequires: automake >= 1:1.9 +BuildRequires: cairo-gobject-devel BuildRequires: docbook-dtd412-xml +BuildRequires: fribidi-devel >= 1.0.0 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: gperf -BuildRequires: gtk+3-devel >= 3.8.0 -%{?with_gtk4:BuildRequires: gtk+4-devel >= 3.89} +BuildRequires: gtk+3-devel >= 3.20.0 +%{?with_gtk4:BuildRequires: gtk+4-devel >= 4.0.0} BuildRequires: gtk-doc >= 1.13 -BuildRequires: gtk-doc-automake >= 1.13 BuildRequires: intltool >= 0.40.0 -BuildRequires: libstdc++-devel >= 6:5.0 -BuildRequires: libtool >= 2:2.2 +BuildRequires: libicu-devel >= 4.8 +# C++17 support (-std=gnu++17, with constexpr lambdas support) +BuildRequires: libstdc++-devel >= 6:7.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: rpmbuild(macros) >= 1.736 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 Obsoletes: vte-common < 0.42.0 +Obsoletes: vte-glade < 0.58.0 # sr@Latn vs. sr@latin Conflicts: glibc-misc < 6:2.7 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -59,30 +60,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 @@ -92,35 +78,10 @@ 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 -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 +License: LGPL v3+ Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: vala >= 2:0.24 @@ -152,53 +113,19 @@ Dokumentacja API VTE (wersja dla GTK+ 3). %prep %setup -q %patch0 -p1 -%patch1 -p1 %build -%{__gtkdocize} -%{__glib_gettextize} -%{__intltoolize} -%{__libtoolize} -%{__aclocal} -%{__autoheader} -%{__automake} -%{__autoconf} -install -d build-gtk3 -cd build-gtk3 -../%configure \ - --disable-silent-rules \ - %{?with_glade:--enable-glade-catalogue} \ - --enable-gtk-doc \ - --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 +%meson build \ + -Ddocs=true \ + -Dgtk3=true \ + -Dgtk4=%{__true_false gtk4} + +%ninja_build -C build %install rm -rf $RPM_BUILD_ROOT -%if %{with gtk4} -%{__make} -C build-gtk4 install \ - DESTDIR=$RPM_BUILD_ROOT -%endif - -%{__make} -C build-gtk3 install \ - DESTDIR=$RPM_BUILD_ROOT - -%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la +%ninja_install -C build %find_lang %{name}-2.91 @@ -210,12 +137,16 @@ rm -rf $RPM_BUILD_ROOT %files -f vte-2.91.lang %defattr(644,root,root,755) -%doc AUTHORS ChangeLog NEWS +%doc AUTHORS NEWS 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 /usr/lib/systemd/user/vte-spawn-.scope.d +/usr/lib/systemd/user/vte-spawn-.scope.d/defaults.conf %files devel %defattr(644,root,root,755) @@ -224,20 +155,9 @@ 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 -%endif - %files -n vala-vte %defattr(644,root,root,755) +%{_datadir}/vala/vapi/vte-2.91.deps %{_datadir}/vala/vapi/vte-2.91.vapi %files apidocs