SPECS: mozilla-firefox.spec - reverted

patrys patrys at pld-linux.org
Tue Jun 17 19:40:22 CEST 2008 

Author: patrys                       Date: Tue Jun 17 17:40:22 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- reverted

---- Files affected:
SPECS:
   mozilla-firefox.spec (1.238 -> 1.239) 

---- Diffs:

================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.238 SPECS/mozilla-firefox.spec:1.239
--- SPECS/mozilla-firefox.spec:1.238	Tue Jun 17 18:56:58 2008
+++ SPECS/mozilla-firefox.spec	Tue Jun 17 19:40:17 2008
@@ -15,29 +15,30 @@
 %undefine	with_gnomeui
 %undefine	with_gnomevfs
 %endif
-%define		firefox_ver	3.0
+%define		firefox_ver	2.0.0.14
 #
 Summary:	Firefox Community Edition web browser
 Summary(pl.UTF-8):	Firefox Community Edition - przeglądarka WWW
 Name:		mozilla-firefox
 Version:	%{firefox_ver}
-Release:	0.1
+Release:	2
 License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications/Networking
 Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
-# Source0-md5:	4210ae0801df2eb498408533010d97c1
+# Source0-md5:	9e9c13ba7b81f93f2fa10c6f256ee31e
 Source1:	%{name}.desktop
 Source2:	%{name}.sh
 Patch0:		mozilla-install.patch
 Patch1:		%{name}-lib_path.patch
-#Patch3:		%{name}-myspell.patch
-#Patch4:		%{name}-pango-cursor-position.patch
-#Patch5:		%{name}-pango-ligatures.patch
-#Patch6:		%{name}-pango-cursor-position-more.patch
-#Patch7:		%{name}-pango-justified-range.patch
-#Patch8:		%{name}-pango-printing.patch
-#Patch9:		%{name}-pango-underline.patch
-#Patch10:	%{name}-xft-randewidth.patch
+Patch2:		%{name}-fonts.patch
+Patch3:		%{name}-myspell.patch
+Patch4:		%{name}-pango-cursor-position.patch
+Patch5:		%{name}-pango-ligatures.patch
+Patch6:		%{name}-pango-cursor-position-more.patch
+Patch7:		%{name}-pango-justified-range.patch
+Patch8:		%{name}-pango-printing.patch
+Patch9:		%{name}-pango-underline.patch
+Patch10:	%{name}-xft-randewidth.patch
 Patch11:	%{name}-ti-agent.patch
 Patch12:	%{name}-agent.patch
 # if ac rebuild is needed...
@@ -104,14 +105,15 @@
 cd mozilla
 %patch0 -p1
 %patch1 -p1
-#%patch3 -p1
-#%patch4 -p1
-#%patch5 -p1
-#%patch6 -p1
-#%patch7 -p1
-#%patch8 -p0
-#%patch9 -p1
-#%patch10 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p0
+%patch9 -p1
+%patch10 -p1
 %if "%{pld_release}" == "ti"
 %patch11 -p1
 %else
@@ -123,7 +125,7 @@
 
 cp -f %{_datadir}/automake/config.* build/autoconf
 cp -f %{_datadir}/automake/config.* nsprpub/build/autoconf
-#cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf
+cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf
 
 cat << 'EOF' > .mozconfig
 . $topsrcdir/browser/config/mozconfig
@@ -172,12 +174,15 @@
 %else
 ac_add_options --disable-gnomevfs
 %endif
+ac_add_options --disable-freetype2
 ac_add_options --disable-installer
 ac_add_options --disable-javaxpcom
 ac_add_options --disable-updater
+ac_add_options --enable-default-toolkit=gtk2
 ac_add_options --enable-svg
 ac_add_options --enable-system-cairo
 ac_add_options --enable-system-myspell
+ac_add_options --enable-xft
 ac_add_options --with-distribution-id=org.pld-linux
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-nspr
@@ -194,21 +199,17 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 cd mozilla
-
 install -d \
 	$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}} \
 	$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \
 	$RPM_BUILD_ROOT%{_datadir}/%{name}
 
