rpms/control-center/devel background-location.patch, NONE, 1.1 control-center.spec, 1.315, 1.316 control-center-2.15.4-finish.patch, 1.1, NONE control-center-2.16.0-start-at-helper.patch, 1.2, NONE control-center-2.18.0-gnome-bg.patch, 1.3, NONE control-center-2.20.1-more-key-defaults.patch, 1.1, NONE control-center-2.9.4-filesel.patch, 1.2, NONE orca-command.patch, 1.1, NONE screensaver-path.patch, 1.1, NONE
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Sun Nov 18 05:02:47 UTC 2007
Author: mclasen
Update of /cvs/extras/rpms/control-center/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29569
Modified Files:
control-center.spec
Added Files:
background-location.patch
Removed Files:
control-center-2.15.4-finish.patch
control-center-2.16.0-start-at-helper.patch
control-center-2.18.0-gnome-bg.patch
control-center-2.20.1-more-key-defaults.patch
control-center-2.9.4-filesel.patch orca-command.patch
screensaver-path.patch
Log Message:
Spec file cleanups
background-location.patch:
--- NEW FILE background-location.patch ---
diff -up gnome-control-center-2.21.2/capplets/appearance/appearance-desktop.c.background-location gnome-control-center-2.21.2/capplets/appearance/appearance-desktop.c
--- gnome-control-center-2.21.2/capplets/appearance/appearance-desktop.c.background-location 2007-11-17 23:39:06.000000000 -0500
+++ gnome-control-center-2.21.2/capplets/appearance/appearance-desktop.c 2007-11-17 23:39:39.000000000 -0500
@@ -1114,6 +1114,8 @@ desktop_init (AppearanceData *data,
NULL));
gtk_file_chooser_set_select_multiple (data->wp_filesel, TRUE);
+ gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (data->wp_filesel),
+ "/usr/share/backgrounds");
gtk_file_chooser_set_use_preview_label (data->wp_filesel, FALSE);
pictures = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES);
Index: control-center.spec
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -r1.315 -r1.316
--- control-center.spec 14 Nov 2007 00:13:21 -0000 1.315
+++ control-center.spec 18 Nov 2007 05:02:13 -0000 1.316
@@ -22,56 +22,32 @@
Summary: GNOME Control Center
Name: control-center
Version: 2.21.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
-License: GPLv2+ and GFDL+
+License: GPLv2+ and GFDL
Group: User Interface/Desktops
Source: http://download.gnome.org/sources/gnome-control-center/2.21/gnome-control-center-%{version}.tar.bz2
-# Remove "Apply" button and just have "Close" instead
-# FIXME: figure out how this applies to the new appearance capplet
-#Patch1: control-center-2.15.4-finish.patch
-
# Optionally bring up beagle or tracker if available
-# FIXME: need to get this filed upstream
-Patch3: control-center-2.19.1-search.patch
-
-# drop help button from a dialog that doesn't have
-# help
-# FIXME: need to get this filed upstream
-Patch4: control-center-2.16.0-about-me-help.patch
-
-Patch6: control-center-2.20.0-enable-sound-by-default.patch
-
-# ubuntu has a better patch for this in the works
-# apparently http://blog.omma.net/?p=16
-# We should either wait for it to get upstream, or
-# hunt through the 6.1MB (!!) patch file against
-# control-center
-#Patch12: control-center-2.16.0-start-at-helper.patch
-
-Patch13: control-center-2.19.3-no-gnome-common.patch
-
-# FIXME: figure out how this applies to the new appearance capplet
-Patch14: gnome-bg.patch
-
+# http://bugzilla.gnome.org/show_bug.cgi?id=497802
+Patch0: control-center-2.19.1-search.patch
+# drop help button from a dialog that doesn't have help
+# http://bugzilla.gnome.org/show_bug.cgi?id=497803
+Patch1: control-center-2.16.0-about-me-help.patch
+Patch2: control-center-2.20.0-enable-sound-by-default.patch
+Patch3: control-center-2.19.3-no-gnome-common.patch
+Patch4: gnome-bg.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=497807
+Patch5: background-location.patch
# Fix some useless warnings in libslab
# http://bugzilla.gnome.org/show_bug.cgi?id=439398
-Patch15: gnome-control-center-2.19.90-no-warnings.patch
-
+Patch6: gnome-control-center-2.19.90-no-warnings.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=430889
# disable for now, upstream plans conflicting changes
#Patch16: control-center-2.18.0-be-more-async.patch
-
# call the Fedora/RHEL graphical passwd changing apps
Patch95: control-center-2.19.91-passwd.patch
Patch96: control-center-2.19.90-gecos.patch
-
-# change default wallpaper directory to where we ship our
-# backgrounds
-# FIXME: figure out how this applies to the new appearance capplet
-#Patch98: control-center-2.9.4-filesel.patch
-
# change default preferred apps to programs we ship
Patch99: control-center-2.19.91-default-apps.patch
@@ -109,7 +85,6 @@
BuildRequires: libbonobo-devel >= %{libbonobo_version}
BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version}
-BuildRequires: bonobo-activation-devel
BuildRequires: fontconfig-devel >= %{fontconfig_version}
BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
BuildRequires: metacity-devel >= %{metacity_version}
@@ -187,22 +162,20 @@
%prep
%setup -q -n gnome-control-center-%{version}
-#%patch1 -p1 -b .finish
-%patch3 -p1 -b .search
-%patch4 -p1 -b .about-me-help
-%patch6 -p0 -b .enable-sound
-#%patch12 -p1 -b .start-at-helper
-%patch13 -p1 -b .no-gnome-common
-%patch14 -p1 -b .gnome-bg
+%patch0 -p1 -b .search
+%patch1 -p1 -b .about-me-help
+%patch2 -p0 -b .enable-sound
+%patch3 -p1 -b .no-gnome-common
+%patch4 -p1 -b .gnome-bg
+%patch5 -p1 -b .background-location
pushd libslab
-%patch15 -p0 -b .warnings
+%patch6 -p0 -b .warnings
popd
#%patch16 -p1 -b .be-more-async
# vendor configuration patches
%patch95 -p1 -b .passwd
%patch96 -p1 -b .gecos
-#%patch98 -p1 -b .filesel
%patch99 -p1 -b .default-apps
%build
@@ -213,8 +186,13 @@
sed -i -e 's/@ENABLE_SK_TRUE at _s/_s/' help/Makefile.in
# Add -Wno-error to silence gswitchit
-%configure --disable-static --enable-gstreamer --enable-alsa CFLAGS="$RPM_OPT_FLAGS -Wno-error" --enable-aboutme --disable-scrollkeeper
-make
+%configure --disable-static \
+ --disable-scrollkeeper \
+ --enable-gstreamer \
+ --enable-alsa \
+ --enable-aboutme \
+ CFLAGS="$RPM_OPT_FLAGS -Wno-error"
+make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ -246,7 +224,7 @@
# we do want this
mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties
-# We don't want these
+# we don't want these
rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/autostart
rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/cursor-fonts
@@ -395,6 +373,9 @@
%dir %{_datadir}/gnome-control-center/keybindings
%changelog
+* Sun Nov 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.21.2-2
+- Spec file cleanups
+
* Tue Nov 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.21.2-1
- Update to 2.21.2
--- control-center-2.15.4-finish.patch DELETED ---
--- control-center-2.16.0-start-at-helper.patch DELETED ---
--- control-center-2.18.0-gnome-bg.patch DELETED ---
--- control-center-2.20.1-more-key-defaults.patch DELETED ---
--- control-center-2.9.4-filesel.patch DELETED ---
--- orca-command.patch DELETED ---
--- screensaver-path.patch DELETED ---
More information about the fedora-extras-commits
mailing list