X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gnome-terminal.spec;h=4792a5191ff71285340d06d877c1469a805cb404;hb=7305aeab01f70f746e989ef83fa8ea9d03ac151b;hp=b873c663776faf74ec0a5ec9855ab9d4f8c4f0f6;hpb=bc98188306f688d761d35b479384cfea368e8090;p=packages%2Fgnome-terminal.git

diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index b873c66..4792a51 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -1,65 +1,64 @@
-#
-# This causes <prev-tab> 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
-#
 Summary:	GNOME Terminal
-Summary(pl):	Terminal dla GNOME
+Summary(pl.UTF-8):	Terminal dla GNOME
 Name:		gnome-terminal
-Version:	2.8.0
+Version:	2.28.2
 Release:	1
-License:	GPL
+License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/2.8/%{name}-%{version}.tar.bz2
-# Source0-md5:	93e59f24b35bd867653664565adb4672
-Patch0:		%{name}-TERM.patch
-Patch1:		%{name}-disable-prev_next-tab-sensitivity-changes.patch
-Patch2:		%{name}-desktop.patch
-Patch3:		%{name}-font_smoothing.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/2.28/%{name}-%{version}.tar.bz2
+# Source0-md5:	aa053ff38932cf032c70ab6522603053
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.8.0.1
-Buildrequires:	autoconf >= 2.53
-BuildRequires:	automake
-BuildRequires:	gtk+2-devel >= 2:2.4.0
-Buildrequires:	gnome-vfs2-devel >= 2.8.0
-BuildRequires:	intltool
-BuildRequires:	libglade2-devel >= 1:2.4.0
-BuildRequires:	libgnomeui-devel >= 2.8.0
+BuildRequires:	GConf2-devel >= 2.24.0
+BuildRequires:	autoconf >= 2.53
+BuildRequires:	automake >= 1:1.9
+BuildRequires:	dbus-glib-devel >= 0.74
+BuildRequires:	gettext-devel
+BuildRequires:	glib2-devel >= 1:2.16.0
+BuildRequires:	gnome-common >= 2.24.0
+BuildRequires:	gnome-doc-utils >= 0.14.0
+BuildRequires:	gtk+2-devel >= 2:2.14.0
+BuildRequires:	intltool >= 0.40.0
 BuildRequires:	libtool
-BuildRequires:	pkgconfig >= 0.12.0
-BuildRequires:	rpm-build >= 4.1-10
+BuildRequires:	libxml2-progs
+BuildRequires:	pkgconfig >= 1:0.12.0
+BuildRequires:	rpmbuild(find_lang) >= 1.23
+BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper
-BuildRequires:	startup-notification-devel >= 0.7
-BuildRequires:	vte-devel >= 0.11.11
-BuildRequires:	xft-devel >= 2.1-2
-Requires(post):	GConf2
-Requires(post):	scrollkeeper
-Requires:	libgnomeui >= 2.8.0
+BuildRequires:	startup-notification-devel >= 0.8
+BuildRequires:	vte-devel >= 0.22.0
+BuildRequires:	xorg-lib-libSM-devel
+Requires(post,postun):	scrollkeeper
+Requires(post,preun):	GConf2
+# workaround for https://bugzilla.gnome.org/show_bug.cgi?id=590774
+Requires:	libgnome
+#
+Requires:	startup-notification >= 0.8
 Requires:	terminfo
+Requires:	vte >= 0.22.0
+# sr@Latn vs. sr@latin
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 This is a terminal thing that isn't finished at all.
 
-%description -l pl
-To jest terminal, na razie ca³kowicie nie dokoñczony.
+%description -l pl.UTF-8
+To jest terminal, na razie całkowicie nie dokończony.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%if %{with disable_prev_next_tab_sensitivity_changes}
-%patch2 -p1
-%endif
-%patch3 -p0
 
 %build
+%{__intltoolize}
+%{__gnome_doc_common}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
-%configure
+%configure \
+	--disable-schemas-install \
+	--disable-scrollkeeper
 %{__make}
 
 %install
@@ -70,27 +69,27 @@ rm -rf $RPM_BUILD_ROOT
 	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
 	localedir=%{_localedir}
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+rm -rf $RPM_BUILD_ROOT%{_datadir}/application-registry
 
-%find_lang %{name} --with-gnome --all-name
+%find_lang %{name} --with-gnome --with-omf --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/usr/bin/scrollkeeper-update
-%gconf_schema_install
+%gconf_schema_install gnome-terminal.schemas
+%scrollkeeper_update_post
+
+%preun
+%gconf_schema_uninstall gnome-terminal.schemas
 
-%postun	-p /usr/bin/scrollkeeper-update
+%postun
+%scrollkeeper_update_postun
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README ChangeLog NEWS TODO AUTHORS
-%doc %{_omf_dest_dir}/%{name}
-%attr(755,root,root) %{_bindir}/*
-%{_sysconfdir}/gconf/schemas/*
+%doc AUTHORS ChangeLog NEWS README
+%attr(755,root,root) %{_bindir}/gnome-terminal
 %{_datadir}/%{name}
-%{_libdir}/bonobo/servers/*
-%{_desktopdir}/*
-%{_pixmapsdir}/*
-%{_datadir}/application-registry/*
+%{_desktopdir}/gnome-terminal.desktop
+%{_sysconfdir}/gconf/schemas/gnome-terminal.schemas