- updated server file location

- release 2

Changed files:
    gnome-terminal.spec -> 1.20

diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index e66c1ed83c86a6d2a166b38a20a78344e79c29c3..244ece276013270acbb6fc870e69fd8522ee0002 100644 (file)
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -3,7 +3,7 @@ Summary:        GNOME Terminal
 Summary(pl):   Terminal dla GNOME
 Name:          gnome-terminal
 Version:       2.1.2
 Summary(pl):   Terminal dla GNOME
 Name:          gnome-terminal
 Version:       2.1.2

-Release:       1
+Release:       2

 License:       GPL
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
 License:       GPL
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.bz2


@@ -18,12 +18,14 @@ BuildRequires:      libgnomeui-devel >= 2.1.2
 %{?!_with_zvt:BuildRequires:   vte-devel >= 0.10.4}
 BuildRequires: pkgconfig >= 0.12.0
 BuildRequires: scrollkeeper
 %{?!_with_zvt:BuildRequires:   vte-devel >= 0.10.4}
 BuildRequires: pkgconfig >= 0.12.0
 BuildRequires: scrollkeeper

+BuildRequires: rpm-build >= 4.1-7

 Requires:      libgnomeui >= 2.1.2
 Requires(post,postun): scrollkeeper
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
 %define                _sysconfdir     /etc/X11/GNOME2
 Requires:      libgnomeui >= 2.1.2
 Requires(post,postun): scrollkeeper
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
 %define                _sysconfdir     /etc/X11/GNOME2

+%define                _serverdir      /usr/lib/bonobo/servers

 
 %description
 This is a terminal thing that isn't finished at all.
 
 %description
 This is a terminal thing that isn't finished at all.


@@ -48,7 +50,8 @@ install -d $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        omf_dest_dir=%{_omf_dest_dir}/%{name} \
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        omf_dest_dir=%{_omf_dest_dir}/%{name} \

-       GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+       GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
+       serverdir=%{_serverdir}

 
 %find_lang %{name} --with-gnome --all-name
 
 
 %find_lang %{name} --with-gnome --all-name
 


@@ -69,6 +72,6 @@ scrollkeeper-update
 %{_sysconfdir}/gconf/schemas/*
 %{_datadir}/%{name}
 %{_datadir}/applications/*
 %{_sysconfdir}/gconf/schemas/*
 %{_datadir}/%{name}
 %{_datadir}/applications/*

-%{_libdir}/bonobo/servers/*
+%{_serverdir}/*

 %{_datadir}/pixmaps/*
 %doc %{_omf_dest_dir}/%{name}
 %{_datadir}/pixmaps/*
 %doc %{_omf_dest_dir}/%{name}