Hello community, here is the log from the commit of package gnome-terminal checked in at Tue Jan 9 17:44:26 CET 2007. -------- --- GNOME/gnome-terminal/gnome-terminal.changes 2006-10-13 21:59:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-terminal/gnome-terminal.changes 2006-12-19 17:06:57.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Dec 19 17:06:32 CET 2006 - sbrabec@suse.cz + +- Spec file cleanup. + +------------------------------------------------------------------- +Fri Dec 15 10:13:15 CST 2006 - maw@suse.de + +- Move to /usr. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-terminal.spec ++++++ --- /var/tmp/diff_new_pack.B18350/_old 2007-01-09 17:44:22.000000000 +0100 +++ /var/tmp/diff_new_pack.B18350/_new 2007-01-09 17:44:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnome-terminal (Version 2.16.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,17 +11,14 @@ # norootforbuild Name: gnome-terminal -BuildRequires: gnome-doc-utils-devel gnutls-devel intltool kdelibs3-doc libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel mDNSResponder-devel perl-XML-Parser startup-notification-devel update-desktop-files vte-devel -%define prefix /opt/gnome -%define sysconfdir /etc%{prefix} -License: GPL, LGPL +BuildRequires: docbook_4 gnome-doc-utils-devel gnutls-devel intltool kdelibs3-doc libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel mDNSResponder-devel perl-XML-Parser scrollkeeper startup-notification-devel update-desktop-files vte-devel +License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/X11/Terminals -Autoreqprov: on Obsoletes: gnome-core Version: 2.16.1 -Release: 4 +Release: 35 Summary: The GNOME 2.x Desktop Terminal -Source: gnome-terminal-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.bz2 URL: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: filesystem gconf2 @@ -29,6 +26,9 @@ Patch2: gnome-terminal-force-terminal-draw.patch Patch4: gnome-terminal-desktop.patch Patch5: %{name}-uninited-vars.patch +Autoreqprov: on + +%gconf_schemas_prereq %description This package contains the GNOME 2.x Desktop Terminal program. It is @@ -37,59 +37,60 @@ %prep -%setup -n gnome-terminal-%{version} +%setup -q %patch1 -p1 %patch2 -p1 %patch4 -p1 %patch5 %build -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing " \ -./configure \ - --prefix=%prefix \ - --libdir=%prefix/%_lib \ - --sysconfdir=%sysconfdir \ - --datadir=%prefix/share \ - --localstatedir=/var/lib \ - --with-kde-datadir=/opt/kde3 \ - --enable-platform-gnome2 -make +autoreconf -f -i +# needed for gnome-terminal-2.16.1: +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +# FIXME: Build as root modifies system! +# gnome-panel-2.16.1: --disable-scrollkeeper does not work properly. +%configure\ + --disable-schemas-install\ + --disable-scrollkeeper +make %{?jobs:-j%jobs} %install -make -i install DESTDIR=$RPM_BUILD_ROOT -echo DocPath=gnome-terminal >> $RPM_BUILD_ROOT/opt/gnome/share/applications/gnome-terminal.desktop -for xml in $RPM_BUILD_ROOT%{prefix}/share/gnome/help/*/*/*.xml; do +make install DESTDIR=$RPM_BUILD_ROOT +echo DocPath=gnome-terminal >> $RPM_BUILD_ROOT/%{_datadir}/applications/gnome-terminal.desktop +for xml in $RPM_BUILD_ROOT%{_datadir}/gnome/help/*/*/*.xml; do if echo $xml | egrep 'share/gnome/help/([^/]*)/[^/]*/\1\.xml$' > /dev/null; then meinproc --check --cache `echo $xml | sed 's/xml$/cache.bz2/'` $xml || : fi done %suse_update_desktop_file -G "Command Line Terminal" %name TerminalEmulator %find_lang %{name} - -%post -export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source` -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/gnome-terminal.schemas >/dev/null +%find_gconf_schemas +cat %{name}.lang %{name}.schemas_list >%{name}.lst %clean rm -rf $RPM_BUILD_ROOT -%files -f %{name}.lang +%pre -f %{name}.schemas_pre + +%posttrans -f %{name}.schemas_posttrans + +%preun -f %{name}.schemas_preun + +%files -f %{name}.lst %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README -%{prefix}/share/applications/gnome-terminal.desktop -# %{prefix}/share/gnome/help/gnome-terminal -%{prefix}/%_lib/bonobo/servers/gnome-terminal.server -/etc/opt/gnome/gconf/schemas/gnome-terminal.schemas -%{prefix}/share/pixmaps/gnome-terminal.png -%dir %{prefix}/share/gnome-terminal -%dir %{prefix}/share/gnome-terminal/glade -%{prefix}/share/gnome-terminal/glade/gnome-terminal.glade2 -%{prefix}/bin/gnome-terminal -%dir %{prefix}/share/omf/gnome-terminal -%{prefix}/share/omf/gnome-terminal/* -#%{prefix}/share/application-registry/gnome-terminal.applications +%{_bindir}/gnome-terminal +%{_datadir}/applications/gnome-terminal.desktop +%{_datadir}/gnome-terminal +%{_datadir}/omf/gnome-terminal +%{_datadir}/pixmaps/gnome-terminal.png +%{_libdir}/bonobo/servers/gnome-terminal.server %changelog -n gnome-terminal +* Tue Dec 19 2006 - sbrabec@suse.cz +- Spec file cleanup. +* Fri Dec 15 2006 - maw@suse.de +- Move to /usr. * Fri Oct 13 2006 - danw@suse.de - Remove dead patch * Fri Oct 13 2006 - jhargadon@suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org