-cd obj-%{_target_cpu}
-[ -d dist/firefox ] || mkdir dist/firefox
-%{__make} install \
+%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
+
+%{__make} -C obj-%{_target_cpu}/xpinstall/packager stage-package \
 	DESTDIR=$RPM_BUILD_ROOT \
 	MOZ_PKG_APPDIR=%{_libdir}/%{name} \
 	PKG_SKIP_STRIP=1
-cd ..
-
-%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
 
 # move arch independant ones to datadir
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/chrome
@@ -216,6 +217,7 @@
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs $RPM_BUILD_ROOT%{_datadir}/%{name}/greprefs
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/icons $RPM_BUILD_ROOT%{_datadir}/%{name}/icons
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/init.d $RPM_BUILD_ROOT%{_datadir}/%{name}/init.d
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/res $RPM_BUILD_ROOT%{_datadir}/%{name}/res
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins $RPM_BUILD_ROOT%{_datadir}/%{name}/searchplugins
 ln -s ../../share/%{name}/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome
@@ -223,6 +225,7 @@
 ln -s ../../share/%{name}/extensions $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions
 ln -s ../../share/%{name}/greprefs $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs
 ln -s ../../share/%{name}/icons $RPM_BUILD_ROOT%{_libdir}/%{name}/icons
+ln -s ../../share/%{name}/init.d $RPM_BUILD_ROOT%{_libdir}/%{name}/init.d
 ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res
 ln -s ../../share/%{name}/searchplugins $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins
 
@@ -230,12 +233,17 @@
 ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 
 sed 's, at LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
-#ln -s mozilla-firefox $RPM_BUILD_ROOT%{_bindir}/firefox
+ln -s mozilla-firefox $RPM_BUILD_ROOT%{_bindir}/firefox
 
 install browser/base/branding/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-firefox.png
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
+# header/development files
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/xpidl
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/xpt_dump
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/xpt_link
+
 # files created by regxpcom and firefox -register
 touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/compreg.dat
 touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/xpti.dat
@@ -268,7 +276,7 @@
 if [ -d %{_libdir}/%{name}/dictionaries ] && [ ! -L %{_libdir}/%{name}/dictionaries ]; then
 	mv -v %{_libdir}/%{name}/dictionaries{,.rpmsave}
 fi
-for d in chrome defaults extensions greprefs icons res searchplugins; do
+for d in chrome defaults extensions greprefs icons init.d res searchplugins; do
 	if [ -d %{_libdir}/%{name}/$d ] && [ ! -L %{_libdir}/%{name}/$d ]; then
 		install -d %{_datadir}/%{name}
 		mv %{_libdir}/%{name}/$d %{_datadir}/%{name}/$d
@@ -548,6 +556,7 @@
 %{_libdir}/%{name}/extensions
 %{_libdir}/%{name}/greprefs
 %{_libdir}/%{name}/icons
+%{_libdir}/%{name}/init.d
 %{_libdir}/%{name}/res
 %{_libdir}/%{name}/searchplugins
 
@@ -562,6 +571,7 @@
 %{_datadir}/%{name}/defaults
 %{_datadir}/%{name}/greprefs
 %{_datadir}/%{name}/icons
+%{_datadir}/%{name}/init.d
 %{_datadir}/%{name}/res
 %{_datadir}/%{name}/searchplugins
 
@@ -581,11 +591,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.238  2008/06/17 16:56:58  patrys
-- 3.0
-- NFY (packaging needs to be fixed)
+Revision 1.239  2008/06/17 17:40:17  patrys
+- reverted
 
-Revision 1.237  2008-05-24 19:03:18  hawk
+Revision 1.237  2008/05/24 19:03:18  hawk
 - use %pld_release macro and apply proper agent patch, BR: rpm >= 4.4.9-56
 
 Revision 1.236  2008-04-24 06:25:35  hawk
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mozilla-firefox.spec?r1=1.238&r2=1.239&f=u

More information about the pld-cvs-commit mailing list