SPECS: seamonkey.spec - AC-branch merge: hawk: - don't use BUI...
glen
glen at pld-linux.org
Tue Jan 30 00:16:40 CET 2007
Author: glen Date: Mon Jan 29 23:16:40 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- AC-branch merge:
hawk:
- don't use BUILD_OFFICIAL/MOZILLA_OFFICIAL, we are not allowed to do so
- s/SeaMonkey/SeaMonkey Community Edition/
glen:
- drop -devel (use xulrunner-devel)
- drop bogus deps
---- Files affected:
SPECS:
seamonkey.spec (1.52 -> 1.53)
---- Diffs:
================================================================
Index: SPECS/seamonkey.spec
diff -u SPECS/seamonkey.spec:1.52 SPECS/seamonkey.spec:1.53
--- SPECS/seamonkey.spec:1.52 Mon Jan 22 21:31:18 2007
+++ SPECS/seamonkey.spec Tue Jan 30 00:16:31 2007
@@ -7,13 +7,13 @@
%bcond_without svg # disable svg support
#
%define _enigmail_ver 0.94.2
-Summary: SeaMonkey - web browser
-Summary(es): Navegador de Internet SeaMonkey
-Summary(pl): SeaMonkey - przeglądarka WWW
-Summary(pt_BR): Navegador SeaMonkey
+Summary: SeaMonkey Community Edition - web browser
+Summary(es): Navegador de Internet SeaMonkey Community Edition
+Summary(pl): SeaMonkey Community Edition - przeglądarka WWW
+Summary(pt_BR): Navegador SeaMonkey Community Edition
Name: seamonkey
Version: 1.1
-Release: 1
+Release: 2
License: Mozilla Public License
Group: X11/Applications/Networking
Source0: ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/%{name}-%{version}.source.tar.bz2
@@ -31,8 +31,6 @@
Patch3: %{name}-lib_path.patch
Patch4: %{name}-fonts.patch
URL: http://www.mozilla.org/projects/seamonkey/
-BuildRequires: /bin/csh
-BuildRequires: /bin/ex
BuildRequires: automake
%{?with_svg:BuildRequires: cairo-devel >= 1.0.0}
BuildRequires: freetype-devel >= 1:2.1.8
@@ -47,7 +45,6 @@
BuildRequires: perl-modules >= 5.6.0
BuildRequires: pkgconfig
BuildRequires: sed >= 4.0
-BuildRequires: tar >= 1:1.15.1
BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-lib-libXft-devel >= 2.1
BuildRequires: xorg-lib-libXinerama-devel
@@ -55,8 +52,8 @@
BuildRequires: xorg-lib-libXt-devel
BuildRequires: zip >= 2.1
BuildRequires: zlib-devel >= 1.2.3
-Requires(post,postun): /sbin/ldconfig
Requires(post,postun): %{name}-libs = %{epoch}:%{version}-%{release}
+Requires(post,postun): /sbin/ldconfig
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
%{?with_svg:Requires: cairo >= 1.0.0}
Requires: nspr >= 1:4.6.1
@@ -76,44 +73,43 @@
%define _noautoreqdep libgfxpsshar.so libgkgfx.so libgtkembedmoz.so libgtkxtbin.so libjsj.so libldap50.so libmozjs.so libprldap50.so libssldap50.so libxlibrgb.so libxpcom.so libxpcom_compat.so libxpcom_core.so libxpistub.so
%description
-SeaMonkey is an open-source web browser, designed for standards
-compliance, performance and portability.
+SeaMonkey Community Edition is an open-source web browser, designed
+for standards compliance, performance and portability.
%description -l es
-SeaMonkey es un navegador de Internet que se basa en una versión
-inicial de Netscape Communicator. Este software está en desarrollo,
-por lo cual todavía es inestable.
+SeaMonkey Community Edition es un navegador de Internet que se basa en
+una versión inicial de Netscape Communicator.
%description -l pl
-SeaMonkey jest potężną graficzną przeglądarką WWW, która jest następcą
-Mozilli, która następnie była następczynią Netscape Communikatora.
+SeaMonkey Community Edition jest potężną graficzną przeglądarką WWW,
+która jest następcą Mozilli, która następnie była następczynią
+Netscape Communikatora.
%description -l pt_BR
-O SeaMonkey é um web browser baseado numa versăo inicial do Netscape
-Communicator. Este software está em fase de desenvolvimento, portanto,
-ainda năo estável.
+O SeaMonkey Community Edition é um web browser baseado numa versăo
+inicial do Netscape Communicator.
%description -l ru
-SeaMonkey - ĐĎĚÎĎĆŐÎËĂÉĎÎÁĚŘÎŮĘ web-browser Ó ĎÔËŇŮÔŮÍÉ ÉÓČĎÄÎŮÍÉ
-ÔĹËÓÔÁÍÉ, ŇÁÚŇÁÂĎÔÁÎÎŮĘ ÄĚŃ ÍÁËÓÉÍÁĚŘÎĎÇĎ ÓĎĎÔ×ĹÓÔ×ÉŃ ÓÔÁÎÄÁŇÔÁÍ,
-ÍÁËÓÍÉÍÁĚŘÎĎĘ ĐĹŇĹÎĎÓÉÍĎÓÔÉ É ÓËĎŇĎÓÔÉ ŇÁÂĎÔŮ
+SeaMonkey Community Edition - ĐĎĚÎĎĆŐÎËĂÉĎÎÁĚŘÎŮĘ web-browser Ó
+ĎÔËŇŮÔŮÍÉ ÉÓČĎÄÎŮÍÉ ÔĹËÓÔÁÍÉ, ŇÁÚŇÁÂĎÔÁÎÎŮĘ ÄĚŃ ÍÁËÓÉÍÁĚŘÎĎÇĎ
+ÓĎĎÔ×ĹÓÔ×ÉŃ ÓÔÁÎÄÁŇÔÁÍ, ÍÁËÓÍÉÍÁĚŘÎĎĘ ĐĹŇĹÎĎÓÉÍĎÓÔÉ É ÓËĎŇĎÓÔÉ ŇÁÂĎÔŮ
%package libs
-Summary: SeaMonkey shared libraries
-Summary(pl): Biblioteki współdzielone SeaMonkey
+Summary: SeaMonkey Community Edition shared libraries
+Summary(pl): Biblioteki współdzielone SeaMonkey Community Edition
Group: Libraries
Obsoletes: mozilla-libs
%description libs
-SeaMonkey shared libraries.
+SeaMonkey Community Edition shared libraries.
%description libs -l pl
-Biblioteki współdzielone SeaMonkey.
+Biblioteki współdzielone SeaMonkey Community Edition.
%package mailnews
-Summary: SeaMonkey - programs for mail and news
-Summary(pl): SeaMonkey - programy do poczty i newsów
-Summary(ru): đĎŢÔĎ×ÁŃ ÓÉÓÔĹÍÁ ÎÁ ĎÓÎĎ×Ĺ SeaMonkey
+Summary: SeaMonkey Community Edition - programs for mail and news
+Summary(pl): SeaMonkey Community Edition - programy do poczty i newsów
+Summary(ru): đĎŢÔĎ×ÁŃ ÓÉÓÔĹÍÁ ÎÁ ĎÓÎĎ×Ĺ SeaMonkey Community Edition
Group: X11/Applications/Networking
Requires(post,postun): %{name} = %{epoch}:%{version}-%{release}
Requires(post,postun): /sbin/ldconfig
@@ -127,12 +123,12 @@
Programy pocztowe i obsługa newsów zintegrowane z przeglądarką.
%description mailnews -l ru
-ëĚÉĹÎÔ ĐĎŢÔŮ É ÎĎ×ĎÓÔĹĘ, ÎÁ ĎÓÎĎ×Ĺ SeaMonkey. đĎÄÄĹŇÖÉ×ÁĹÔ IMAP, POP É
-NNTP É ÉÍĹĹÔ ĐŇĎÓÔĎĘ ÉÎÔĹŇĆĹĘÓ ĐĎĚŘÚĎ×ÁÔĹĚŃ.
+ëĚÉĹÎÔ ĐĎŢÔŮ É ÎĎ×ĎÓÔĹĘ, ÎÁ ĎÓÎĎ×Ĺ SeaMonkey Community Edition.
+đĎÄÄĹŇÖÉ×ÁĹÔ IMAP, POP É NNTP É ÉÍĹĹÔ ĐŇĎÓÔĎĘ ÉÎÔĹŇĆĹĘÓ ĐĎĚŘÚĎ×ÁÔĹĚŃ.
%package addon-enigmail
-Summary: Enigmail %{_enigmail_ver} - PGP/GPG support for SeaMonkey
-Summary(pl): Enigmail %{_enigmail_ver} - obsługa PGP/GPG dla SeaMonkey
+Summary: Enigmail %{_enigmail_ver} - PGP/GPG support for SeaMonkey Community Edition
+Summary(pl): Enigmail %{_enigmail_ver} - obsługa PGP/GPG dla SeaMonkey Community Edition
Group: X11/Applications/Networking
Requires(post,postun): %{name}-mailnews = %{epoch}:%{version}-%{release}
Requires(post,postun): /sbin/ldconfig
@@ -150,37 +146,38 @@
funkcjonalności GnuPG.
%package chat
-Summary: SeaMonkey Chat - IRC client integratd with SeaMonkey
-Summary(pl): SeaMonkey Chat - zintegrowany z Mozillą klient IRC-a
+Summary: SeaMonkey Community Edition Chat - integrated IRC client
+Summary(pl): SeaMonkey Community Edition Chat - zintegrowany klient IRC-a
Group: X11/Applications/Networking
Requires(post,postun): %{name} = %{epoch}:%{version}-%{release}
Requires: %{name} = %{epoch}:%{version}-%{release}
Obsoletes: mozilla-chat
%description chat
-SeaMonkey Chat - IRC client that is integrated with the SeaMonkey web
-browser.
+SeaMonkey Community Edition Chat - IRC client that is integrated with
+the SeaMonkey Community Edition web browser.
%description chat -l pl
-SeaMonkey Chat - klient IRC-a zintegrowany z przeglądarką SeaMonkey.
+SeaMonkey Community Edition Chat - klient IRC-a zintegrowany z
+przeglądarką SeaMonkey Community Edition.
%package js-debugger
-Summary: JavaScript debugger for use with SeaMonkey
-Summary(pl): Odpluskwiacz JavaScriptu do używania z SeaMonkey
+Summary: JavaScript debugger for use with SeaMonkey Community Edition
+Summary(pl): Odpluskwiacz JavaScriptu do używania z SeaMonkey Community Edition
Group: X11/Applications/Networking
Requires(post,postun): %{name} = %{epoch}:%{version}-%{release}
Requires: %{name} = %{epoch}:%{version}-%{release}
Obsoletes: mozilla-js-debugger
%description js-debugger
-JavaScript debugger for use with SeaMonkey.
+JavaScript debugger for use with SeaMonkey Community Edition.
%description js-debugger -l pl
-Odpluskwiacz JavaScriptu do używania z SeaMonkey.
+Odpluskwiacz JavaScriptu do używania z SeaMonkey Community Edition.
%package dom-inspector
-Summary: A tool for inspecting the DOM of pages in SeaMonkey
-Summary(pl): Narzędzie do oglądania DOM stron w SeaMonkey
+Summary: A tool for inspecting the DOM of pages in SeaMonkey Community Edition
+Summary(pl): Narzędzie do oglądania DOM stron w SeaMonkey Community Edition
Group: X11/Applications/Networking
Requires(post,postun): %{name} = %{epoch}:%{version}-%{release}
Requires: %{name} = %{epoch}:%{version}-%{release}
@@ -188,13 +185,14 @@
%description dom-inspector
This is a tool that allows you to inspect the DOM for web pages in
-SeaMonkey. This is of great use to people who are doing SeaMonkey
-chrome development or web page development.
+SeaMonkey Community Edition. This is of great use to people who are
+doing SeaMonkey Community Edition chrome development or web page
+development.
%description dom-inspector -l pl
-To narzędzie pozwala na oglądanie DOM dla stron WWW w SeaMonkey. Jest
-bardzo przydatne dla ludzi rozwijających chrome w SeaMonkey lub
-tworzących strony WWW.
+To narzędzie pozwala na oglądanie DOM dla stron WWW w SeaMonkey
+Community Edition. Jest bardzo przydatne dla ludzi rozwijających
+chrome w SeaMonkey Community Edition lub tworzących strony WWW.
%package gnomevfs
Summary: Gnome-VFS module providing support for smb:// URLs
@@ -210,37 +208,10 @@
%description gnomevfs -l pl
Moduł Gnome-VFS dodający wsparcie dla URLi smb://.
-%package devel
-Summary: Headers for developing programs that will use SeaMonkey
-Summary(pl): SeaMonkey - pliki nagłówkowe i biblioteki
-Summary(pt_BR): Arquivos de inclusăo para desenvolvimento de programas que usam o SeaMonkey
-Summary(ru): ćÁĘĚŮ, ÎĹĎÂČĎÄÉÍŮĹ ÄĚŃ ÉÓĐĎĚŘÚĎ×ÁÎÉŃ ĐŇĎÇŇÁÍÍ, ×ËĚŔŢÁŔÝÉČ SeaMonkey
-Group: X11/Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: nspr-devel >= 1:4.6.1
-Provides: seamonkey-embedded-devel = %{epoch}:%{version}-%{release}
-Obsoletes: mozilla-devel
-Obsoletes: mozilla-firefox-devel
-
-%description devel
-SeaMonkey development package.
-
-%description devel -l pl
-Biblioteki i pliki nagłówkowe.
-
-%description devel -l pt_BR
-Arquivos de inclusăo para desenvolvimento de programas que usam o
-SeaMonkey.
-
-%description devel -l ru
-úÁÇĎĚĎ×ĎŢÎŮĹ ĆÁĘĚŮ, ÎĹĎÂČĎÄÉÍŮĹ ÄĚŃ ŇÁÚŇÁÂĎÔËÉ ĐŇĎÇŇÁÍÍ, ÉÓĐĹĎĚŘÚŐŔÝÉČ
-SeaMonkey
-
%prep
-%setup -q -c -T
-tar jxf %{SOURCE0} --strip-components=1
+%setup -qc
+cd mozilla
tar -C mailnews/extensions -zxf %{SOURCE1}
-
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -248,8 +219,7 @@
%patch4 -p1
%build
-BUILD_OFFICIAL="1"; export BUILD_OFFICIAL
-MOZILLA_OFFICIAL="1"; export MOZILLA_OFFICIAL
+cd mozilla
cp -f /usr/share/automake/config.* build/autoconf
cp -f /usr/share/automake/config.* nsprpub/build/autoconf
@@ -290,19 +260,18 @@
%{__make}
cd mailnews/extensions/enigmail
-sed 's/"mozilla"/"%{name}-%{version}"/g' -i makemake
./makemake -r
%{__make}
cd ../../..
%install
rm -rf $RPM_BUILD_ROOT
+cd mozilla
install -d \
$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_datadir}} \
$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} \
$RPM_BUILD_ROOT%{_datadir}/%{name}/{chrome,defaults,dictionaries,icons,greprefs,res,searchplugins} \
- $RPM_BUILD_ROOT%{_seamonkeydir}/{components,plugins} \
- $RPM_BUILD_ROOT{%{_includedir}/%{name}/idl,%{_pkgconfigdir}}
+ $RPM_BUILD_ROOT%{_seamonkeydir}/{components,plugins}
# preparing to create register
# remove empty directory trees
@@ -313,7 +282,6 @@
# creating and installing register
LD_LIBRARY_PATH="dist/bin" MOZILLA_FIVE_HOME="dist/bin" dist/bin/regxpcom
LD_LIBRARY_PATH="dist/bin" MOZILLA_FIVE_HOME="dist/bin" dist/bin/regchrome
-#install dist/bin/component.reg $RPM_BUILD_ROOT%{_seamonkeydir}
ln -sf ../../share/%{name}/chrome $RPM_BUILD_ROOT%{_chromedir}
ln -sf ../../share/%{name}/defaults $RPM_BUILD_ROOT%{_seamonkeydir}/defaults
@@ -330,27 +298,11 @@
cp -frL dist/bin/greprefs/* $RPM_BUILD_ROOT%{_datadir}/%{name}/greprefs
cp -frL dist/bin/res/* $RPM_BUILD_ROOT%{_datadir}/%{name}/res
cp -frL dist/bin/searchplugins/* $RPM_BUILD_ROOT%{_datadir}/%{name}/searchplugins
-cp -frL dist/idl/* $RPM_BUILD_ROOT%{_includedir}/%{name}/idl
-cp -frL dist/include/* $RPM_BUILD_ROOT%{_includedir}/%{name}
-cp -frL dist/public/ldap{,-private} $RPM_BUILD_ROOT%{_includedir}/%{name}
install dist/bin/*.so $RPM_BUILD_ROOT%{_seamonkeydir}
ln -s %{_libdir}/libnssckbi.so $RPM_BUILD_ROOT%{_seamonkeydir}/libnssckbi.so
-for f in build/unix/*.pc ; do
- sed -e 's/seamonkey-%{version}/seamonkey/' $f \
- > $RPM_BUILD_ROOT%{_pkgconfigdir}/$(basename $f)
-done
-
-sed -e 's,lib/seamonkey-%{version},lib,g;s/seamonkey-%{version}/seamonkey/g' build/unix/seamonkey-gtkmozembed.pc \
- > $RPM_BUILD_ROOT%{_pkgconfigdir}/seamonkey-gtkmozembed.pc
-
-# add includir/dom to Cflags, for openvrml.spec, perhaps others
-sed -i -e '/Cflags:/{/{includedir}\/dom/!s,$, -I${includedir}/dom,}' $RPM_BUILD_ROOT%{_pkgconfigdir}/seamonkey-plugin.pc
-
-rm -f $RPM_BUILD_ROOT%{_pkgconfigdir}/seamonkey-nss.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/seamonkey-nspr.pc
-
install %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} \
$RPM_BUILD_ROOT%{_desktopdir}
@@ -360,9 +312,6 @@
install dist/bin/regchrome $RPM_BUILD_ROOT%{_seamonkeydir}
install dist/bin/regxpcom $RPM_BUILD_ROOT%{_seamonkeydir}
install dist/bin/xpidl $RPM_BUILD_ROOT%{_seamonkeydir}
-install dist/bin/regchrome $RPM_BUILD_ROOT%{_bindir}
-install dist/bin/regxpcom $RPM_BUILD_ROOT%{_bindir}
-install dist/bin/xpidl $RPM_BUILD_ROOT%{_bindir}
cp $RPM_BUILD_ROOT%{_chromedir}/installed-chrome.txt \
$RPM_BUILD_ROOT%{_chromedir}/%{name}-installed-chrome.txt
@@ -789,19 +738,21 @@
%attr(755,root,root) %{_seamonkeydir}/components/libnkgnomevfs.so
%endif
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/reg*
-%attr(755,root,root) %{_bindir}/xpidl
-%{_includedir}/%{name}
-%{_pkgconfigdir}/*
-
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <feedback at pld-linux.org>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.53 2007/01/29 23:16:31 glen
+- AC-branch merge:
+ hawk:
+ - don't use BUILD_OFFICIAL/MOZILLA_OFFICIAL, we are not allowed to do so
+ - s/SeaMonkey/SeaMonkey Community Edition/
+ glen:
+ - drop -devel (use xulrunner-devel)
+ - drop bogus deps
+
Revision 1.52 2007/01/22 20:31:18 hawk
- merge from AC-branch: update to 1.1, enigmail 0.94.2, dropped obsolete
nss.patch, dropped obsolete calendar subpackage (no longer available
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/seamonkey.spec?r1=1.52&r2=1.53&f=u
More information about the pld-cvs-commit
mailing list