Author: kiesiu Date: Wed Jan 18 22:42:32 2012 GMT Module: packages Tag: HEAD ---- Log message: - get rid of xulrunner dependency, BR gjs-devel >= 1.30.1, link against SpiderMonkey - removed rpatch xulrunner hack - rel. 7
---- Files affected: packages/gnome-shell: gnome-shell.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: packages/gnome-shell/gnome-shell.spec diff -u packages/gnome-shell/gnome-shell.spec:1.35 packages/gnome-shell/gnome-shell.spec:1.36 --- packages/gnome-shell/gnome-shell.spec:1.35 Thu Dec 22 08:06:55 2011 +++ packages/gnome-shell/gnome-shell.spec Wed Jan 18 23:42:27 2012 @@ -2,7 +2,7 @@ Summary: Window manager and application launcher for GNOME Name: gnome-shell Version: 3.2.1 -Release: 6 +Release: 7 License: GPL v2+ Group: X11/Window Managers Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/3.2/%{name}-%{version}.tar.xz @@ -19,7 +19,7 @@ BuildRequires: evolution-data-server-devel >= 3.1.90 BuildRequires: folks-devel >= 0.6.1 BuildRequires: gettext-devel >= 0.17 -BuildRequires: gjs-devel >= 1.29.18 +BuildRequires: gjs-devel >= 1.30.1 BuildRequires: glib2-devel >= 1:2.29.10 BuildRequires: gnome-bluetooth-devel >= 3.1.0 BuildRequires: gnome-desktop-devel >= 3.1.90 @@ -48,8 +48,6 @@ BuildRequires: telepathy-glib-devel >= 0.15.5 BuildRequires: telepathy-logger-devel >= 0.2.4 BuildRequires: xorg-lib-libXfixes-devel -# for libmozjs.so -BuildRequires: xulrunner-libs BuildRequires: xz Requires(post,postun): glib2 >= 1:2.26.0 Requires(post,preun): GConf2 @@ -62,7 +60,6 @@ Requires: mutter >= 3.2.1 Requires: nautilus >= 3.2.0 Requires: telepathy-logger >= 0.2.4 -%requires_eq xulrunner-libs Suggests: gnome-contacts >= 3.2.0 Suggests: gnome-icon-theme-symbolic >= 3.0.0 Provides: gdm-wm = 3.2.1-1 @@ -106,7 +103,6 @@ %{__autoconf} %{__autoheader} %{__automake} -export LD_LIBRARY_PATH=%{_libdir}/xulrunner %configure \ --with-ca-certificates=/etc/certs/ca-certificates.crt \ --disable-schemas-install \ @@ -124,16 +120,6 @@ DESTDIR=$RPM_BUILD_ROOT \ mozillalibdir=%{_browserpluginsdir} -# TODO use rpath at link time instead of this hack -mv $RPM_BUILD_ROOT%{_bindir}/gnome-shell{,.bin} -cat > $RPM_BUILD_ROOT%{_bindir}/gnome-shell <<'EOF' -#!/bin/sh -LD_LIBRARY_PATH=%{_libdir}/xulrunner -export LD_LIBRARY_PATH -exec %{_bindir}/gnome-shell.bin "$@" -EOF -chmod a+rx $RPM_BUILD_ROOT%{_bindir}/gnome-shell - %{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-shell/libgnome-shell.la \ $RPM_BUILD_ROOT%{_browserpluginsdir}/*.la @@ -165,7 +151,6 @@ %files -f %{name}.lang %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/gnome-shell -%attr(755,root,root) %{_bindir}/gnome-shell.bin %attr(755,root,root) %{_bindir}/gnome-shell-extension-tool %attr(755,root,root) %{_libexecdir}/gnome-shell-calendar-server %attr(755,root,root) %{_libexecdir}/gnome-shell-hotplug-sniffer @@ -193,6 +178,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.36 2012/01/18 22:42:27 kiesiu +- get rid of xulrunner dependency, BR gjs-devel >= 1.30.1, link against SpiderMonkey +- removed rpatch xulrunner hack +- rel. 7 + Revision 1.35 2011/12/22 07:06:55 arekm - release 6 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-shell/gnome-shell.spec?r1=1.35&r2=1.36&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
