From 98a016efe7630bc6bf1f490384da0a1e1c77f1f1 Mon Sep 17 00:00:00 2001 From: Patryk Zawadzki Date: Wed, 12 Mar 2008 11:51:01 +0000 Subject: [PATCH] - 2.22.0 - merged from DEVEL Changed files: gnome-terminal.spec -> 1.94 --- gnome-terminal.spec | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/gnome-terminal.spec b/gnome-terminal.spec index 0499bea..5414025 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -1,7 +1,7 @@ # # Conditional build: -# This causes key do nothing on the first tab (instead of -# passing the keypress to the application running in the terminal). Ditto +# This causes key do nothing on the first tab (instead of +# 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 @@ -14,28 +14,29 @@ Summary: GNOME Terminal Summary(pl.UTF-8): Terminal dla GNOME Name: gnome-terminal -Version: 2.18.4 +Version: 2.22.0 Release: 1 -License: GPL +License: GPL v2+ Group: X11/Applications -Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/2.18/%{name}-%{version}.tar.bz2 -# Source0-md5: e4429d66d0d2ede8e14756cfbc15d30a +Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/2.22/%{name}-%{version}.tar.bz2 +# Source0-md5: e91f000b8157c668940a297d7cfbc9f8 Patch0: %{name}-TERM.patch Patch1: %{name}-disable-prev_next-tab-sensitivity-changes.patch Patch2: %{name}-desktop.patch -Patch3: %{name}-save-session-crash.patch Patch4: %{name}-url-regex.patch URL: http://www.gnome.org/ -BuildRequires: GConf2-devel >= 2.20.0 +BuildRequires: GConf2-devel >= 2.22.0 BuildRequires: autoconf >= 2.53 -BuildRequires: automake -BuildRequires: gtk+2-devel >= 2:2.12.0 +BuildRequires: automake >= 1:1.9 +BuildRequires: gettext-devel +BuildRequires: glib2-devel >= 1:2.16.0 BuildRequires: gnome-common >= 2.20.0 BuildRequires: gnome-doc-utils >= 0.12.0 -BuildRequires: gnome-vfs2-devel >= 2.20.0 +BuildRequires: gnome-vfs2-devel >= 2.22.0 +BuildRequires: gtk+2-devel >= 2:2.12.0 BuildRequires: intltool >= 0.36.2 BuildRequires: libglade2-devel >= 1:2.6.2 -BuildRequires: libgnomeui-devel >= 2.20.0 +BuildRequires: libgnomeui-devel >= 2.22.0 BuildRequires: libtool BuildRequires: pkgconfig >= 1:0.12.0 BuildRequires: rpmbuild(find_lang) >= 1.23 @@ -43,13 +44,13 @@ BuildRequires: rpmbuild(macros) >= 1.197 BuildRequires: scrollkeeper BuildRequires: sed >= 4.0 BuildRequires: startup-notification-devel >= 0.8 -BuildRequires: vte-devel >= 0.16.9 -Requires(post,preun): GConf2 +BuildRequires: vte-devel >= 0.16.13 Requires(post,postun): scrollkeeper +Requires(post,preun): GConf2 Requires: libgnomeui >= 2.20.0 Requires: startup-notification >= 0.8 -Requires: vte >= 0.16.9 Requires: terminfo +Requires: vte >= 0.16.13 # sr@Latn vs. sr@latin Conflicts: glibc-misc < 6:2.7 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -69,13 +70,12 @@ To jest terminal, na razie całkowicie nie dokończony. %patch1 -p1 %endif %patch2 -p1 -%patch3 -p1 %if %{with classify_square_brackets_into_url_paths} %patch4 -p1 %endif -sed -i -e 's#sr\@Latn#sr\@latin#' po/LINGUAS -mv po/sr\@{Latn,latin}.po +sed -i -e 's#sr@Latn#sr@latin#' po/LINGUAS +mv po/sr@{Latn,latin}.po %build %{__intltoolize} @@ -83,6 +83,7 @@ mv po/sr\@{Latn,latin}.po %{__libtoolize} %{__aclocal} %{__autoconf} +%{__autoheader} %{__automake} %configure \ --disable-schemas-install \ @@ -117,9 +118,9 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README -%attr(755,root,root) %{_bindir}/* -%{_libdir}/bonobo/servers/* +%attr(755,root,root) %{_bindir}/gnome-terminal +%{_libdir}/bonobo/servers/gnome-terminal.server %{_datadir}/%{name} -%{_desktopdir}/*.desktop -%{_pixmapsdir}/* +%{_desktopdir}/gnome-terminal.desktop +%{_pixmapsdir}/gnome-terminal.png %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas -- 2.43.0