rpms/Terminal/EL-5 Terminal-0.2.12-alwaysshowtabs.patch, NONE, 1.1 sources, 1.6, 1.7 Terminal.spec, 1.17, 1.18

[Kevin Fenzi]

Author: kevin

Update of /cvs/pkgs/rpms/Terminal/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29605

Modified Files:
	sources Terminal.spec 
Added Files:
	Terminal-0.2.12-alwaysshowtabs.patch 
Log Message:
Initial version for EL-5


Terminal-0.2.12-alwaysshowtabs.patch:
 terminal-window.c |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

--- NEW FILE Terminal-0.2.12-alwaysshowtabs.patch ---
--- terminal.orig/terminal-window.c	2009/06/27 19:21:52	30083
+++ terminal/terminal-window.c	2009/06/27 19:22:23	30084
@@ -914,18 +914,21 @@
   /* change the visibility if the new status differs */
   if (((npages > 1) != tabs_shown) || (always_show_tabs && !tabs_shown))
     {
+      /* show or hide the tabs */
+      gtk_notebook_set_show_tabs (GTK_NOTEBOOK (window->notebook), 
+                                 always_show_tabs | !tabs_shown);
+
+      /* don't focus the notebook */
+      GTK_WIDGET_UNSET_FLAGS (window->notebook, GTK_CAN_FOCUS);
+
       /* get active screen */
       active = terminal_window_get_active (window);
+      if (G_UNLIKELY (active == NULL))
+        return;
 
       /* get screen grid size */
       terminal_screen_get_size (active, &grid_width, &grid_height);
 
-      /* show or hide the tabs */
-      gtk_notebook_set_show_tabs (GTK_NOTEBOOK (window->notebook), !tabs_shown);
-
-      /* don't focus the notebook */
-      GTK_WIDGET_UNSET_FLAGS (window->notebook, GTK_CAN_FOCUS);
-
       /* resize the window */
       terminal_screen_force_resize_window (active, GTK_WINDOW (window), grid_width, grid_height);
     }


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Terminal/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	27 Jan 2007 21:11:39 -0000	1.6
+++ sources	26 Jul 2010 16:56:08 -0000	1.7
@@ -1 +1 @@
-ed091c02e002e2402e3203a2ab2f7c9a  Terminal-0.2.6.tar.bz2
+adb419d279c9fc16d02291c052190717  Terminal-0.2.12.tar.bz2


Index: Terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Terminal/EL-5/Terminal.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- Terminal.spec	15 Aug 2007 00:00:03 -0000	1.17
+++ Terminal.spec	26 Jul 2010 16:56:08 -0000	1.18
@@ -1,17 +1,17 @@
 Summary: X Terminal Emulator
 Name: Terminal
-Version: 0.2.6
+Version: 0.2.12
 Release: 3%{?dist}
 License: GPLv2+
-URL: http://terminal.os-cillation.com/
-Source0: http://www.xfce.org/archive/xfce-4.4.0/src/Terminal-0.2.6.tar.bz2
-Patch1: CVE-2007-3770.patch
-Group: User Interface/X
+URL: http://www.xfce.org/projects/terminal/
+Source0: http://www.xfce.org/archive/xfce-4.6.1/src/Terminal-%{version}.tar.bz2
+Patch0: Terminal-0.2.12-alwaysshowtabs.patch
+Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: vte-devel
-BuildRequires: exo-devel >= 0.3.2
+BuildRequires: exo-devel >= 0.3.4
 BuildRequires: libSM-devel
-BuildRequires: gettext
+BuildRequires: gettext intltool
 BuildRequires: startup-notification-devel
 BuildRequires: dbus-glib-devel
 
@@ -22,7 +22,7 @@ it unique among X terminal emulators. 
 
 %prep
 %setup -q
-%patch1 -p1 -b .cve-2007-3770
+%patch0 -p0
 
 %build
 %configure
@@ -37,12 +37,16 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -55,13 +59,38 @@ touch --no-create %{_datadir}/icons/hico
 %{_datadir}/icons/hicolor/scalable/apps/Terminal.svg
 %{_datadir}/icons/hicolor/*/stock/navigation/*.png
 %{_datadir}/pixmaps/terminal.xpm
-%{_datadir}/Terminal/Terminal-toolbars.ui
-%{_datadir}/Terminal/Terminal.ui
 %{_datadir}/applications/Terminal.desktop
 %{_mandir}/man1/Terminal.1.gz
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Mon Apr 29 2009 Kevin Fenzi <kevin at tummy.com> - 0.2.12-3
+- Fix patch fuzz
+
+* Sun Apr 28 2009 Kevin Fenzi <kevin at tummy.com> - 0.2.12-2
+- Add patch for MiscAlwaysShowTabs segfault (fixes bug 502135)
+
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 0.2.12-1
+- Update to 0.2.12
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.8.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Oct 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.8.3-1
+- Update to 0.2.8.3
+- BuildRequire intltool
+- Fix rpm group
+
+* Sun Feb 10 2008 Kevin Fenzi <kevin at tummy.com> - 0.2.8-3
+- Rebuild for gcc43
+
+* Mon Dec  3 2007 Kevin Fenzi <kevin at tummy.com> - 0.2.8-2
+- Remove no longer shipped .ui file. 
+
+* Sun Dec  2 2007 Kevin Fenzi <kevin at tummy.com> - 0.2.8-1
+- Update to 0.2.8
+- Drop unneeded patch. 
+
 * Tue Aug 14 2007 Kevin Fenzi <kevin at tummy.com> - 0.2.6-3
 - Add patch for CVE-2007-3770. 
 - Update License tag