Hello community,
here is the log from the commit of package gnome-panel
checked in at Mon Jan 8 17:42:48 CET 2007.
--------
--- GNOME/gnome-panel/gnome-panel.changes 2006-12-28 19:41:36.000000000 +0100
+++ /mounts/work_src_done/STABLE/gnome-panel/gnome-panel.changes 2007-01-08 10:29:00.000000000 +0100
@@ -1,0 +2,11 @@
+Mon Jan 8 10:28:50 CET 2007 - sbrabec@suse.cz
+
+- More spec file cleanups.
+
+-------------------------------------------------------------------
+Mon Jan 8 10:28:38 CET 2007 - maw@suse.de
+
+- Move to /usr
+- Some specfile cleanup.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-panel.spec ++++++
--- /var/tmp/diff_new_pack.B19328/_old 2007-01-08 17:42:02.000000000 +0100
+++ /var/tmp/diff_new_pack.B19328/_new 2007-01-08 17:42:02.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gnome-panel (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,22 +11,20 @@
# norootforbuild
Name: gnome-panel
-BuildRequires: evolution-data-server-devel gnome-common gnome-desktop-devel gnome-doc-utils-devel gnome-menus-devel gnome-patch-translation gtkdoc intltool kdelibs3-doc libidl libwnck-devel mDNSResponder-devel perl-XML-Parser scrollkeeper
-%define prefix /opt/gnome
-%define sysconfdir /etc%{prefix}
+BuildRequires: evolution-data-server-devel gnome-common gnome-desktop-devel gnome-doc-utils-devel gnome-icon-theme gnome-menus-devel gnome-patch-translation gtk-doc intltool kdelibs3-doc libidl libwnck-devel mDNSResponder-devel perl-XML-Parser scrollkeeper
License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: System/GUI/GNOME
-Autoreqprov: on
Version: 2.16.1
-Release: 37
+Release: 41
Summary: The GNOME 2.x Desktop Panel
-Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.16/gnome-panel-%{version}.tar.bz2
+Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.16/%{name}-%{version}.tar.bz2
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-PreReq: filesystem /usr/bin/touch gconf2
-Requires: control-center2 gnome-themes
+Requires: gnome-themes gnome-icon-theme
%if %suse_version > 1000
-Recommends: gnome-main-menu
+Recommends: gnome-main-menu control-center2
+%else
+Requires: control-center2
%endif
Patch3: gnome-panel-layout.patch
Patch5: gnome-panel-big-icons.patch
@@ -57,6 +55,9 @@
Patch55: gnome-panel-202076-root-launchers.patch
Patch56: gnome-panel-recently-used-apps.patch
Obsoletes: gnome-core gnome-panel-nld
+Autoreqprov: on
+
+%gconf_schemas_prereq
%description
This package contains the GNOME 2.x Desktop Panel. The panel is an
@@ -94,16 +95,16 @@
Lennart Poettering
Wanda The Fish
-%package devel
-Summary: Include Files and Libraries mandatory for Development.
+%package extras
+Summary: Extra panel applets
Group: System/GUI/GNOME
-Autoreqprov: on
-Requires: %{name} = %{version} gtk2-devel libgnomeui-devel libbonoboui-devel libglade2-devel
-Obsoletes: gnome-panel-nld-devel
+Requires: %{name} = %{version} fortune
+Obsoletes: gnome-panel-nld-extras
-%description devel
-This package contains all necessary include files and libraries needed
-to develop applications that require these.
+%gconf_schemas_prereq
+
+%description extras
+This package contains extra panel applets such as Wanda the fish.
@@ -136,15 +137,16 @@
Lennart Poettering
Wanda The Fish
-%package doc
-Summary: Additional Package Documentation.
+%package devel
+Summary: Include Files and Libraries mandatory for Development.
Group: System/GUI/GNOME
-Requires: %{name} = %{version}
-Obsoletes: gnome-panel-nld-doc
+Autoreqprov: on
+Requires: %{name} = %{version} gtk2-devel libgnomeui-devel libbonoboui-devel libglade2-devel
+Obsoletes: gnome-panel-nld-devel
-%description doc
-This package contains optional documentation provided in addition to
-this package's base documentation.
+%description devel
+This package contains all necessary include files and libraries needed
+to develop applications that require these.
@@ -177,14 +179,15 @@
Lennart Poettering
Wanda The Fish
-%package extras
-Summary: Extra panel applets
+%package doc
+Summary: Additional Package Documentation.
Group: System/GUI/GNOME
-Requires: %{name} = %{version} fortune
-Obsoletes: gnome-panel-nld-extras
+Requires: %{name} = %{version}
+Obsoletes: gnome-panel-nld-doc
-%description extras
-This package contains extra panel applets such as Wanda the fish.
+%description doc
+This package contains optional documentation provided in addition to
+this package's base documentation.
@@ -258,122 +261,145 @@
gnome-patch-translation-update
%build
-%{?suse_update_config:%{suse_update_config -f}}
-autoreconf -f -i
-CFLAGS="$RPM_OPT_FLAGS -I/opt/gnome/include -fno-strict-aliasing " \
- ./configure \
- --prefix=%prefix \
- --libdir=%prefix/%_lib \
- --sysconfdir=%sysconfdir \
- --libexecdir=%{prefix}/lib/gnome-applets \
- --mandir=%prefix/share/man \
- --localstatedir=/var/%_lib \
- --with-kde-datadir=/opt/kde3/share \
- --disable-scrollkeeper \
- --enable-platform-gnome2 \
- --with-in-process-applets=all
-#pushd po; make %{name}*.pot; make update-po; popd
-make
+ACLOCAL="aclocal -I m4" autoreconf -f -i
+# needed for gnome-panel-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\
+ --libexecdir=%{_prefix}/lib/gnome-panel\
+ --with-in-process-applets=all\
+ --disable-schemas-install\
+ --disable-scrollkeeper
+make %{?jobs:-j%jobs}
%install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make -i install DESTDIR=$RPM_BUILD_ROOT
-#remove the stuff we don't want
-rm -rf $RPM_BUILD_ROOT/var/%_lib/scrollkeeper
-rm -rf $RPM_BUILD_ROOT%{prefix}/%{_lib}/gnome-panel/lib*.*a
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-gzip -9nf $RPM_BUILD_ROOT%{prefix}/share/man/man?/*.?
-for xml in $RPM_BUILD_ROOT%{prefix}/share/gnome/help/*/*/*.xml; do
+make install DESTDIR=$RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/gnome-panel
+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
-%find_lang gnome-panel-2.0
+%find_lang %{name}-2.0
+%find_lang clock %{name}-2.0.lang
+%find_lang fish %{name}-2.0.lang
+%find_lang fish-applet-2 %{name}-2.0.lang
+%find_lang window-list %{name}-2.0.lang
+%find_lang workspace-switcher %{name}-2.0.lang
+
+%def_gconf_schemas %{name}
+
+%add_gconf_schemas clock
+
+%add_gconf_schemas panel-compatibility
+
+%add_gconf_schemas panel-general
+
+%add_gconf_schemas panel-global
+
+%add_gconf_schemas panel-object
+
+%add_gconf_schemas panel-toplevel
+
+%add_gconf_schemas window-list
+
+%add_gconf_schemas workspace-switcher
+
+%def_gconf_schemas %{name}-extras
+
+%add_gconf_schemas fish
+
+%end_gconf_schemas
+# NOTE: GCONF_CONFIG_SOURCE is already set by %%posttrans code.
+sed -i /GCONF_CONFIG_SOURCE/d %{name}.schemas_posttrans
+cat %{name}-2.0.lang %{name}.schemas_list >%{name}.lst
+rm $RPM_BUILD_ROOT%{_libdir}/*/*.*a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%pre -f %{name}.schemas_pre
%post
%run_ldconfig
-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/clock.schemas >/dev/null
-opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/panel-compatibility.schemas >/dev/null
-opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/panel-general.schemas >/dev/null
-opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/panel-global.schemas >/dev/null
-opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/panel-object.schemas >/dev/null
-opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/panel-toplevel.schemas >/dev/null
-opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/window-list.schemas >/dev/null
-opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/workspace-switcher.schemas >/dev/null
-opt/gnome/bin/gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load etc/opt/gnome/gconf/schemas/panel-default-setup.entries
-%post extras
-%run_ldconfig
-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/fish.schemas >/dev/null
+%posttrans -f %{name}.schemas_posttrans
+export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
+usr/bin/gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load etc/gconf/schemas/panel-default-setup.entries >/dev/null
+
+%preun -f %{name}.schemas_preun
+# Remove extra keys from panel-default-setup.entries.
+# If it is an update, %%posttrans will install new schemas.
+rm -rf etc/gconf/gconf.xml.schemas/apps/panel/default_setup
%postun
%run_ldconfig
-%postun extras
-%run_ldconfig
+%pre extras -f %{name}-extras.schemas_pre
-%clean
-rm -rf $RPM_BUILD_ROOT
+%posttrans extras -f %{name}-extras.schemas_posttrans
-%files -f %files -f gnome-panel-2.0.lang
+%preun extras -f %{name}-extras.schemas_preun
+
+%files -f %{name}.lst
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README
%defattr (-, root, root)
-%{prefix}/bin/*
-%{prefix}/%{_lib}/libpanel*.so.*
-%{prefix}/%{_lib}/bonobo/servers/GNOME_ClockApplet_Factory.server
-%{prefix}/%{_lib}/bonobo/servers/GNOME_NotificationAreaApplet.server
-%{prefix}/%{_lib}/bonobo/servers/GNOME_Panel.server
-%{prefix}/%{_lib}/bonobo/servers/GNOME_Wncklet_Factory.server
-%{prefix}/%{_lib}/%{name}
-%{prefix}/%{_lib}/%{name}/libclock-applet.*
-%{prefix}/%{_lib}/%{name}/libnotification-area-applet.*
-%{prefix}/%{_lib}/%{name}/libwnck-applet.*
-%{prefix}/share/gnome/help/*
-%{prefix}/share/gnome/panel
-%{prefix}/share/gnome-panelrc
-%{prefix}/share/idl/*
-%{prefix}/share/omf/*
-%{prefix}/share/icons/*
-%{sysconfdir}/gconf/schemas/clock.schemas
-%{sysconfdir}/gconf/schemas/panel-compatibility.schemas
-%{sysconfdir}/gconf/schemas/panel-default-setup.entries
-%{sysconfdir}/gconf/schemas/panel-general.schemas
-%{sysconfdir}/gconf/schemas/panel-global.schemas
-%{sysconfdir}/gconf/schemas/panel-object.schemas
-%{sysconfdir}/gconf/schemas/panel-toplevel.schemas
-%{sysconfdir}/gconf/schemas/window-list.schemas
-%{sysconfdir}/gconf/schemas/workspace-switcher.schemas
-%doc %{prefix}/share/man/man*/*
-%{prefix}/share/gnome-2.0/ui/GNOME_ClockApplet.xml
-%{prefix}/share/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml
-%{prefix}/share/gnome-2.0/ui/GNOME_Panel_Popup.xml
-%{prefix}/share/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml
-%{prefix}/share/gnome-2.0/ui/GNOME_WindowListApplet.xml
-%{prefix}/share/gnome-2.0/ui/GNOME_WindowMenuApplet.xml
-%{prefix}/share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml
+%{_bindir}/*
+%{_datadir}/gnome/panel
+%{_datadir}/gnome-panelrc
+%{_datadir}/gnome-2.0/ui/GNOME_ClockApplet.xml
+%{_datadir}/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml
+%{_datadir}/gnome-2.0/ui/GNOME_Panel_Popup.xml
+%{_datadir}/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml
+%{_datadir}/gnome-2.0/ui/GNOME_WindowListApplet.xml
+%{_datadir}/gnome-2.0/ui/GNOME_WindowMenuApplet.xml
+%{_datadir}/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml
+%{_datadir}/icons/*/*/*/*.png
+%{_datadir}/icons/*/*/*/*.svg
+%{_datadir}/idl/*
+%{_datadir}/omf/*
+%{_libdir}/*.so.*
+%{_libdir}/bonobo/servers/GNOME_ClockApplet_Factory.server
+%{_libdir}/bonobo/servers/GNOME_NotificationAreaApplet.server
+%{_libdir}/bonobo/servers/GNOME_Panel.server
+%{_libdir}/bonobo/servers/GNOME_Wncklet_Factory.server
+# generic directory for in-process applets
+%dir %{_libdir}/gnome-panel
+%if "%{_libdir}" != "%{_prefix}/lib"
+# generic directory for normal applets
+%dir %{_prefix}/lib/gnome-panel
+%endif
+%{_libdir}/gnome-panel/libclock-applet.so
+%{_libdir}/gnome-panel/libnotification-area-applet.so
+%{_libdir}/gnome-panel/libwnck-applet.so
+%doc %{_mandir}/man?/*.*
+%config %{_sysconfdir}/gconf/schemas/panel-default-setup.entries
-%files devel
+%files extras -f %{name}-extras.schemas_list
%defattr (-, root, root)
-%{prefix}/%_lib/pkgconfig/*.pc
-%{prefix}/%{_lib}/libpanel-applet-2.so
-%{prefix}/include/panel-2.0
-%{prefix}/%{_lib}/libpanel-applet-2.*a
+%{_datadir}/gnome-2.0/ui/GNOME_FishApplet.xml
+%{_libdir}/gnome-panel/libfish-applet-2.so
+%{_libdir}/bonobo/servers/GNOME_FishApplet_Factory.server
-%files doc
+%files devel
%defattr (-, root, root)
-%{prefix}/share/gtk-doc/html/*
+%{_includedir}/panel-2.0
+%{_libdir}/*.so
+%{_libdir}/*.*a
+%{_libdir}/pkgconfig/*.pc
-%files extras
+%files doc
%defattr (-, root, root)
-%{prefix}/%{_lib}/%{name}/libfish-applet-2.*
-%{sysconfdir}/gconf/schemas/fish.schemas
-%{prefix}/%{_lib}/bonobo/servers/GNOME_FishApplet_Factory.server
-%{prefix}/share/gnome-2.0/ui/GNOME_FishApplet.xml
+%{_datadir}/gtk-doc/html/*
%changelog -n gnome-panel
+* Mon Jan 08 2007 - sbrabec@suse.cz
+- More spec file cleanups.
+* Mon Jan 08 2007 - maw@suse.de
+- Move to /usr
+- Some specfile cleanup.
* Thu Dec 28 2006 - jhargadon@suse.de
- cleaned up the libtool files in the specfile (#223683)
* Tue Nov 28 2006 - sbrabec@suse.cz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org