packages: icedove/icedove.spec - with xulrunner hacks - system mozldap hacks

glen glen at pld-linux.org
Fri Apr 9 13:30:47 CEST 2010


Author: glen                         Date: Fri Apr  9 11:30:47 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- with xulrunner hacks
- system mozldap hacks

---- Files affected:
packages/icedove:
   icedove.spec (1.73 -> 1.74) 

---- Diffs:

================================================================
Index: packages/icedove/icedove.spec
diff -u packages/icedove/icedove.spec:1.73 packages/icedove/icedove.spec:1.74
--- packages/icedove/icedove.spec:1.73	Thu Apr  8 21:48:55 2010
+++ packages/icedove/icedove.spec	Fri Apr  9 13:30:41 2010
@@ -49,6 +49,7 @@
 Patch4:		%{name}-install.patch
 Patch5:		%{name}-hunspell.patch
 Patch6:		%{name}-prefs.patch
+Patch7:		system-mozldap.patch
 URL:		http://www.pld-linux.org/Packages/Icedove
 %{?with_gnomevfs:BuildRequires:	GConf2-devel >= 1.2.1}
 BuildRequires:	automake
@@ -165,6 +166,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 cd mozilla
@@ -175,6 +177,10 @@
 cp -f %{_datadir}/automake/config.* mozilla/nsprpub/build/autoconf
 cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf
 
+install -d libxul-sdk
+ln -snf %{_libdir}/xulrunner-sdk libxul-sdk/sdk
+SDKDIR=$(cd libxul-sdk; pwd)
+
 cat << 'EOF' > .mozconfig
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu}
 
@@ -223,6 +229,7 @@
 %endif
 %if %{with ldap}
 ac_add_options --enable-ldap
+ac_add_options --with-system-ldap
 %else
 ac_add_options --disable-ldap
 %endif
@@ -245,7 +252,9 @@
 ac_add_options --enable-mathml
 ac_add_options --enable-pango
 ac_add_options --enable-reorder
+%if %{without xulrunner}
 ac_add_options --enable-static
+%endif
 ac_add_options --enable-startup-notification
 ac_add_options --enable-svg
 ac_add_options --enable-system-cairo
@@ -258,7 +267,9 @@
 ac_add_options --with-distribution-id=org.pld-linux
 ac_add_options --with-branding=icedove/branding
 %if %{with xulrunner}
-ac_add_options --with-libxul-sdk=%{_libdir}/xulrunner-sdk
+#ac_add_options --with-libxul-sdk=%{_libdir}/xulrunner-sdk
+#ac_add_options --with-libxul-sdk=$(pwd)/libxul-sdk
+ac_add_options --with-libxul-sdk=$SDKDIR
 %endif
 ac_add_options --with-pthreads
 ac_add_options --with-system-bz2
@@ -339,9 +350,10 @@
 cp -f icedove/branding/content/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/icedove.png
 %endif
 
-# win32 stuff
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/dirver
+# remove unecessary stuff
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/README.txt
 
+# never package these
 # nss
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{freebl3,nss3,nssckbi,nssdbm3,nssutil3,smime3,softokn3,ssl3}.*
 # nspr
@@ -431,6 +443,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.74  2010/04/09 11:30:41  glen
+- with xulrunner hacks
+- system mozldap hacks
+
 Revision 1.73  2010/04/08 19:48:55  glen
 - revert
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/icedove.spec?r1=1.73&r2=1.74&f=u



More information about the pld-cvs-commit mailing list