Author: kiesiu Date: Tue Sep 27 22:11:32 2011 GMT Module: packages Tag: HEAD ---- Log message: - updated to 3.2.0; merged from DEVEL
---- Files affected: packages/gnome-shell: gnome-shell.spec (1.25 -> 1.26) ---- Diffs: ================================================================ Index: packages/gnome-shell/gnome-shell.spec diff -u packages/gnome-shell/gnome-shell.spec:1.25 packages/gnome-shell/gnome-shell.spec:1.26 --- packages/gnome-shell/gnome-shell.spec:1.25 Fri Sep 9 20:02:00 2011 +++ packages/gnome-shell/gnome-shell.spec Wed Sep 28 00:11:26 2011 @@ -1,54 +1,62 @@ # $Revision$, $Date$ Summary: Window manager and application launcher for GNOME Name: gnome-shell -Version: 3.0.2 -Release: 7 +Version: 3.2.0 +Release: 1 License: GPL v2+ Group: X11/Window Managers -Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/3.0/%{name}-%{version}.tar.bz2 -# Source0-md5: ea5194dc27301ca7ee00a97f5f3ab625 +Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/3.2/%{name}-%{version}.tar.xz +# Source0-md5: 684d7620f1dfd144b2d97ab970daa1ad URL: http://live.gnome.org/GnomeShell BuildRequires: GConf2-devel BuildRequires: NetworkManager-devel >= 0.8.999 BuildRequires: autoconf >= 2.63 -BuildRequires: automake >= 1:1.10 -BuildRequires: clutter-devel >= 1.6.0 +BuildRequires: automake >= 1:1.11 +BuildRequires: clutter-devel >= 1.7.5 BuildRequires: dbus-glib-devel -BuildRequires: evolution-data-server-devel >= 3.0.0 -BuildRequires: gettext-devel -BuildRequires: gjs-devel >= 0.7.11 -BuildRequires: glib2-devel >= 1:2.28.0 -BuildRequires: gnome-bluetooth-devel >= 3.0.0 -BuildRequires: gnome-desktop-devel >= 3.0.0 -BuildRequires: gnome-menus-devel +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: glib2-devel >= 1:2.29.10 +BuildRequires: gnome-bluetooth-devel >= 3.1.0 +BuildRequires: gnome-desktop-devel >= 3.1.90 +BuildRequires: gnome-menus-devel >= 3.1.90 BuildRequires: gobject-introspection-devel >= 0.10.1 -BuildRequires: gsettings-desktop-schemas-devel >= 3.0.0 +BuildRequires: gsettings-desktop-schemas-devel >= 3.1.90 BuildRequires: gstreamer-devel >= 0.10.21 BuildRequires: gstreamer-plugins-base-devel >= 0.10.21 BuildRequires: gtk+3-devel >= 3.0.0 -BuildRequires: intltool >= 0.26 +BuildRequires: intltool >= 0.40 +BuildRequires: json-glib-devel >= 0.13.90 BuildRequires: libcanberra-devel -BuildRequires: libcroco-devel +BuildRequires: libcroco-devel >= 0.6.2 +BuildRequires: libgnome-keyring-devel +BuildRequires: libsoup-devel BuildRequires: libtool >= 2:2.2.6 BuildRequires: libxml2-devel -BuildRequires: mutter-devel >= 3.0.1 +BuildRequires: mutter-devel >= 3.2.0 BuildRequires: pkgconfig >= 1:0.22 BuildRequires: polkit-devel >= 0.100 BuildRequires: pulseaudio-devel BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.601 -BuildRequires: startup-notification-devel -BuildRequires: telepathy-glib-devel >= 0.14.0 +BuildRequires: startup-notification-devel >= 0.11 +BuildRequires: tar >= 1:1.22 +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 -Requires: gnome-bluetooth-libs >= 3.0.0 -Requires: gnome-settings-daemon >= 3.0.0 -Requires: gsettings-desktop-schemas >= 0.1.7 -Requires: mutter >= 3.0.1 +Requires: caribou >= 0.3.5 +Requires: evolution-data-server >= 3.1.90 +Requires: gnome-bluetooth-libs >= 3.1.0 +Requires: gnome-settings-daemon >= 3.1.90 +Requires: gsettings-desktop-schemas >= 3.1.90 +Requires: mutter >= 3.1.91.1 %requires_eq xulrunner-libs Suggests: gnome-icon-theme-symbolic >= 3.0.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -61,6 +69,24 @@ user interface concepts to provide a delightful and easy to use experience. +%package -n browser-plugin-%{name} +Summary: gnome-shell plugin for WWW browsers +Summary(pl.UTF-8): Wtyczka gnome-shell do przeglądarek WWW +Group: X11/Libraries +Requires: %{name} = %{version}-%{release} +Requires: browser-plugins >= 2.0 +Requires: browser-plugins(%{_target_base_arch}) +Provides: mozilla-firefox-plugin-gnome-shell = %{version}-%{release} +Provides: mozilla-plugin-gnome-shell = %{version}-%{release} +Obsoletes: mozilla-firefox-plugin-gnome-shell < %{version}-%{release} +Obsoletes: mozilla-plugin-gnome-shell < %{version}-%{release} + +%description -n browser-plugin-%{name} +gnome-shell plugin for WWW browsers. + +%description -n browser-plugin-%{name} -l pl.UTF-8 +Wtyczka gnome-shell do przeglądarek WWW. + %prep %setup -q @@ -73,6 +99,7 @@ %{__automake} export LD_LIBRARY_PATH=%{_libdir}/xulrunner %configure \ + --with-ca-certificates=/etc/certs/ca-certificates.crt \ --disable-schemas-install \ --disable-silent-rules \ --disable-static @@ -83,7 +110,8 @@ install -d $RPM_BUILD_ROOT%{_datadir}/gnome-shell/extensions %{__make} install \ - DESTDIR=$RPM_BUILD_ROOT + DESTDIR=$RPM_BUILD_ROOT \ + mozillalibdir=%{_browserpluginsdir} # TODO use rpath at link time instead of this hack mv $RPM_BUILD_ROOT%{_bindir}/gnome-shell{,.bin} @@ -95,7 +123,8 @@ EOF chmod a+rx $RPM_BUILD_ROOT%{_bindir}/gnome-shell -%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-shell/libgnome-shell.la +%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-shell/libgnome-shell.la \ + $RPM_BUILD_ROOT%{_browserpluginsdir}/*.la %find_lang %{name} @@ -114,32 +143,48 @@ %glib_compile_schemas fi +%post -n browser-plugin-%{name} +%update_browser_plugins + +%postun -n browser-plugin-%{name} +if [ "$1" = 0 ]; then + %update_browser_plugins +fi + %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) %{_libdir}/gnome-shell-calendar-server -%attr(755,root,root) %{_libdir}/gnome-shell-perf-helper +%attr(755,root,root) %{_libexecdir}/gnome-shell-calendar-server +%attr(755,root,root) %{_libexecdir}/gnome-shell-hotplug-sniffer +%attr(755,root,root) %{_libexecdir}/gnome-shell-perf-helper %{_sysconfdir}/gconf/schemas/gnome-shell.schemas %dir %{_libdir}/gnome-shell %attr(755,root,root) %{_libdir}/gnome-shell/libgnome-shell.so -%{_libdir}/gnome-shell/Gdm-1.0.typelib %{_libdir}/gnome-shell/Gvc-1.0.typelib %{_libdir}/gnome-shell/Shell-0.1.typelib %{_libdir}/gnome-shell/St-1.0.typelib %{_datadir}/dbus-1/services/org.gnome.Shell.CalendarServer.service +%{_datadir}/dbus-1/services/org.gnome.Shell.HotplugSniffer.service %{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.xml %{_datadir}/gnome-shell %{_desktopdir}/gnome-shell.desktop %{_mandir}/man1/gnome-shell.1* +%files -n browser-plugin-%{name} +%defattr(644,root,root,755) +%attr(755,root,root) %{_browserpluginsdir}/libgnome-shell-browser-plugin.so + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[email protected]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.26 2011/09/27 22:11:26 kiesiu +- updated to 3.2.0; merged from DEVEL + Revision 1.25 2011/09/09 18:02:00 arekm - release 7 @@ -152,6 +197,37 @@ Revision 1.22 2011/07/22 21:50:36 baggins - rel 4 - create/package directory for gnome-shell extensions + +Revision 1.21.2.10 2011/09/25 16:09:42 kiesiu +- updated BRs + +Revision 1.21.2.9 2011/09/21 17:30:51 megabajt +- updated to 3.1.92 + +Revision 1.21.2.8 2011/09/15 09:36:06 wiget +- up to 3.1.91.1 +- added browser-plugin-gnome-shell subpackage + +Revision 1.21.2.7 2011/09/07 14:07:26 wiget +- up to 3.1.91 + +Revision 1.21.2.6 2011/09/01 23:44:52 patrys +- bump folks requirement + +Revision 1.21.2.5 2011/09/01 23:31:29 patrys +- bump e-d-s requirement + +Revision 1.21.2.4 2011/09/01 22:17:38 patrys +- R: caribou + +Revision 1.21.2.3 2011/09/01 21:40:53 patrys +- 3.1.90.1 + +Revision 1.21.2.2 2011/07/29 16:39:00 patrys +- 3.1.4 + +Revision 1.21.2.1 2011/07/11 09:30:04 patrys +- 3.1.3 Revision 1.21 2011/06/23 16:05:02 kiesiu - S: gnome-icon-theme-symbolic ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-shell/gnome-shell.spec?r1=1.25&r2=1.26&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
