Hello community, here is the log from the commit of package control-center2 checked in at Wed Apr 11 19:47:38 CEST 2007. -------- --- GNOME/control-center2/control-center2.changes 2007-04-05 18:06:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/control-center2/control-center2.changes 2007-04-10 11:06:05.865507000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 10 11:05:17 CEST 2007 - rodrigo@suse.de + +- Added patch for building libslab statically. +- Patched schemas file to contain our default values. + +------------------------------------------------------------------- New: ---- control-center2-shell-schemas.patch control-center2-static-libslab.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ control-center2.spec ++++++ --- /var/tmp/diff_new_pack.j13939/_old 2007-04-11 19:47:20.000000000 +0200 +++ /var/tmp/diff_new_pack.j13939/_new 2007-04-11 19:47:20.000000000 +0200 @@ -18,7 +18,7 @@ Obsoletes: fontilus themus acme Provides: fontilus themus acme Version: 2.18.0 -Release: 4 +Release: 7 Summary: The GNOME Control Center for the GNOME 2.x Desktop Source: %{_name}-%{version}.tar.bz2 Source1: control-center-art.tar.bz2 @@ -42,6 +42,8 @@ Patch23: control-center2-217790-sanitize-dpi.diff Patch24: jhmfc.patch Patch25: control-center-seamonkey.patch +Patch26: control-center2-static-libslab.patch +Patch27: control-center2-shell-schemas.patch Patch100: control-center2-po-update.patch URL: http://www.gnome.org Requires: nautilus @@ -107,6 +109,8 @@ %patch23 -p1 %patch24 -p1 %patch25 +%patch26 +%patch27 -p1 gnome-patch-translation-update %build @@ -224,15 +228,14 @@ # %{_datadir}/idl/*.idl %{_includedir}/gnome-settings-daemon-2.0 %{_includedir}/gnome-window-settings-2.0 -%dir %{_includedir}/slab -%{_includedir}/slab/*.h -# uhhh... -%{_includedir}/slab/*.c %{_libdir}/lib*.so %{_libdir}/lib*.*a %{_libdir}/pkgconfig/*.pc %changelog +* Tue Apr 10 2007 - rodrigo@suse.de +- Added patch for building libslab statically. +- Patched schemas file to contain our default values. * Thu Apr 05 2007 - sbrabec@suse.cz - Added "Use default web browser" option for default applications FTP preferences (#113104#c13). ++++++ control-center2-shell-schemas.patch ++++++ diff -upr control-center-2.18.0-orig/shell/control-center.schemas.in control-center-2.18.0/shell/control-center.schemas.in --- control-center-2.18.0-orig/shell/control-center.schemas.in 2007-01-26 14:35:03.000000000 +0100 +++ control-center-2.18.0/shell/control-center.schemas.in 2007-04-09 17:15:15.000000000 +0200 @@ -7,7 +7,7 @@ <type>list</type> <list_type>string</list_type> <locale name="C"> - <default><!-- Translators: The format of this string is the task name to be displayed (translate that part) followed by a ";" separator then the filename (DONT translate the file name) of a .desktop file to launch. Multiple entries are separated by a "," -->[Change Desktop Background;background.desktop,Change Theme;gtk-theme-selector.desktop,Set Preferred Applications;default-applications.desktop,Add Printer;gnome-cups-manager.desktop]</default> + <default><!-- Translators: The format of this string is the task name to be displayed (translate that part) followed by a ";" separator then the filename (DONT translate the file name) of a .desktop file to launch. Multiple entries are separated by a "," -->[Change Desktop Background;background.desktop,Add Printer;gnome-cups-manager.desktop,Configure Network;YaST2/lan.desktop,Change Password;gnome-passwd.desktop,Add User;YaST2/users.desktop,Open Administrator Settings;YaST.desktop]</default> <short>Task names and associated .desktop files</short> <long>The task name to be displayed in the control-center (thus needing to be translated) followed by a ";" separator then the filename of an associated .desktop file to launch for that task.</long> </locale> Only in control-center-2.18.0/shell: control-center.schemas.in~ ++++++ control-center2-static-libslab.patch ++++++ Index: libslab/Makefile.am =================================================================== --- libslab/Makefile.am (revision 250) +++ libslab/Makefile.am (working copy) @@ -2,9 +2,35 @@ $(LIBSLAB_CFLAGS) \ $(WARN_CFLAGS) +HEADER_FILES= \ + $(BUILT_SOURCES) \ + app-resizer.h \ + app-shell.h \ + app-shell-startup.h \ + application-tile.h \ + directory-tile.h \ + document-tile.h \ + gnome-utils.h \ + nameplate-tile.h \ + search-bar.h \ + search-context-picker.h \ + search-entry.h \ + shell-window.h \ + slab-gnome-util.h \ + slab-section.h \ + system-tile.h \ + tile.h + +if ENABLE_DYNAMIC_LIBSLAB lib_LTLIBRARIES = libslab.la +SOURCE_HEADER_FILES= +else +noinst_LTLIBRARIES = libslab.la +SOURCE_HEADER_FILES=$(HEADER_FILES) +endif libslab_la_SOURCES = \ + $(SOURCE_HEADER_FILES) \ $(MARSHAL_GENERATED) \ app-resizer.c \ app-shell.c \ @@ -40,33 +66,18 @@ tile-action.c \ tile.c +if ENABLE_DYNAMIC_LIBSLAB libslab_includedir = $(includedir)/slab -libslab_include_HEADERS = \ - $(BUILT_SOURCES) \ - app-resizer.h \ - app-shell.h \ - app-shell-startup.h \ - application-tile.h \ - directory-tile.h \ - document-tile.h \ - gnome-utils.h \ - nameplate-tile.h \ - search-bar.h \ - search-context-picker.h \ - search-entry.h \ - shell-window.h \ - slab-gnome-util.h \ - slab-section.h \ - system-tile.h \ - tile.h +libslab_include_HEADERS = $(HEADER_FILES) +endif -libslab_la_LIBADD = \ - $(LIBSLAB_LIBS) +libslab_la_LIBADD = $(LIBSLAB_LIBS) +if ENABLE_DYNAMIC_LIBSLAB pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libslab.pc +endif - search-entry-watermark.h: search-entry-watermark.svg echo '#define SEARCH_ENTRY_WATERMARK_SVG "' > $@; \ sed -e 's/"/\"/g' -e 's/$$/\/' -e 's/#000000/#%s/g' $< >> $@; \ Index: configure.in =================================================================== --- configure.in (revision 7426) +++ configure.in (working copy) @@ -89,6 +89,9 @@ dnl Check that we meet the dependencies dnl ============================================== +ENABLE_DYNAMIC_LIBSLAB=0 +AM_CONDITIONAL(ENABLE_DYNAMIC_LIBSLAB, test "x$ENABLE_DYNAMIC_LIBSLAB" = "x1") + COMMON_MODULES="gtk+-2.0 >= 2.3.0 dnl gconf-2.0 dnl libgnomeui-2.0 >= 2.2.0 dnl ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org