commit 1429ac3cf8a5dd5a7c56810b889efabbbebee045
Author: Jan Rękorajski <[email protected]>
Date: Thu Nov 20 20:47:58 2014 +0100
- rename to vte2.90
rename-pty-helper.patch | 112 +++++++++++++++++++++++++++++++++++++++++++++++
vte.spec => vte2.90.spec | 20 +++++----
2 files changed, 124 insertions(+), 8 deletions(-)
---
diff --git a/vte.spec b/vte2.90.spec
similarity index 92%
rename from vte.spec
rename to vte2.90.spec
index 90a4a44..a023418 100644
--- a/vte.spec
+++ b/vte2.90.spec
@@ -1,15 +1,16 @@
Summary: VTE terminal widget library
Summary(pl.UTF-8): Biblioteka z kontrolką terminala VTE
-Name: vte
+Name: vte2.90
Version: 0.36.3
Release: 1
License: LGPL v2+
Group: X11/Libraries
-Source0:
http://ftp.gnome.org/pub/GNOME/sources/vte/0.36/%{name}-%{version}.tar.xz
+Source0:
http://ftp.gnome.org/pub/GNOME/sources/vte/0.36/vte-%{version}.tar.xz
# Source0-md5: 3f9df4c9a67b09bf5c660bf5c3bae109
# https://bugzilla.gnome.org/show_bug.cgi?id=663779
-Patch0: %{name}-alt-meta.patch
-Patch1: %{name}-am.patch
+Patch0: vte-alt-meta.patch
+Patch1: vte-am.patch
+Patch2: rename-pty-helper.patch
BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1:1.9
BuildRequires: docbook-dtd412-xml
@@ -99,9 +100,10 @@ VTE API documentation (GTK+ 3 version).
Dokumentacja API VTE (wersja dla GTK+ 3).
%prep
-%setup -q
+%setup -q -n vte-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%{__gtkdocize}
@@ -133,9 +135,11 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+%{__mv} $RPM_BUILD_ROOT/etc/profile.d/vte{,2.90}.sh
+
%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-%find_lang %{name}-2.90
+%find_lang vte-2.90
%clean
rm -rf $RPM_BUILD_ROOT
@@ -149,12 +153,12 @@ rm -rf $RPM_BUILD_ROOT
%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
-%config(noreplace) %verify(not md5 mtime size) /etc/profile.d/vte.sh
+%config(noreplace) %verify(not md5 mtime size) /etc/profile.d/vte2.90.sh
%files common
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog MAINTAINERS NEWS README
-%attr(2755,root,utmp) %{_libdir}/gnome-pty-helper
+%attr(2755,root,utmp) %{_libdir}/vte2.90-pty-helper
%files devel
%defattr(644,root,root,755)
diff --git a/rename-pty-helper.patch b/rename-pty-helper.patch
new file mode 100644
index 0000000..6493bc8
--- /dev/null
+++ b/rename-pty-helper.patch
@@ -0,0 +1,112 @@
+--- vte-0.36.3/gnome-pty-helper/Makefile.am~ 2014-04-07 09:37:29.000000000
+0200
++++ vte-0.36.3/gnome-pty-helper/Makefile.am 2014-11-20 20:41:56.171948850
+0100
+@@ -1,18 +1,18 @@
+-libexec_PROGRAMS = gnome-pty-helper
++libexec_PROGRAMS = vte2.90-pty-helper
+
+-gnome_pty_helper_SOURCES = \
++vte2_90_pty_helper_SOURCES = \
+ gnome-pty.h \
+ gnome-login-support.c \
+ gnome-login-support.h \
+ gnome-pty-helper.c \
+ gnome-utmp.c
+
+-gnome_pty_helper_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
+-gnome_pty_helper_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
++vte2_90_pty_helper_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
++vte2_90_pty_helper_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
+
+ install-exec-hook:
+- chown root.utmp $(DESTDIR)$(libexecdir)/gnome-pty-helper || true
+- chmod g+s $(DESTDIR)$(libexecdir)/gnome-pty-helper || true
++ chown root.utmp $(DESTDIR)$(libexecdir)/vte2.90-pty-helper || true
++ chmod g+s $(DESTDIR)$(libexecdir)/vte2.90-pty-helper || true
+
+ MAINTAINERCLEANFILES = \
+ $(srcdir)/INSTALL \
+--- vte-0.36.3/src/pty.c~ 2014-06-23 19:26:54.000000000 +0200
++++ vte-0.36.3/src/pty.c 2014-11-20 20:43:22.788612462 +0100
+@@ -1249,7 +1249,7 @@
+ }
+ if (_vte_pty_helper_pid == 0) {
+ /* Child. Close descriptors. No need to close all,
+- * gnome-pty-helper does that anyway. */
++ * vte2.90-pty-helper does that anyway. */
+ for (i = 0; i < 3; i++) {
+ close(i);
+ }
+@@ -1259,8 +1259,8 @@
+ close(tunnel);
+ close(_vte_pty_helper_tunnel);
+ /* Exec our helper. */
+- execl(LIBEXECDIR "/gnome-pty-helper",
+- "gnome-pty-helper", NULL);
++ execl(LIBEXECDIR "/vte2.90-pty-helper",
++ "vte2.90-pty-helper", NULL);
+ /* Bail. */
+ _exit(1);
+ }
+@@ -1275,7 +1275,7 @@
+
+ g_set_error(error, VTE_PTY_ERROR,
+ VTE_PTY_ERROR_PTY_HELPER_FAILED,
+- "Failed to start gnome-pty-helper: %s",
++ "Failed to start vte2.90-pty-helper: %s",
+ g_strerror (errsv));
+
+ if (tmp[0] != -1)
+@@ -1363,7 +1363,7 @@
+ &ops, sizeof(ops)) != sizeof(ops)) {
+ g_set_error (error, VTE_PTY_ERROR,
+ VTE_PTY_ERROR_PTY_HELPER_FAILED,
+- "Failed to send request to gnome-pty-helper:
%s",
++ "Failed to send request to vte2.90-pty-helper:
%s",
+ g_strerror(errno));
+ return FALSE;
+ }
+@@ -1373,7 +1373,7 @@
+ &ret, sizeof(ret)) != sizeof(ret)) {
+ g_set_error (error, VTE_PTY_ERROR,
+ VTE_PTY_ERROR_PTY_HELPER_FAILED,
+- "Failed to read response from gnome-pty-helper:
%s",
++ "Failed to read response from
vte2.90-pty-helper: %s",
+ g_strerror(errno));
+ return FALSE;
+ }
+@@ -1382,7 +1382,7 @@
+ if (ret == 0) {
+ g_set_error_literal (error, VTE_PTY_ERROR,
+ VTE_PTY_ERROR_PTY_HELPER_FAILED,
+- "gnome-pty-helper failed to open pty");
++ "vte2.90-pty-helper failed to open
pty");
+ return FALSE;
+ }
+ _vte_debug_print(VTE_DEBUG_PTY, "Helper returns success.\n");
+@@ -1391,7 +1391,7 @@
+ &tag, sizeof(tag)) != sizeof(tag)) {
+ g_set_error (error, VTE_PTY_ERROR,
+ VTE_PTY_ERROR_PTY_HELPER_FAILED,
+- "Failed to read tag from gnome-pty-helper: %s",
++ "Failed to read tag from vte2.90-pty-helper:
%s",
+ g_strerror(errno));
+ return FALSE;
+ }
+@@ -1408,7 +1408,7 @@
+
+ g_set_error (error, VTE_PTY_ERROR,
+ VTE_PTY_ERROR_PTY_HELPER_FAILED,
+- "Failed to read master or slave pty from
gnome-pty-helper: %s",
++ "Failed to read master or slave pty from
vte2.90-pty-helper: %s",
+ g_strerror(errsv));
+ errno = errsv;
+ return FALSE;
+@@ -1579,7 +1579,7 @@
+ "_vte_pty_open_with_helper failed: %s\n",
+ err->message);
+
+- /* Only do fallback if gnome-pty-helper failed! */
++ /* Only do fallback if vte2.90-pty-helper failed! */
+ if ((priv->flags & VTE_PTY_NO_FALLBACK) ||
+ !g_error_matches(err,
+ VTE_PTY_ERROR,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vte2.90.git/commitdiff/ce17915f87f3fd80fa5c2d4b7fa35c9791e7973b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
