Hello community,
here is the log from the commit of package gnome-applets
checked in at Wed Jan 10 17:41:49 CET 2007.
--------
--- GNOME/gnome-applets/gnome-applets.changes 2006-12-22 13:39:02.000000000 +0100
+++ /mounts/work_src_done/STABLE/gnome-applets/gnome-applets.changes 2007-01-09 13:12:34.000000000 +0100
@@ -1,0 +2,12 @@
+Tue Jan 9 13:11:57 CET 2007 - sbrabec@suse.cz
+
+- Prefix changed to /usr.
+- Spec file cleanup.
+
+-------------------------------------------------------------------
+Fri Jan 5 12:38:20 CET 2007 - sbrabec@suse.cz
+
+- Explicitly require dbus to build correctly for all products.
+- Build with apmd in older products.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-applets.spec ++++++
--- /var/tmp/diff_new_pack.De5978/_old 2007-01-10 17:40:26.000000000 +0100
+++ /var/tmp/diff_new_pack.De5978/_new 2007-01-10 17:40:26.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gnome-applets (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,20 +11,27 @@
# norootforbuild
Name: gnome-applets
-BuildRequires: docbook-toys gail-devel gnome-common gnome-desktop-devel gnome-doc-utils-devel gnome-icon-theme gnome-panel-devel gnome-patch-translation gnutls-devel gstreamer010-plugins-base-devel gucharmap-devel intltool kdelibs3-doc libgtop-devel libnotify-devel libwnck-devel libxklavier-devel mDNSResponder-devel perl-XML-Parser powersave scrollkeeper
-%define prefix /opt/gnome
-%define sysconfdir /etc%{prefix}
+BuildRequires: docbook-toys docbook_4 gail-devel gnome-common gnome-desktop-devel gnome-doc-utils-devel gnome-icon-theme-devel gnome-panel-devel gnome-patch-translation gstreamer010-plugins-base-devel gucharmap-devel intltool kdelibs3-doc libgtop-devel libnotify-devel libwnck-devel libxklavier-devel powersave python-gnome-devel python-gnome-extras scrollkeeper
+%if %suse_version > 1010
+BuildRequires: dbus-1-glib-devel
+%else
+BuildRequires: dbus-1-devel dbus-1-glib
+%endif
+%if %suse_version <= 1020
+%ifarch %ix86
+BuildRequires: apmd
+%endif
+%endif
License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: System/GUI/GNOME
Provides: gnome-applets2 gswitchit
Obsoletes: gnome-applets2 gswitchit
-Requires: libgnomesu yast2 notification-daemon
+Requires: libgnomesu yast2 notification-daemon python-gnome python-gnome-extras
%ifnarch s390 s390x
Requires: gnome-media
%endif
-Autoreqprov: on
Version: 2.16.1
-Release: 38
+Release: 43
Summary: A Collection of Useful Programs for the GNOME 2.x Desktop Panel
Source: %{name}-%{version}.tar.bz2
Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2
@@ -38,7 +45,9 @@
Patch28: gnome-applets-216201-kbd-indicator-crash.patch
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-PreReq: filesystem /usr/bin/touch gconf2
+Autoreqprov: on
+
+%gconf_schemas_prereq
%description
This package is part of the basic GNOME 2.x Desktop packages. It
@@ -78,8 +87,7 @@
Summary: A Collection of Useful Programs for the GNOME 2.x Desktop Panel
Group: System/GUI/GNOME
Autoreqprov: on
-Requires: %name = %version
-Requires: gtk2-devel gnome-vfs2-devel
+Requires: %{name} = %{version} gtk2-devel gnome-vfs2-devel gnome-panel-devel libgtop-devel
Obsoletes: gswitchit-devel
Provides: gswitchit-devel
@@ -118,7 +126,7 @@
John Kodis
%prep
-%setup
+%setup -q
gnome-patch-translation-prepare
# Unpack it after gnome-patch-translation-prepare:
tar -jxf %{S:1}
@@ -134,127 +142,105 @@
%build
autoreconf -f -i
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC" \
- ./configure \
- --prefix=%prefix \
- --libdir=%prefix/%_lib \
- --sysconfdir=%sysconfdir \
- --libexecdir=%{prefix}/lib/gnome-applets \
- --datadir=%prefix/share \
- --localstatedir=/var/lib \
- --enable-mini-commander \
- --with-kde-datadir=/opt/kde3/share \
+# needed for gnome-applets-2.16.1:
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+# FIXME: Build as root modifies system!
+# gnome-applets-2.16.1: --disable-scrollkeeper does not work properly.
+# FIXME: */*.xml: parser error : Entity 'mdash' not defined
+%configure\
+ --libexecdir=%{_prefix}/lib/gnome-panel\
+ --disable-schemas-install\
+ --disable-scrollkeeper\
%if %suse_version > 900
%ifnarch s390 s390x
- --enable-powersave \
+ --enable-powersave\
%endif
%endif
- --enable-platform-gnome2 \
- --disable-scrollkeeper
-make %{?jobs:-j %jobs}
+ --enable-mini-commander
+make %{?jobs:-j%jobs}
%install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make 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/var/%_lib/scrollkeeper
-rm -rf $RPM_BUILD_ROOT%{prefix}/%{_lib}/*.*a
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-%find_lang %{name}-2.0
-for xml in $RPM_BUILD_ROOT%{prefix}/share/gnome/help/*/*/*.xml; do
+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
-chmod 755 $RPM_BUILD_ROOT/%{prefix}/bin/cpufreq-selector
+# FIXME: cpufreq-selector needs helper:
+# https://bugzilla.novell.com/show_bug.cgi?id=233147
+chmod 755 $RPM_BUILD_ROOT/%{_bindir}/cpufreq-selector
+#%if %suse_version <= 1020
+#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/permissions.d
+#cat >$RPM_BUILD_ROOT%{_sysconfdir}/permissions.d/%{name}.easy <$RPM_BUILD_ROOT%{_sysconfdir}/permissions.d/%{name}.secure <$RPM_BUILD_ROOT%{_sysconfdir}/permissions.d/%{name}.paranoid <%{name}.lst
%clean
rm -rf $RPM_BUILD_ROOT
+%pre -f %{name}.schemas_pre
+
%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/drivemount.schemas >/dev/null
-opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/battstat.schemas >/dev/null
-opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/charpick.schemas >/dev/null
-opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/geyes.schemas >/dev/null
-opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/gswitchit.schemas >/dev/null
-opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/gweather.schemas >/dev/null
-#opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/mini-commander.schemas >/dev/null
-#opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/mini-commander-global.schemas >/dev/null
-opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/mixer.schemas >/dev/null
-opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/modemlights.schemas >/dev/null
-opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/multiload.schemas >/dev/null
-#opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/stickynotes.schemas >/dev/null
-touch var/adm/SuSEconfig/run-scrollkeeper-update
+%run_ldconfig
+#%%run_permissions
+#%%verifyscript
+#%%verify_permissions -e %{_bindir}/cpufreq-selector
+
+%posttrans -f %{name}.schemas_posttrans
+
+%preun -f %{name}.schemas_preun
%postun
-touch var/adm/SuSEconfig/run-scrollkeeper-update
+%run_ldconfig
-%files -f %files -f %{name}-2.0.lang
+%files -f %{name}.lst
%defattr (-, root, root)
%doc AUTHORS COPYING ChangeLog NEWS README
-%{prefix}/bin/*
-%{prefix}/share/omf/*
-%{prefix}/share/gnome-2.0/ui/*
-%{prefix}/%{_lib}/bonobo/servers/*.server
-%dir %{prefix}/lib/gnome-applets
-%{prefix}/lib/gnome-applets/*
-%{sysconfdir}/gconf/schemas/drivemount.schemas
-%{sysconfdir}/gconf/schemas/battstat.schemas
-%{sysconfdir}/gconf/schemas/cpufreq-applet.schemas
-%{sysconfdir}/gconf/schemas/charpick.schemas
-%{sysconfdir}/gconf/schemas/geyes.schemas
-%{sysconfdir}/gconf/schemas/gswitchit.schemas
-%{sysconfdir}/gconf/schemas/gweather.schemas
-%{sysconfdir}/gconf/schemas/mixer.schemas
-%{sysconfdir}/gconf/schemas/modemlights.schemas
-%{sysconfdir}/gconf/schemas/multiload.schemas
-%{sysconfdir}/gconf/schemas/stickynotes.schemas
-%{sysconfdir}/gconf/schemas/mini-commander-global.schemas
-%{sysconfdir}/gconf/schemas/mini-commander.schemas
-%{sysconfdir}/sound/events/*.soundlist
-%{prefix}/share/pixmaps/*
-%{prefix}/share/gnome/help/*
-%dir %{prefix}/share/gnome-applets
-%{prefix}/share/gnome-applets/geyes
-%{prefix}/share/gnome-applets/gweather
-%{prefix}/share/gnome-applets/glade
-%{prefix}/share/icons/hicolor/*/apps/gnome-cpu-frequency-applet.png
-%{prefix}/share/icons/hicolor/*/apps/gnome-eyes-applet.png
-%{prefix}/share/icons/hicolor/*/apps/gnome-sticky-notes-applet.png
-%{prefix}/share/icons/hicolor/*/apps/ax-applet.png
-%{prefix}/share/icons/hicolor/*/apps/charpick.png
-%{prefix}/share/icons/hicolor/*/apps/gnome-modem.png
-%{prefix}/share/icons/hicolor/*/apps/gswitchit-applet.png
-%{prefix}/share/icons/hicolor/*/apps/gswitchit-properties-capplet.png
-%{prefix}/share/icons/hicolor/*/apps/gnome-cpu-frequency-applet.svg
-%{prefix}/share/icons/hicolor/*/apps/gnome-eyes-applet.svg
-%{prefix}/share/icons/hicolor/*/apps/gnome-sticky-notes-applet.svg
-%{prefix}/share/icons/hicolor/*/apps/gnome-mini-commander.png
-%{prefix}/share/xmodmap
-%{prefix}/%{_lib}/libgweather.so
-%{prefix}/%{_lib}/*.so.*
-#%{prefix}/%{_lib}/libmixer_applet2.so
-%{prefix}/%{_lib}/libmultiload-applet-2.so
-%{prefix}/share/applications/gswitchit-plugins.desktop
-%dir %{prefix}/share/locale/es_CL
-%dir %{prefix}/share/locale/es_CL/LC_MESSAGES
-%dir %{prefix}/share/locale/es_EC
-%dir %{prefix}/share/locale/es_EC/LC_MESSAGES
-%dir %{prefix}/share/locale/es_PR
-%dir %{prefix}/share/locale/es_PR/LC_MESSAGES
-%dir %{prefix}/share/locale/es_UY
-%dir %{prefix}/share/locale/es_UY/LC_MESSAGES
-%dir %{prefix}/share/locale/es_VE
-%dir %{prefix}/share/locale/es_VE/LC_MESSAGES
+%{_bindir}/*
+%{_datadir}/applications/*.desktop
+%{_datadir}/pixmaps/*
+%{_datadir}/gnome/help/*
+%{_datadir}/gnome-2.0/ui/*
+%{_datadir}/gnome-applets
+%{_datadir}/icons/*/*/apps/*.png
+%{_datadir}/icons/*/*/apps/*.svg
+%{_datadir}/omf/*
+%{_datadir}/xmodmap
+%{_libdir}/*.so.*
+%{_libdir}/bonobo/servers/*.server
+%{_prefix}/lib/gnome-panel/*
+%{_sysconfdir}/sound/events/*.soundlist
+#%if %suse_version <= 1020
+#%{_sysconfdir}/permissions.d/%{name}.*
+#%endif
%files devel
%defattr (-, root, root)
-%{prefix}/include/*
-%{prefix}/%_lib/pkgconfig/*.pc
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/*.*a
+%{_libdir}/pkgconfig/*.pc
%changelog -n gnome-applets
+* Tue Jan 09 2007 - sbrabec@suse.cz
+- Prefix changed to /usr.
+- Spec file cleanup.
+* Fri Jan 05 2007 - sbrabec@suse.cz
+- Explicitly require dbus to build correctly for all products.
+- Build with apmd in older products.
* Fri Dec 22 2006 - ro@suse.de
- removed apmd from buildreq (dropped package)
* Thu Nov 16 2006 - danw@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