SPECS (AC-branch): gnome-terminal.spec - merged from HEAD

[baggins]

Author: baggins                      Date: Mon May 15 16:57:42 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   gnome-terminal.spec (1.72 -> 1.72.4.1) 

---- Diffs:

================================================================
Index: SPECS/gnome-terminal.spec
diff -u SPECS/gnome-terminal.spec:1.72 SPECS/gnome-terminal.spec:1.72.4.1
--- SPECS/gnome-terminal.spec:1.72	Tue Sep  6 20:27:59 2005
+++ SPECS/gnome-terminal.spec	Mon May 15 18:57:37 2006
@@ -4,16 +4,19 @@
 # passing the keypress to the application running in the terminal). Ditto 
 # for the last tab. This is kinda annoying.
 %bcond_with	disable_prev_next_tab_sensitivity_changes
+# This is specific to PLD and causes an "unknown term type" on most other
+# hosts I have to work on (the rest of the world uses xterm for g-t)
+%bcond_with	term_voodoo
 #
 Summary:	GNOME Terminal
 Summary(pl):	Terminal dla GNOME
 Name:		gnome-terminal
-Version:	2.12.0
+Version:	2.14.1
 Release:	1
 License:	GPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-terminal/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5:	483c9397dd165845e2528a80e3df6dfc
+Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-terminal/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5:	7abe60db5359c88392d2b4f0d5587ef5
 Patch0:		%{name}-TERM.patch
 Patch1:		%{name}-disable-prev_next-tab-sensitivity-changes.patch
 Patch2:		%{name}-desktop.patch
@@ -49,13 +52,16 @@
 
 %prep
 %setup -q
+%if %{with term_voodoo}
 %patch0 -p1
+%endif
 %if %{with disable_prev_next_tab_sensitivity_changes}
 %patch1 -p1
 %endif
 %patch2 -p1
 
 %build
+%{__intltoolize}
 %{__gnome_doc_common}
 %{__libtoolize}
 %{__aclocal}
@@ -92,14 +98,14 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README ChangeLog NEWS TODO AUTHORS
+%doc AUTHORS ChangeLog NEWS README
 %doc %{_omf_dest_dir}/%{name}
 %attr(755,root,root) %{_bindir}/*
-%{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
-%{_datadir}/%{name}
 %{_libdir}/bonobo/servers/*
+%{_datadir}/%{name}
 %{_desktopdir}/*
 %{_pixmapsdir}/*
+%{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -107,6 +113,35 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.72.4.1  2006/05/15 16:57:37  baggins
+- merged from HEAD
+
+Revision 1.74  2006/04/10 16:29:15  freetz
+- 2.14.1
+
+Revision 1.73  2006/04/02 08:17:14  freetz
+- merged from DEVEL
+
+Revision 1.72.2.6  2006/03/13 08:04:26  freetz
+- 2.14.0
+
+Revision 1.72.2.5  2006/03/04 19:03:24  freetz
+- 2.13.93
+
+Revision 1.72.2.4  2006/03/04 12:12:54  freetz
+- 2.13.92
+
+Revision 1.72.2.3  2006/02/17 12:26:35  freetz
+- 2.13.91
+
+Revision 1.72.2.2  2006/01/31 14:22:50  patrys
+- disable TERM voodoo magic by default (PLD-specific and breaks
+  compatibility with other hosts, did not make it upstream for
+  several years now so no longer try to fix the whole world)
+
+Revision 1.72.2.1  2006/01/30 22:43:31  freetz
+- 2.13.90
+
 Revision 1.72  2005/09/06 18:27:59  freetz
 - merged from DEVEL and updated to 2.12.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-terminal.spec?r1=1.72&r2=1.72.4.1&f=u