Hello community, here is the log from the commit of package control-center2 checked in at Wed Jan 10 01:54:24 CET 2007. -------- --- GNOME/control-center2/control-center2.changes 2006-12-22 22:46:07.000000000 +0100 +++ /mounts/work_src_done/STABLE/control-center2/control-center2.changes 2007-01-09 19:12:31.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 9 19:12:23 CET 2007 - sbrabec@suse.cz + +- Prefix changed to /usr. +- Spec file cleanup. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ control-center2.spec ++++++ --- /var/tmp/diff_new_pack.Y18274/_old 2007-01-10 01:53:58.000000000 +0100 +++ /var/tmp/diff_new_pack.Y18274/_new 2007-01-10 01:53:58.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package control-center2 (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: control-center2 -BuildRequires: desktop-file-utils docbook-xsl-stylesheets gnome-desktop-devel gnome-doc-utils-devel gnome-menus-devel gnome-patch-translation gstreamer010-plugins-base-devel intltool libglade2-devel libidl libxklavier-devel mDNSResponder-devel metacity nautilus-devel pam-devel perl-XML-Parser scrollkeeper sgml-skel update-desktop-files xorg-x11 %define _name control-center -%define prefix /opt/gnome -%define sysconfdir /etc%{prefix} +BuildRequires: desktop-file-utils docbook-xsl-stylesheets gnome-desktop-devel gnome-doc-utils-devel gnome-menus-devel gnome-patch-translation gstreamer010-plugins-base-devel intltool libglade2-devel libidl libxklavier-devel mDNSResponder-devel metacity-devel nautilus-devel pam-devel perl-XML-Parser scrollkeeper sgml-skel update-desktop-files xorg-x11 License: GNU General Public License (GPL) Group: System/GUI/GNOME -Autoreqprov: on Obsoletes: fontilus themus acme Provides: fontilus themus acme Version: 2.16.1 -Release: 35 +Release: 40 Summary: The GNOME Control Center for the GNOME 2.x Desktop Source: %{_name}-%{version}.tar.bz2 Source1: control-center-art.tar.bz2 @@ -44,9 +41,17 @@ Patch23: control-center2-217790-sanitize-dpi.diff Patch100: control-center2-po-update.patch URL: http://www.gnome.org +Requires: nautilus +PreReq: permissions +%if %suse_version > 1000 +Recommends: gnome-audio +%else +Requires: gnome-audio +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: filesystem gconf2 shared-mime-info permissions -Requires: nautilus gnome-audio +Autoreqprov: on + +%gconf_schemas_prereq %description This package contains the control center for the GNOME 2.x Desktop. @@ -61,7 +66,7 @@ Summary: The GNOME Control Center for the GNOME 2.x Desktop Group: System/GUI/GNOME Autoreqprov: on -Requires: %{name} = %{version} glib2-devel gtk2-devel libgnomeui-devel gnome-desktop-devel libglade2-devel gnome-menus-devel +Requires: %{name} = %{version} dbus-1-devel glib2-devel gtk2-devel libgnomeui-devel gnome-desktop-devel libglade2-devel gnome-menus-devel %if %suse_version > 1010 Requires: dbus-1-glib-devel %else @@ -99,33 +104,21 @@ gnome-patch-translation-update %build -libtoolize --copy --force -aclocal -automake --add-missing --copy --force -autoconf -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ - ./configure \ - --prefix=%prefix \ - --libdir=%prefix/%_lib \ - --libexecdir=%prefix/lib/control-center-2.0 \ - --sysconfdir=%sysconfdir \ - --datadir=%prefix/share \ - --localstatedir=/var/lib \ - --with-kde-datadir=/opt/kde \ - --enable-platform-gnome2 \ +autoreconf -f -i +# needed for control-center-2.16.1: +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +%configure\ + --libexecdir=%{_prefix}/lib/control-center-2.0\ --disable-scrollkeeper make %{?jobs:-j%jobs} %install -rm -rf $RPM_BUILD_ROOT -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT -unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL # DESTDIR=$RPM_BUILD_ROOT mime-info-to-mime -mkdir -p $RPM_BUILD_ROOT/usr/share/mime/packages -cp %{S:2} $RPM_BUILD_ROOT/usr/share/mime/packages -%find_lang %{_name}-2.0 -%suse_update_desktop_file -N "Control Center" -G "Personal Settings" -C "Configure the desktop" gnomecc +mkdir $RPM_BUILD_ROOT%{_datadir}/mime +mkdir $RPM_BUILD_ROOT%{_datadir}/mime/packages +cp %{S:2} $RPM_BUILD_ROOT%{_datadir}/mime/packages +%suse_update_desktop_file -N "Control Center" -G "Personal Settings" -C "Configure the desktop" gnomecc Application DesktopSettings # capplets %suse_update_desktop_file at-properties X-SuSE-ControlCenter-Personal %suse_update_desktop_file accessibility-keyboard X-SuSE-ControlCenter-Personal @@ -142,107 +135,87 @@ %suse_update_desktop_file keybinding X-SuSE-ControlCenter-Personal %suse_update_desktop_file keyboard X-SuSE-ControlCenter-Hardware %suse_update_desktop_file window-properties X-SuSE-ControlCenter-LookAndFeel -mkdir -p $RPM_BUILD_ROOT/usr/share/applications -sed '/^OnlyShowIn/d;s/GNOME;GTK;Settings;/GNOME;Application;DesktopSettings;/'\ - <$RPM_BUILD_ROOT/opt/gnome/share/applications/gnomecc.desktop\ - >$RPM_BUILD_ROOT/usr/share/applications/gnomecc.desktop -rm $RPM_BUILD_ROOT%{prefix}/share/applications/mimeinfo.cache -rm -rf $RPM_BUILD_ROOT/var/%{_lib}/scrollkeeper -mv $RPM_BUILD_ROOT%{prefix}/share/pixmaps/display-capplet.png $RPM_BUILD_ROOT%{prefix}/share/icons/hicolor/48x48/apps/ -cp control-center-art/* $RPM_BUILD_ROOT%{prefix}/share/icons/hicolor/48x48/apps/ -( cd $RPM_BUILD_ROOT%{prefix}/share/pixmaps ; ln -s ../icons/hicolor/48x48/apps/gnome-control-center.png . ) -( cd $RPM_BUILD_ROOT%{prefix}/share/control-center-2.0/interfaces ; ln -s ../pixmaps/change-password.png . ) -rm $RPM_BUILD_ROOT%{prefix}/%_lib/nautilus/extensions-1.0/*.*a -rm $RPM_BUILD_ROOT%{prefix}/%_lib/gnome-vfs-2.0/modules/lib*.*a -rm $RPM_BUILD_ROOT%{prefix}/%_lib/window-manager-settings/*.*a -%if %suse_version < 1000 +rm $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache +mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/display-capplet.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/ +cp control-center-art/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/ +cd $RPM_BUILD_ROOT%{_datadir}/pixmaps ; ln -s ../icons/hicolor/48x48/apps/gnome-control-center.png . ; cd - +cd $RPM_BUILD_ROOT%{_datadir}/control-center-2.0/interfaces ; ln -s ../pixmaps/change-password.png . ; cd - +%if %suse_version <= 1020 mkdir -p $RPM_BUILD_ROOT/etc/permissions.d cp -a ../permissions/* $RPM_BUILD_ROOT/etc/permissions.d %endif -mv $RPM_BUILD_ROOT%{prefix}/share/dbus-1 $RPM_BUILD_ROOT/usr/share +%find_lang %{_name}-2.0 +%find_gconf_schemas +cat %{_name}-2.0.lang %{name}.schemas_list >%{name}.lst +rm $RPM_BUILD_ROOT%{_libdir}/*/*.*a $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/apps_gnome_settings_daemon_default_editor.schemas >/dev/null 2>/dev/null -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas >/dev/null 2>/dev/null -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas >/dev/null 2>/dev/null -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/desktop_gnome_font_rendering.schemas >/dev/null 2>/dev/null -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas >/dev/null 2>/dev/null -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/fontilus.schemas >/dev/null 2>/dev/null -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/themus.schemas >/dev/null 2>/dev/null -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/system_proxy.schemas >/dev/null 2>/dev/null -usr/bin/update-mime-database /usr/share/mime >/dev/null -touch var/adm/SuSEconfig/run-scrollkeeper-update +if test -x usr/bin/update-mime-database ; then + usr/bin/update-mime-database usr/share/mime >/dev/null +fi %run_permissions %verifyscript -%verify_permissions -e /opt/gnome/sbin/change-passwd +%verify_permissions -e %{_sbindir}/change-passwd + +%posttrans -f %{name}.schemas_posttrans + +%preun -f %{name}.schemas_preun %postun %run_ldconfig -usr/bin/update-mime-database /usr/share/mime >/dev/null -touch var/adm/SuSEconfig/run-scrollkeeper-update +if test -x usr/bin/update-mime-database ; then + usr/bin/update-mime-database usr/share/mime >/dev/null +fi -%clean -rm -rf $RPM_BUILD_ROOT - -%files -f %files -f %{_name}-2.0.lang +%files -f %{name}.lst %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README TODO -%{prefix}/bin/* -%{prefix}/share/gnome-background-properties -%{prefix}/share/pixmaps/*.png -#%{prefix}/share/pixmaps/gnomecc-2 -%{prefix}/share/applications/*.desktop -%{prefix}/share/control-center-2.0 -%{sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas -%{sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas -%{sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas -%{sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas -%{sysconfdir}/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas -%{sysconfdir}/gconf/schemas/fontilus.schemas -%{sysconfdir}/gconf/schemas/themus.schemas -%{sysconfdir}/gconf/schemas/system_proxy.schemas -%{sysconfdir}/gnome-vfs-2.0/modules/*.conf -#%{prefix}/share/gnome-2.0/ui/*.xml -#%{prefix}/share/gnome/vfolders/* -%{prefix}/share/gnome/cursor-fonts -%{prefix}/share/icons/hicolor/48x48 -%{prefix}/%_lib/nautilus/extensions-1.0/* -%{prefix}/%_lib/lib*.so.* -#%{prefix}/%_lib/bonobo/servers/*.server -%{prefix}/%_lib/gnome-vfs-2.0/modules/lib*.so -%dir %{prefix}/%_lib/window-manager-settings -%{prefix}/%_lib/window-manager-settings/*.so -%{prefix}/lib/control-center-2.0 -/usr/share/applications/gnomecc.desktop -/usr/share/mime/packages/*.xml -%{prefix}/share/gnome/help/control-center -%{prefix}/share/omf/control-center +%{_bindir}/* +%{_datadir}/applications/*.desktop +%{_datadir}/control-center-2.0 +%{_datadir}/dbus-1/services/org.gnome.SettingsDaemon.service +%{_datadir}/desktop-directories/*.directory +%{_datadir}/gnome/cursor-fonts +%{_datadir}/gnome/help/control-center +%{_datadir}/gnome-background-properties +%{_datadir}/gnome-default-applications +%{_datadir}/icons/hicolor/48x48/*/*.png +%{_datadir}/mime/packages/*.xml +%{_datadir}/omf/control-center +%{_datadir}/pixmaps/*.png +%{_libdir}/*.so.* +%{_libdir}/gnome-vfs-2.0/modules/*.so +%{_libdir}/nautilus/extensions-1.0/*.so +%dir %{_libdir}/window-manager-settings +%{_libdir}/window-manager-settings/*.so +%{_prefix}/lib/control-center-2.0 +%verify (not mode) %attr (4755, root, root) %{_sbindir}/change-passwd +%{_sysconfdir}/gnome-vfs-2.0/modules/*.conf /etc/pam.d/gnome-passwd -%if %suse_version < 1000 +%if %suse_version <= 1020 /etc/permissions.d/* %endif -%{prefix}/sbin/change-passwd -%{_datadir}/dbus-1/services/org.gnome.SettingsDaemon.service -%{prefix}/share/desktop-directories/font-method.directory -%{prefix}/share/desktop-directories/theme-method.directory -%dir %{prefix}/share/gnome-default-applications -%{prefix}/share/gnome-default-applications/gnome-default-applications.xml -%dir %{prefix}/include/gnome-settings-daemon-2.0 -%dir %{prefix}/include/gnome-settings-daemon-2.0/gnome-settings-daemon -%{prefix}/include/gnome-settings-daemon-2.0/gnome-settings-daemon/* %files devel %defattr (-, root, root) -%{prefix}/include/gnome-window-settings-2.0 -%{prefix}/%_lib/lib*.so -%{prefix}/%_lib/lib*.*a -%{prefix}/%_lib/pkgconfig/*.pc -%{prefix}/share/idl/*.idl +%{_datadir}/idl/*.idl +%{_includedir}/gnome-settings-daemon-2.0 +%{_includedir}/gnome-window-settings-2.0 +%{_libdir}/lib*.so +%{_libdir}/lib*.*a +%{_libdir}/pkgconfig/*.pc %changelog -n control-center2 +* Tue Jan 09 2007 - sbrabec@suse.cz +- Prefix changed to /usr. +- Spec file cleanup. * Fri Dec 22 2006 - federico@novell.com - Added control-center2-217790-sanitize-dpi.diff to fix the control-center2 part of ++++++ permissions.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/permissions/control-center2.easy new/permissions/control-center2.easy --- old/permissions/control-center2.easy 2005-09-19 18:57:42.000000000 +0200 +++ new/permissions/control-center2.easy 2007-01-09 16:37:12.000000000 +0100 @@ -1 +1 @@ -/opt/gnome/sbin/change-passwd root:root 4755 +/usr/sbin/change-passwd root:root 4755 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/permissions/control-center2.paranoid new/permissions/control-center2.paranoid --- old/permissions/control-center2.paranoid 2005-09-19 18:57:44.000000000 +0200 +++ new/permissions/control-center2.paranoid 2007-01-09 16:37:12.000000000 +0100 @@ -1 +1 @@ -/opt/gnome/sbin/change-passwd root:root 0755 +/usr/sbin/change-passwd root:root 0755 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/permissions/control-center2.secure new/permissions/control-center2.secure --- old/permissions/control-center2.secure 2005-09-19 18:57:43.000000000 +0200 +++ new/permissions/control-center2.secure 2007-01-09 16:37:12.000000000 +0100 @@ -1 +1 @@ -/opt/gnome/sbin/change-passwd root:root 4755 +/usr/sbin/change-passwd root:root 4755 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org