pool/gnome-shell
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 75069 from home:vuntz:branches:GNOME:Factory

Browse Source 
Remove Meta-3.1 hack + add deps that gnome-shell really expects

OBS-URL: https://build.opensuse.org/request/show/75069
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=66
This commit is contained in:
Dominique Leuenberger 2011-07-02 10:32:04 +00:00 committed by Git OBS Bridge
parent 30ee76dda6
commit fdda5aa6e0
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnome-shell.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Sat Jul 2 09:32:38 CEST 2011 - vuntz@opensuse.org
- Remove hack to use Meta-3.1.gir for the build: mutter 3.1.3.1
reverted back to Meta-3.0.gir.
- Remove gjs Requires: gnome-shell is now a binary, and uses
libgjs, not the gjs binary.
- Add gnome-bluetooth, gnome-control-center, gnome-power-manager,
gnome-screensaver, NetworkManager-gnome Requires: the bluetooth,
power and network system icons, and the "System settings"/"Lock
screen" menu items need the services provided by those packages
to work.
-------------------------------------------------------------------
Fri Jul 1 09:16:09 CEST 2011 - dimstar@opensuse.org

16
gnome-shell.spec
View File

@ -57,12 +57,22 @@ BuildRequires: pkgconfig(telepathy-logger-0.2)
BuildRequires: pkgconfig(xfixes)
Requires: dbus-1-python
Requires: gdk-pixbuf-loader-rsvg
Requires: gjs
Requires: gnome-icon-theme-symbolic
Requires: gnome-session
# For a GSettings schema
Requires: gnome-settings-daemon
Requires: gsettings-desktop-schemas
## Finally, dependencies for session services that are needed for system icons and the user menu
# bluetooth system icon
Requires: gnome-bluetooth
# "System settings" menu item
Requires: gnome-control-center
# power system icon
Requires: gnome-power-manager
# "Lock screen" menu item
Requires: gnome-screensaver
# network system icon
Requires: NetworkManager-gnome
Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%gconf_schemas_prereq
@ -82,10 +92,6 @@ translation-update-upstream
%endif
%build
# The gnome-shell 3.1.3 tarball does not build against mutter 3.1.3 tarball by default, as mutter moved from Meta-3.0 to Meta-3.1. See bgo#653795
# Detect if we need to change that in our Makefiles or if we can remove this hack. Changing Makefile.am and Makefile.in to avoid having to bootstrap.
grep "Meta-3.0" src/Makefile.am
sed -i "s/Meta-3.0/Meta-3.1/" src/Makefile.{am,in}
%configure \
--disable-static \
--libexecdir=%{_libexecdir}/%{name} \