rpms/control-center/devel single-panel.patch, NONE, 1.1 .cvsignore, 1.102, 1.103 control-center.spec, 1.517, 1.518 sources, 1.106, 1.107
Matthias Clasen
mclasen at fedoraproject.org
Tue Jun 1 22:11:20 UTC 2010
Author: mclasen
Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6548
Modified Files:
.cvsignore control-center.spec sources
Added Files:
single-panel.patch
Log Message:
2.31.2
single-panel.patch:
default-applications/default-applications.desktop.in.in | 2 +-
keybindings/keybinding.desktop.in.in | 2 +-
keyboard/keyboard.desktop.in.in | 2 +-
mouse/gnome-settings-mouse.desktop.in.in | 2 +-
network/gnome-network-properties.desktop.in.in | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
--- NEW FILE single-panel.patch ---
diff -up gnome-control-center-2.31.2/panels/default-applications/default-applications.desktop.in.in.single-panel gnome-control-center-2.31.2/panels/default-applications/default-applications.desktop.in.in
--- gnome-control-center-2.31.2/panels/default-applications/default-applications.desktop.in.in.single-panel 2010-06-01 17:49:40.532468067 -0400
+++ gnome-control-center-2.31.2/panels/default-applications/default-applications.desktop.in.in 2010-06-01 17:50:02.922724039 -0400
@@ -1,7 +1,7 @@
[Desktop Entry]
_Name=Preferred Applications
_Comment=Select your default applications
-Exec=gnome-default-applications-properties
+Exec=gnome-control-center default-applications.desktop
Icon=gnome-settings-default-applications
Terminal=false
Type=Application
diff -up gnome-control-center-2.31.2/panels/keybindings/keybinding.desktop.in.in.single-panel gnome-control-center-2.31.2/panels/keybindings/keybinding.desktop.in.in
--- gnome-control-center-2.31.2/panels/keybindings/keybinding.desktop.in.in.single-panel 2010-06-01 17:54:13.408719218 -0400
+++ gnome-control-center-2.31.2/panels/keybindings/keybinding.desktop.in.in 2010-06-01 17:55:04.932473515 -0400
@@ -1,7 +1,7 @@
[Desktop Entry]
_Name=Keyboard Shortcuts
_Comment=Assign shortcut keys to commands
-Exec=gnome-keybinding-properties
+Exec=gnome-control-center keybinding.desktop
Icon=preferences-desktop-keyboard-shortcuts
Terminal=false
Type=Application
diff -up gnome-control-center-2.31.2/panels/keyboard/keyboard.desktop.in.in.single-panel gnome-control-center-2.31.2/panels/keyboard/keyboard.desktop.in.in
--- gnome-control-center-2.31.2/panels/keyboard/keyboard.desktop.in.in.single-panel 2010-06-01 17:51:41.563964644 -0400
+++ gnome-control-center-2.31.2/panels/keyboard/keyboard.desktop.in.in 2010-06-01 17:51:54.823718309 -0400
@@ -1,7 +1,7 @@
[Desktop Entry]
_Name=Keyboard
_Comment=Set your keyboard preferences
-Exec=gnome-keyboard-properties
+Exec=gnome-control-center keyboard.desktop
Icon=preferences-desktop-keyboard
Terminal=false
Type=Application
diff -up gnome-control-center-2.31.2/panels/mouse/gnome-settings-mouse.desktop.in.in.single-panel gnome-control-center-2.31.2/panels/mouse/gnome-settings-mouse.desktop.in.in
--- gnome-control-center-2.31.2/panels/mouse/gnome-settings-mouse.desktop.in.in.single-panel 2010-06-01 17:53:03.968732349 -0400
+++ gnome-control-center-2.31.2/panels/mouse/gnome-settings-mouse.desktop.in.in 2010-06-01 17:53:25.061482595 -0400
@@ -1,7 +1,7 @@
[Desktop Entry]
_Name=Mouse
_Comment=Set your mouse preferences
-Exec=gnome-mouse-properties
+Exec=gnome-control-center gnome-settings-mouse.desktop
Icon=input-mouse
Terminal=false
Type=Application
diff -up gnome-control-center-2.31.2/panels/network/gnome-network-properties.desktop.in.in.single-panel gnome-control-center-2.31.2/panels/network/gnome-network-properties.desktop.in.in
--- gnome-control-center-2.31.2/panels/network/gnome-network-properties.desktop.in.in.single-panel 2010-06-01 17:55:51.604468556 -0400
+++ gnome-control-center-2.31.2/panels/network/gnome-network-properties.desktop.in.in 2010-06-01 17:56:10.455468696 -0400
@@ -1,7 +1,7 @@
[Desktop Entry]
_Name=Network Proxy
_Comment=Set your network proxy preferences
-Exec=gnome-network-properties
+Exec=gnome-control-center gnome-network-properties.desktop
Icon=gnome-network-properties
Terminal=false
Type=Application
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- .cvsignore 27 Apr 2010 12:58:35 -0000 1.102
+++ .cvsignore 1 Jun 2010 22:11:19 -0000 1.103
@@ -1 +1 @@
-gnome-control-center-2.30.1.tar.bz2
+gnome-control-center-2.31.2.tar.bz2
Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.517
retrieving revision 1.518
diff -u -p -r1.517 -r1.518
--- control-center.spec 11 May 2010 13:22:51 -0000 1.517
+++ control-center.spec 1 Jun 2010 22:11:19 -0000 1.518
@@ -1,4 +1,3 @@
-%define _default_patch_fuzz 2
%define gettext_package gnome-control-center-2.0
%define glib2_version 2.13.0
@@ -18,54 +17,22 @@
%define libxklavier_version 4.0
%define gnome_menus_version 2.11.1
%define usermode_version 1.83
-%define libgnomekbd_version 2.27.4
+%define libgnomekbd_version 2.31.1
%define libXrandr_version 1.2.99
Summary: Utilities to configure the GNOME desktop
Name: control-center
-Version: 2.30.1
+Version: 2.31.2
Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
#VCS: git:git://git.gnome.org/gnome-control-center
-Source: http://download.gnome.org/sources/gnome-control-center/2.30/gnome-control-center-%{version}.tar.bz2
-Source1: org.gnome.control-center.defaultbackground.policy
-Source2: apply-extra-translations
-Source3: extra-translations
-
-# http://bugzilla.gnome.org/536531
-Patch7: make-default.patch
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=475804
-Patch10: gcc-pam-fprintd-avail.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=545075
-Patch22: slab-icon-names.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=555591
-Patch30: default-layout-toggle.patch
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=597066
-Patch52: shell-markup.patch
-
-Patch56: best-shapes.patch
-
-# call the Fedora/RHEL graphical passwd changing apps
-Patch95: gnome-control-center-2.25.2-passwd.patch
-Patch96: gnome-control-center-2.25.2-gecos.patch
-# change default preferred apps to programs we ship
-Patch99: default-applications.patch
-
-# update the shell common tasks to desktop files we ship
-Patch100: shell-common-tasks.patch
-
+Source: http://download.gnome.org/sources/gnome-control-center/2.31/gnome-control-center-%{version}.tar.bz2
URL: http://www.gnome.org
-# the background capplets expects its .xml files in
-# a different place now
-Conflicts: desktop-backgrounds-basic < 2.0-27
-Conflicts: desktop-backgrounds-extended < 2.0-27
+# fix launching individual panels from the menu
+Patch0: single-panel.patch
Requires: gnome-settings-daemon >= 2.21.91-3
Requires: redhat-menus >= %{redhat_menus_version}
@@ -73,16 +40,12 @@ Requires: gnome-icon-theme
Requires: libgail-gnome
Requires: alsa-lib
Requires: gnome-menus >= %{gnome_menus_version}
-Requires: usermode >= %{usermode_version}
Requires: gnome-desktop >= %{gnome_desktop_version}
Requires: dbus-x11
Requires: control-center-filesystem = %{epoch}:%{version}-%{release}
# we need XRRGetScreenResourcesCurrent
Requires: libXrandr >= %{libXrandr_version}
-# for /usr/share/pkgconfig
-Requires: pkgconfig
-
BuildRequires: pango-devel
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -165,53 +128,23 @@ for applications. This package contains
can install configuration files that are picked up by the control-center
utilities.
-%package extra
-Summary: Additional utilities to configure the GNOME desktop
-Group: User Interface/Desktops
-Requires: %{name} = %{?epoch}:%{version}-%{release}
-
-%description extra
-The %{name}-extra package contains additions configuration utilities
-for the GNOME desktop.
-
%prep
%setup -q -n gnome-control-center-%{version}
-%patch10 -p0 -b .pam-fprintd
-%patch22 -p0 -b .slab-icon-names
-%patch30 -p1 -b .default-layout-toggle
-%patch52 -p1 -b .shell-markup
-%patch56 -p1 -b .best-shapes
-
-# vendor configuration patches
-%patch95 -p1 -b .passwd
-#%patch96 -p1 -b .gecos
-%patch99 -p1 -b .default-apps
-%patch100 -p1 -b .common-tasks
-
-%patch7 -p1 -b .make-default
-
-autoreconf -f
+%patch0 -p1 -b .single-panel
%build
-
-# Work-around http://bugzilla.gnome.org/show_bug.cgi?id=427939
-sed -i -e 's/@ENABLE_SK_TRUE at _s/_s/' help/Makefile.in
-
-# Add -Wno-error to silence gswitchit
-%configure --disable-static \
- --disable-scrollkeeper \
- --enable-aboutme \
- --disable-update-mimedb \
- CFLAGS="$RPM_OPT_FLAGS -Wno-error"
+%configure \
+ --disable-static \
+ --disable-scrollkeeper \
+ --enable-aboutme \
+ --disable-update-mimedb \
+ CFLAGS="$RPM_OPT_FLAGS -Wno-error"
# drop unneeded direct library deps with --as-needed
# libtool doesn't make this easy, so we do it the hard way
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-# patch in translations for "Make Default", taken from gnome-power-manager
-%{SOURCE2} --apply . %{SOURCE3}
-
make %{?_smp_mflags}
%install
@@ -226,32 +159,21 @@ for i in apps_gnome_settings_daemon_defa
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/$i ; \
done
-desktop-file-install --vendor gnome --delete-original \
+desktop-file-install --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-only-show-in GNOME \
$RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
# https://bugzilla.redhat.com/show_bug.cgi?id=161489
sed -i -e "s/OnlyShowIn=GNOME;//" \
- $RPM_BUILD_ROOT%{_datadir}/applications/gnome-default-applications.desktop
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=594710
-sed -i -e "s/Icon=gnome-settings-theme/Icon=preferences-desktop-theme/" \
- $RPM_BUILD_ROOT%{_datadir}/applications/gnome-theme-installer.desktop
+ $RPM_BUILD_ROOT%{_datadir}/applications/default-applications.desktop
# we do want this
mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions
-install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions
-
# we don't want these
rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/autostart
rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/cursor-fonts
-
-# Remove libslab devel stuff which shouldn't be used
-rm -rf $RPM_BUILD_ROOT%{_includedir}/libslab/ $RPM_BUILD_ROOT%{_libdir}/libslab.so
-
rm $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache
# remove useless libtool archive files
@@ -291,10 +213,10 @@ gtk-update-icon-cache %{_datadir}/icons/
%{_datadir}/gnome-control-center/default-apps/*.xml
%dir %{_datadir}/gnome-control-center/ui
%{_datadir}/gnome-control-center/ui/*.ui
-%exclude %{_datadir}/gnome-control-center/ui/gnome-window-properties.ui
+#%exclude %{_datadir}/gnome-control-center/ui/gnome-window-properties.ui
%{_datadir}/gnome-control-center/pixmaps
%{_datadir}/applications/*.desktop
-%exclude %{_datadir}/applications/gnome-window-properties.desktop
+#%exclude %{_datadir}/applications/gnome-window-properties.desktop
%{_datadir}/desktop-directories/*
%{_datadir}/mime/packages/gnome-theme-package.xml
%{_datadir}/icons/hicolor/*/apps/*
@@ -308,12 +230,12 @@ gtk-update-icon-cache %{_datadir}/icons/
%{_bindir}/gnome-at-properties
%{_bindir}/gnome-at-visual
%{_bindir}/gnome-control-center
-%{_bindir}/gnome-default-applications-properties
+#%{_bindir}/gnome-default-applications-properties
%{_bindir}/gnome-display-properties
-%{_bindir}/gnome-keybinding-properties
-%{_bindir}/gnome-keyboard-properties
-%{_bindir}/gnome-mouse-properties
-%{_bindir}/gnome-network-properties
+#%{_bindir}/gnome-keybinding-properties
+#%{_bindir}/gnome-keyboard-properties
+#%{_bindir}/gnome-mouse-properties
+#%{_bindir}/gnome-network-properties
%{_bindir}/gnome-typing-monitor
%{_bindir}/gnome-font-viewer
%{_bindir}/gnome-thumbnail-font
@@ -324,12 +246,17 @@ gtk-update-icon-cache %{_datadir}/icons/
%{_sysconfdir}/xdg/menus/gnomecc.menu
%{_sysconfdir}/xdg/autostart/gnome-at-session.desktop
%{_libdir}/window-manager-settings/*.so
+%{_libdir}/control-center-1
+%{_libdir}/libgnome-control-center.so
+%{_sbindir}/gnome-display-properties-install-systemwide
%files devel
%defattr(-,root,root)
%{_includedir}/gnome-window-settings-2.0
+%{_includedir}/gnome-control-center-1
%{_libdir}/libgnome-window-settings.so
%{_libdir}/pkgconfig/*
+%{_datadir}/gtk-doc/html/libgnome-control-center
%files filesystem
%defattr(-,root,root)
@@ -339,14 +266,13 @@ gtk-update-icon-cache %{_datadir}/icons/
%dir %{_datadir}/gnome-control-center/keybindings
%dir %{_datadir}/gnome-control-center/default-apps
-%files extra
-%defattr(-,root,root)
-%{_bindir}/gnome-window-properties
-%{_datadir}/gnome-control-center/ui/gnome-window-properties.ui
-%{_datadir}/applications/gnome-window-properties.desktop
-
%changelog
+* Fri May 28 2010 Matthias Clasen <mclasen at redhat.com> 2.31.2-2
+- Update to 2.31.2
+- Remove vendor prefixes from desktop files, since that breaks
+ the new shell
+
* Tue May 11 2010 Matthias Clasen <mclasen at redhat.com> 2.30.1-2
- Install PolicyKit policy for setting the default background
in the right location
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/sources,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- sources 27 Apr 2010 12:58:35 -0000 1.106
+++ sources 1 Jun 2010 22:11:20 -0000 1.107
@@ -1 +1 @@
-9608eae5605cfc478ba35b683bf129c1 gnome-control-center-2.30.1.tar.bz2
+d5da451dbc18b69b73433415fd42272c gnome-control-center-2.31.2.tar.bz2
More information about the scm-commits
mailing list