OBS User unknown 2009-08-04 22:44:20 +00:00 committed by Git OBS Bridge
commit 1e929e5b79
8 changed files with 257 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3d9646521da40853c3e99f8bb01dabd6ab68fdc53202aed5569dd02e7d4d6cc4
size 426885

View File

@ -0,0 +1,64 @@
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 \

View File

@ -0,0 +1,23 @@
Index: gnome-shell-0.0.1/src/gnome-shell.in
===================================================================
--- gnome-shell-0.0.1.orig/src/gnome-shell.in
+++ gnome-shell-0.0.1/src/gnome-shell.in
@@ -151,6 +151,18 @@ def start_shell():
mozjs_libdir = re.sub('-(sdk|devel)', '', mozjs_sdkdir)
if os.path.exists(mozjs_libdir + '/libmozjs.so'):
env['LD_LIBRARY_PATH'] = os.environ.get('LD_LIBRARY_PATH', '') + ':' + mozjs_libdir
+ else:
+ # code taken from jhbuild
+ uname = os.uname()
+ use_lib64 = (uname[0], uname[4]) in [ ('Linux', 'x86_64'),
+ ('Linux', 'ppc64'),
+ ('Linux', 's390x') ]
+ del uname
+ if use_lib64:
+ mozjs_libdir = '/usr/lib64/xulrunner-1.9'
+ else:
+ mozjs_libdir = '/usr/lib/xulrunner-1.9'
+ env['LD_LIBRARY_PATH'] = os.environ.get('LD_LIBRARY_PATH', '') + ':' + mozjs_libdir
if not options.verbose:
# Unless verbose() is specified, only let gjs show errors and

40
gnome-shell.changes Normal file
View File

@ -0,0 +1,40 @@
-------------------------------------------------------------------
Mon Aug 3 21:00:31 CEST 2009 - vuntz@novell.com
- Add gnome-shell-clutter-1.0.patch to fix build with clutter 1.0,
and add gnome-common BuildRequires and gnome-autogen.sh call.
-------------------------------------------------------------------
Wed Jul 22 03:22:20 CEST 2009 - vuntz@novell.com
- Update to git as of today.
- Use libexecdir.
-------------------------------------------------------------------
Fri Jul 17 18:19:50 CEST 2009 - vuntz@novell.com
- Change clutter-unstable-devel BuildRequires to clutter-devel.
-------------------------------------------------------------------
Thu May 14 14:46:07 CEST 2009 - vuntz@novell.com
- Update to git version as of May 14th.
- Drop gnome-shell-no-static-lib.patch: fixed upstream.
-------------------------------------------------------------------
Mon May 4 14:02:25 CEST 2009 - vuntz@novell.com
- Try to fix build on 11.1.
-------------------------------------------------------------------
Mon May 4 03:58:09 CEST 2009 - vuntz@novell.com
- Add tarball created from git, with a patch to adapt for the
mutter rename (included in the tarball, unforunately, since I
couldn't generate the tarball without the patch).
-------------------------------------------------------------------
Fri May 1 19:36:14 CEST 2009 - vuntz@novell.com
- Initial package.

103
gnome-shell.spec Normal file
View File

@ -0,0 +1,103 @@
#
# spec file for package gnome-shell (Version 0.0.1~20090722)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: gnome-shell
BuildRequires: clutter-devel
BuildRequires: dbus-1-glib-devel
BuildRequires: gconf2-devel
BuildRequires: gir-repository
BuildRequires: gnome-menus-devel
BuildRequires: gstreamer-0_10-devel
BuildRequires: gstreamer-0_10-plugins-base-devel
BuildRequires: gtk2-devel
BuildRequires: libgjs-devel
BuildRequires: libgnomeui-devel
BuildRequires: librsvg-devel
BuildRequires: libwnck-devel
BuildRequires: mutter-devel
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
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
# 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
Requires: mutter
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%gconf_schemas_prereq
%description
The GNOME Shell redefines user interactions with the GNOME desktop. In
particular, it offers new paradigms for launching applications, accessing
documents, and organizing open windows in GNOME.
%prep
%setup -q -n %{name}-%{_version}
%patch0 -p1
%if %suse_version <= 1110
%patch99 -p1
%endif
%build
%if %suse_version <= 1110
# 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
%__make %{?jobs:-j%jobs}
%install
%makeinstall
find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} +
%find_gconf_schemas
cat %{name}.schemas_list >%{name}.lst
%clean
rm -rf $RPM_BUILD_ROOT
%pre -f %{name}.schemas_pre
%posttrans -f %{name}.schemas_posttrans
%preun -f %{name}.schemas_preun
%files -f %{name}.lst
%defattr(-,root,root)
%doc COPYING
%{_bindir}/*
%{_libexecdir}/gnome-shell
%if "%{_libdir}" != "%{_libexecdir}"
%{_libdir}/gnome-shell
%endif
%{_libdir}/mutter/plugins/*.so
%{_datadir}/gnome-shell
%changelog

0
ready Normal file
View File