Author: qboosh Date: Sun Jul 20 17:42:16 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- updated nspr deps (4.7 now)
- separated -gnome subpackage; main no longer requires GNOME libraries now;
the only difference in main package between gnome and non-gnome build is
GNOME support in libimgicon.so, implemented by dlopening of libgnome-2,
libgnomeui-2 and libgnomevfs-2 - so it can be safely used without GNOME
---- Files affected:
SPECS:
xulrunner.spec (1.70 -> 1.71)
---- Diffs:
================================================================
Index: SPECS/xulrunner.spec
diff -u SPECS/xulrunner.spec:1.70 SPECS/xulrunner.spec:1.71
--- SPECS/xulrunner.spec:1.70 Thu Jul 10 10:27:35 2008
+++ SPECS/xulrunner.spec Sun Jul 20 19:42:10 2008
@@ -1,8 +1,5 @@
# $Revision$, $Date$
#
-# TODO:
-# - check & review pkgconfig files provided by xulrunner
-#
# Conditional build:
%bcond_with tests # enable tests (whatever they check)
%bcond_without gnome # disable all GNOME components (gnomevfs,
gnome, gnomeui)
@@ -51,7 +48,7 @@
BuildRequires: libpng-devel >= 1.2.7
BuildRequires: libstdc++-devel
%{?with_mozldap:BuildRequires: mozldap-devel >= 6.0}
-BuildRequires: nspr-devel >= 1:4.6.4
+BuildRequires: nspr-devel >= 1:4.7
BuildRequires: nss-devel >= 1:3.12-2
BuildRequires: pango-devel >= 1:1.6.0
BuildRequires: perl-modules >= 5.004
@@ -70,7 +67,7 @@
Requires(post): mktemp >= 1.5-18
Requires: %{name}-libs = %{version}-%{release}
Requires: browser-plugins >= 2.0
-Requires: nspr >= 1:4.6.4
+Requires: nspr >= 1:4.7
Requires: nss >= 1:3.12-2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -113,7 +110,7 @@
Summary(pl.UTF-8): Pliki nagłówkowe do tworzenia programów używających
XULRunnera
Group: X11/Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
-Requires: nspr-devel >= 1:4.6.4
+Requires: nspr-devel >= 1:4.7
Requires: nss-devel >= 1:3.12-2
Obsoletes: mozilla-devel
Obsoletes: mozilla-firefox-devel
@@ -125,6 +122,18 @@
%description devel -l pl.UTF-8
Pakiet programistyczny XULRunnera.
+%package gnome
+Summary: GNOME support package for XULRunner
+Summary(pl.UTF-8): Pakiet wspierający integrację XULRunnera z GNOME
+Group: X11/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description gnome
+GNOME support package for XULRunner.
+
+%description gnome -l pl.UTF-8
+Pakiet wspierający integrację XULRunnera z GNOME.
+
%prep
%setup -qc
cd mozilla
@@ -312,14 +321,8 @@
%attr(755,root,root) %{_libdir}/%{name}/*.sh
%attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client
-%if %{with gnome}
-%attr(755,root,root) %{_libdir}/%{name}/components/libimgicon.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libnkgnomevfs.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libmozgnome.so
-%{_libdir}/%{name}/components/imgicon.xpt
-%endif
-
%attr(755,root,root) %{_libdir}/%{name}/components/libdbusservice.so
+%attr(755,root,root) %{_libdir}/%{name}/components/libimgicon.so
%{_libdir}/%{name}/components/accessibility*.xpt
%{_libdir}/%{name}/components/alerts.xpt
@@ -351,6 +354,7 @@
%{_libdir}/%{name}/components/find.xpt
%{_libdir}/%{name}/components/gfx*.xpt
%{_libdir}/%{name}/components/htmlparser.xpt
+%{_libdir}/%{name}/components/imgicon.xpt
%{_libdir}/%{name}/components/imglib2.xpt
%{_libdir}/%{name}/components/inspector.xpt
%{_libdir}/%{name}/components/intl.xpt
@@ -466,7 +470,21 @@
%{_includedir}/%{name}
%{_datadir}/idl/%{name}
%{_libdir}/%{name}-sdk
-%{_pkgconfigdir}/*.pc
+%{_pkgconfigdir}/libxul.pc
+%{_pkgconfigdir}/libxul-embedding.pc
+%{_pkgconfigdir}/libxul-embedding-unstable.pc
+%{_pkgconfigdir}/libxul-unstable.pc
+%{_pkgconfigdir}/mozilla-js.pc
+%{_pkgconfigdir}/mozilla-plugin.pc
+%{_pkgconfigdir}/mozilla-gtkmozembed.pc
+%{_pkgconfigdir}/mozilla-gtkmozembed-embedding.pc
+
+%if %{with gnome}
+%files gnome
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/components/libmozgnome.so
+%attr(755,root,root) %{_libdir}/%{name}/components/libnkgnomevfs.so
+%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -474,6 +492,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.71 2008/07/20 17:42:10 qboosh
+- updated nspr deps (4.7 now)
+- separated -gnome subpackage; main no longer requires GNOME libraries now;
+ the only difference in main package between gnome and non-gnome build is
+ GNOME support in libimgicon.so, implemented by dlopening of libgnome-2,
+ libgnomeui-2 and libgnomevfs-2 - so it can be safely used without GNOME
+
Revision 1.70 2008/07/10 08:27:35 blues
- rel.6
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xulrunner.spec?r1=1.70&r2=1.71&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
