SPECS (AC-branch): seamonkey.spec - drop bogus deps - build simplify
glen
glen at pld-linux.org
Tue Jan 23 11:51:50 CET 2007
Author: glen Date: Tue Jan 23 10:51:50 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- drop bogus deps
- build simplify
---- Files affected:
SPECS:
seamonkey.spec (1.32.2.14 -> 1.32.2.15)
---- Diffs:
================================================================
Index: SPECS/seamonkey.spec
diff -u SPECS/seamonkey.spec:1.32.2.14 SPECS/seamonkey.spec:1.32.2.15
--- SPECS/seamonkey.spec:1.32.2.14 Mon Jan 22 21:23:40 2007
+++ SPECS/seamonkey.spec Tue Jan 23 11:51:45 2007
@@ -1,4 +1,6 @@
# $Revision$, $Date$
+# TODO:
+# - i believe we're not allowed to distribute rpm's build with _OFFICIAL
#
# Conditional build:
%bcond_without gnomevfs # disable GnomeVFS support
@@ -30,8 +32,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
@@ -46,7 +46,6 @@
BuildRequires: perl-modules >= 5.6.0
BuildRequires: pkgconfig
BuildRequires: sed >= 4.0
-BuildRequires: tar >= 1:1.15.1
BuildRequires: xcursor-devel
BuildRequires: xft-devel >= 2.1-2
BuildRequires: zip >= 2.1
@@ -233,10 +232,9 @@
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
@@ -244,6 +242,7 @@
%patch4 -p1
%build
+cd mozilla
BUILD_OFFICIAL="1"; export BUILD_OFFICIAL
MOZILLA_OFFICIAL="1"; export MOZILLA_OFFICIAL
@@ -286,13 +285,13 @@
%{__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}} \
@@ -797,6 +796,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.32.2.15 2007/01/23 10:51:45 glen
+- drop bogus deps
+- build simplify
+
Revision 1.32.2.14 2007/01/22 20:23:40 hawk
- works for me, release 1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/seamonkey.spec?r1=1.32.2.14&r2=1.32.2.15&f=u
More information about the pld-cvs-commit
mailing list