Accepting request 17876 from GNOME:Factory
Copy from GNOME:Factory/gnome-shell based on submit request 17876 from user vuntz OBS-URL: https://build.opensuse.org/request/show/17876 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-shell?expand=0&rev=2
This commit is contained in:
parent
1e929e5b79
commit
dc954528f2
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3d9646521da40853c3e99f8bb01dabd6ab68fdc53202aed5569dd02e7d4d6cc4
|
||||
size 426885
|
3
gnome-shell-2.27.0.tar.bz2
Normal file
3
gnome-shell-2.27.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:df59d50e7653abfcf05d7d94f0aaefe8f05329e47d5c43510418622a40e84fb0
|
||||
size 437202
|
@ -1,64 +0,0 @@
|
||||
commit 119516424db1f7d43f0a40e0ebce6c7a8dd02a69
|
||||
Author: Colin Walters <walters@verbum.org>
|
||||
Date: Wed Jul 29 13:00:11 2009 -0400
|
||||
|
||||
Update to using Clutter 1.0
|
||||
|
||||
Change the pkg-config and .gir requirements.
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 647e73a..e31698c 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -34,16 +34,16 @@ if $PKG_CONFIG --exists gstreamer-0.10 '>=' $GSTREAMER_MIN_VERSION ; then
|
||||
AC_MSG_RESULT(yes)
|
||||
build_recorder=true
|
||||
recorder_modules="gstreamer-0.10 gstreamer-base-0.10 xfixes"
|
||||
- PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-0.9)
|
||||
+ PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
|
||||
|
||||
-PKG_CHECK_MODULES(MUTTER_PLUGIN, gio-unix-2.0 gtk+-2.0 dbus-glib-1 mutter-plugins gjs-gi-1.0 xscrnsaver libgnome-menu $recorder_modules gconf-2.0 gdk-x11-2.0 clutter-x11-0.9 clutter-glx-0.9)
|
||||
-PKG_CHECK_MODULES(TIDY, clutter-0.9)
|
||||
-PKG_CHECK_MODULES(BIG, clutter-0.9 gtk+-2.0 librsvg-2.0)
|
||||
+PKG_CHECK_MODULES(MUTTER_PLUGIN, gio-unix-2.0 gtk+-2.0 dbus-glib-1 mutter-plugins gjs-gi-1.0 xscrnsaver libgnome-menu $recorder_modules gconf-2.0 gdk-x11-2.0 clutter-x11-1.0 clutter-glx-1.0)
|
||||
+PKG_CHECK_MODULES(TIDY, clutter-1.0)
|
||||
+PKG_CHECK_MODULES(BIG, clutter-1.0 gtk+-2.0 librsvg-2.0)
|
||||
PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-2.0)
|
||||
PKG_CHECK_MODULES(TRAY, gtk+-2.0)
|
||||
PKG_CHECK_MODULES(TASKPANEL, libwnck-1.0 dbus-glib-1)
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index d39f6cf..8a7eae6 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -153,7 +153,7 @@ Shell-0.1.gir: $(mutter) $(G_IR_SCANNER) Big-1.0.gir libgnome-shell.la Makefile
|
||||
--namespace=Shell \
|
||||
--nsversion=0.1 \
|
||||
--add-include-path=$(MUTTER_LIB_DIR)/mutter/ \
|
||||
- --include=Clutter-0.9 \
|
||||
+ --include=Clutter-1.0 \
|
||||
--include=Meta-2.27 \
|
||||
--add-include-path=$(builddir) \
|
||||
--include=Big-1.0 \
|
||||
@@ -174,7 +174,7 @@ Tidy-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libtidy-1.0.la Makefil
|
||||
$(G_IR_SCANNER) \
|
||||
--namespace=Tidy \
|
||||
--nsversion=1.0 \
|
||||
- --include=Clutter-0.9 \
|
||||
+ --include=Clutter-1.0 \
|
||||
--program=mutter \
|
||||
--program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \
|
||||
$(addprefix $(srcdir)/,$(tidy_source_h)) \
|
||||
@@ -192,7 +192,7 @@ Big-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libbig-1.0.la Makefile
|
||||
$(G_IR_SCANNER) \
|
||||
--namespace=Big \
|
||||
--nsversion=1.0 \
|
||||
- --include=Clutter-0.9 \
|
||||
+ --include=Clutter-1.0 \
|
||||
--include=GdkPixbuf-2.0 \
|
||||
--program=mutter \
|
||||
--program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 13 01:03:12 CEST 2009 - vuntz@novell.com
|
||||
|
||||
- Update to version 2.27.0:
|
||||
+ This is the first official tarball.
|
||||
+ No list of changes as the code is really moving a lot at the
|
||||
moment.
|
||||
- Drop gnome-shell-clutter-1.0.patch: fixed upstream.
|
||||
- Remove gnome-common BuildRequires and gnome-autogen.sh call.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 3 21:00:31 CEST 2009 - vuntz@novell.com
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package gnome-shell (Version 0.0.1~20090722)
|
||||
# spec file for package gnome-shell (Version 2.27.0)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -32,18 +32,14 @@ BuildRequires: libgnomeui-devel
|
||||
BuildRequires: librsvg-devel
|
||||
BuildRequires: libwnck-devel
|
||||
BuildRequires: mutter-devel
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: xorg-x11-devel
|
||||
# Needed by the patch
|
||||
BuildRequires: gnome-common
|
||||
License: GPL v2 or later
|
||||
Group: System/GUI/GNOME
|
||||
Version: 0.0.1~20090722
|
||||
Version: 2.27.0
|
||||
Release: 1
|
||||
%define _version 0.0.1
|
||||
Summary: GNOME Shell
|
||||
Source: %{name}-%{_version}.tar.bz2
|
||||
# PATCH-FIX-UPSTREAM gnome-shell-clutter-1.0.patch vuntz@novell.com -- Fix build with clutter 1.0
|
||||
Patch0: gnome-shell-clutter-1.0.patch
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
# PATCH-FIX-OPENSUSE gnome-shell-libmozjs.patch vuntz@novell.com -- LD_LIBRARY_PATH neeeds to be set on 11.1
|
||||
Patch99: gnome-shell-libmozjs.patch
|
||||
# mutter-devel doesn't automatically bring mutter
|
||||
@ -57,8 +53,7 @@ particular, it offers new paradigms for launching applications, accessing
|
||||
documents, and organizing open windows in GNOME.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{_version}
|
||||
%patch0 -p1
|
||||
%setup -q
|
||||
%if %suse_version <= 1110
|
||||
%patch99 -p1
|
||||
%endif
|
||||
@ -68,7 +63,6 @@ documents, and organizing open windows in GNOME.
|
||||
# ugly workaround for a build failure on 11.1. The same workaround seems to be needed on Ubuntu.
|
||||
export LD_LIBRARY_PATH=%{_libdir}/xulrunner-1.9
|
||||
%endif
|
||||
NOCONFIGURE=1 gnome-autogen.sh
|
||||
%configure \
|
||||
--libexecdir=%{_libexecdir}/%{name} \
|
||||
--disable-static
|
||||
@ -77,8 +71,8 @@ NOCONFIGURE=1 gnome-autogen.sh
|
||||
%install
|
||||
%makeinstall
|
||||
find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} +
|
||||
%suse_update_desktop_file %{name}
|
||||
%find_gconf_schemas
|
||||
cat %{name}.schemas_list >%{name}.lst
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
@ -89,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%preun -f %{name}.schemas_preun
|
||||
|
||||
%files -f %{name}.lst
|
||||
%files -f %{name}.schemas_list
|
||||
%defattr(-,root,root)
|
||||
%doc COPYING
|
||||
%{_bindir}/*
|
||||
@ -98,6 +92,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_libdir}/gnome-shell
|
||||
%endif
|
||||
%{_libdir}/mutter/plugins/*.so
|
||||
%{_datadir}/applications/*.desktop
|
||||
%{_datadir}/gnome-shell
|
||||
|
||||
%changelog
|
||||
|
Loading…
Reference in New Issue
Block a user