- removed obsolete zvt support

- use gconf_schema_install macro
- rel. 4

Changed files:
    gnome-terminal.spec -> 1.23

diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index b2d43da68e38ebd9ccac6d8b208e92cc8478e397..e1ba62c0d94e62bd65f8f5ef1868bc4a6501461c 100644 (file)
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -1,21 +1,18 @@
-# --with zvt   build with ZVT not VTE terminal widget
 Summary:       GNOME Terminal
 Summary(pl):   Terminal dla GNOME
 Name:          gnome-terminal
 Version:       2.1.2
-Release:       3
+Release:       4
 License:       GPL
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
 Patch0:                %{name}-TERM.patch
-#Patch1:               %{name}-pango-zvt.patch
 URL:           http://www.gnome.org/
 BuildRequires: GConf2-devel >= 1.2.1
 BuildRequires: gtk+2-devel >= 2.0.3
 BuildRequires: libglade2-devel >= 2.0.0
 BuildRequires: libgnomeui-devel >= 2.1.2
-%{?_with_zvt:BuildRequires:    libzvt-devel >= 2.0.0}
-%{?!_with_zvt:BuildRequires:   vte-devel >= 0.10.4}
+BuildRequires: vte-devel >= 0.10.4
 BuildRequires: pkgconfig >= 0.12.0
 BuildRequires: scrollkeeper
 BuildRequires: rpm-build >= 4.1-7
@@ -35,11 +32,10 @@ To jest terminal, na razie ca
 %prep
 %setup -q 
 %patch0 -p1
-#%patch1 -p1
 
 %build
 %configure \
-       --with-widget=%{?!_with_zvt:vte}%{?_with_zvt:zvt}
+       --with-widget=vte
 %{__make}
 
 %install
@@ -58,7 +54,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post 
 scrollkeeper-update
-GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" %{_bindir}/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas > /dev/null
+%gconf_schema_install
 
 %postun
 scrollkeeper-update
@@ -66,10 +62,10 @@ scrollkeeper-update
 %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/*
 %{_datadir}/%{name}
 %{_datadir}/applications/*
 %{_libdir}/bonobo/servers/*
 %{_datadir}/pixmaps/*
-%doc %{_omf_dest_dir}/%{name}