Author: qboosh Date: Sat Mar 26 19:34:27 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- gnome-related update: gnomevfs bcond is gone (gio is used instead), gnome
module
integrates GIO, GConf, libnotify and (bconditionaly) gnomeui
---- Files affected:
packages/xulrunner:
xulrunner.spec (1.176 -> 1.177)
---- Diffs:
================================================================
Index: packages/xulrunner/xulrunner.spec
diff -u packages/xulrunner/xulrunner.spec:1.176
packages/xulrunner/xulrunner.spec:1.177
--- packages/xulrunner/xulrunner.spec:1.176 Thu Mar 24 12:15:48 2011
+++ packages/xulrunner/xulrunner.spec Sat Mar 26 20:34:21 2011
@@ -3,13 +3,11 @@
# Conditional build:
%bcond_with tests # enable tests (whatever they check)
%bcond_without gnomeui # disable gnomeui support
-%bcond_without gnomevfs # disable GNOME comp. (gconf+libgnome+gnomevfs)
and gnomevfs ext.
-%bcond_without gnome # disable all GNOME components
(gnome+gnomeui+gnomevfs)
+%bcond_without gnome # synonym for gnomeui (gconf, libnotify and gio
are still enabled)
%bcond_with qt # build with qt toolkit
%if %{without gnome}
%undefine with_gnomeui
-%undefine with_gnomevfs
%endif
# On updating version, grab CVE links from:
@@ -45,7 +43,7 @@
Patch8: %{name}-ssl_oldapi.patch
Patch9: %{name}-ppc.patch
URL: http://developer.mozilla.org/en/docs/XULRunner
-%{?with_gnomevfs:BuildRequires: GConf2-devel >= 1.2.1}
+%{!?with_qt:BuildRequires: GConf2-devel >= 1.2.1}
BuildRequires: alsa-lib-devel
BuildRequires: automake
BuildRequires: bzip2-devel
@@ -60,7 +58,7 @@
%{?with_gnomeui:BuildRequires: libgnomeui-devel >= 2.2.0}
BuildRequires: libiw-devel
BuildRequires: libjpeg-devel >= 6b
-BuildRequires: libnotify-devel >= 0.4
+%{!?with_qt:BuildRequires: libnotify-devel >= 0.4}
BuildRequires: libpng(APNG)-devel >= 0.10
BuildRequires: libpng-devel >= 1.2.17
BuildRequires: libstdc++-devel
@@ -162,10 +160,12 @@
Requires: %{name} = %{epoch}:%{version}-%{release}
%description gnome
-GNOME support package for XULRunner.
+GNOME support package for XULRunner. It integrates GConf, GIO,
+libnotify%{?with_gnomeui: and GNOME UI}.
%description gnome -l pl.UTF-8
-Pakiet wspierający integrację XULRunnera z GNOME.
+Pakiet wspierający integrację XULRunnera z GNOME. Obejmuje komponenty
+GConf, GIO, libnotify%{?with_gnomeui: oraz GNOME UI}.
%prep
%setup -qc
@@ -582,13 +582,11 @@
%{_pkgconfigdir}/mozilla-gtkmozembed.pc
%{_pkgconfigdir}/mozilla-gtkmozembed-embedding.pc
-%if %{with gnomevfs} || %{with gnomeui}
+%if %{without qt}
%files gnome
%defattr(644,root,root,755)
-%if %{with gnomeui}
%attr(755,root,root) %{_libdir}/%{name}/components/libmozgnome.so
%endif
-%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -596,6 +594,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.177 2011/03/26 19:34:21 qboosh
+- gnome-related update: gnomevfs bcond is gone (gio is used instead), gnome
module
+ integrates GIO, GConf, libnotify and (bconditionaly) gnomeui
+
Revision 1.176 2011/03/24 11:15:48 arekm
- rel 1; Fore-port-nsIBadCertListener-from-1.8.patch from debian as our
xulrunner-ssl_oldapi.patch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner.spec?r1=1.176&r2=1.177&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
