Author: spturtle
Date: Fri Feb 16 20:43:27 2007
New Revision: 122025
Added:
packages/cooker/seamonkey/current/SOURCES/mozilla-firefox-bookmarks-mdk2006.tar.bz2
- copied unchanged from r122024,
/packages/cooker/mozilla-firefox/current/SOURCES/mozilla-firefox-bookmarks-mdk2006.tar.bz2
Removed:
packages/cooker/seamonkey/current/SOURCES/mozilla-bookmarks-mdk2006.tar.bz2
Modified:
packages/cooker/seamonkey/current/SPECS/seamonkey.spec
Log:
- sync bookmarks with mozilla-firefox
- fix seamonkey-nss.pc and seamonkey-nspr.pc symlinks for new nss and nspr
packages
Modified: packages/cooker/seamonkey/current/SPECS/seamonkey.spec
==============================================================================
--- packages/cooker/seamonkey/current/SPECS/seamonkey.spec (original)
+++ packages/cooker/seamonkey/current/SPECS/seamonkey.spec Fri Feb 16
20:43:27 2007
@@ -86,13 +86,13 @@
Name: seamonkey
Summary: SeaMonkey, open-source web browser
Version: 1.1
-Release: %mkrel 1
+Release: %mkrel 2
License: MPL
Source0:
ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/seamonkey-%{version}.source.tar.bz2
Source2: seamonkey16.png
Source3: seamonkey32.png
Source4: seamonkey64.png
-Source5: mozilla-bookmarks-mdk2006.tar.bz2
+Source5: mozilla-firefox-bookmarks-mdk2006.tar.bz2
Source6: mozilla-1.7-libart_lgpl.tar.bz2
%if %{enable_l10n}
Source99: locale.alias
@@ -226,8 +226,8 @@
%endif
BuildRequires: gtk+2-devel >= 2.4.0
BuildRequires: gnome-vfs2-devel
+BuildRequires: libgnomeui2-devel
BuildRequires: krb-devel
-BuildRequires: automake1.8
%if %{mdkversion} >= 200610
BuildRequires: rootcerts >= 20060621
@@ -578,16 +578,19 @@
--enable-pie \
%endif
--disable-tests \
- --enable-crypto --enable-nspr-autoconf \
+ --enable-crypto \
+%if %{build_nspr_nss}
+ --enable-nspr-autoconf \
+ --without-system-nspr \
+ --without-system-nss \
+%else
+ --with-system-nspr \
+ --with-system-nss \
+%endif
--with-default-mozilla-five-home=%{mozillalibdir} \
--enable-extensions --disable-short-wchar \
--enable-xinerama \
--enable-mathml \
-%if %{build_nspr_nss}
- --without-system-nspr --without-system-nss \
-%else
- --with-system-npsr --with-system-nss \
-%endif
--with-system-zlib --with-system-png \
--enable-system-cairo \
--with-system-jpeg --enable-ipv6 \
@@ -1141,8 +1144,8 @@
$RPM_BUILD_ROOT%{_libdir}/pkgconfig/seamonkey-{nspr,nss}.pc \
$RPM_BUILD_ROOT%{_datadir}/aclocal/nspr.m4
sed -i -e 's/mozilla-nspr = %{version}/mozilla-nspr/'
$RPM_BUILD_ROOT%{_libdir}/pkgconfig/seamonkey-xpcom.pc
$RPM_BUILD_ROOT%{_libdir}/pkgconfig/seamonkey-js.pc
-ln -s mozilla-firefox-nspr.pc
%{buildroot}%{_libdir}/pkgconfig/seamonkey-nspr.pc
-ln -s mozilla-firefox-nss.pc %{buildroot}%{_libdir}/pkgconfig/seamonkey-nss.pc
+ln -s nspr.pc %{buildroot}%{_libdir}/pkgconfig/seamonkey-nspr.pc
+ln -s nss.pc %{buildroot}%{_libdir}/pkgconfig/seamonkey-nss.pc
%endif
# multiarch
