Fwd: SPECS: mozilla-firefox.spec - updated to version 2.0, - release 0....

Elan Ruusamäe glen at delfi.ee
Wed Oct 25 14:41:27 CEST 2006 

what was wrong merging first from DEVEL?

work duplication really sucks!

----------  Forwarded Message  ----------

Subject: SPECS: mozilla-firefox.spec - updated to version 2.0, - release 0....
Date: Wednesday 25 October 2006 13:35
From: cieciwa <cieciwa at pld-linux.org>
To: pld-cvs-commit at lists.pld-linux.org

Author: cieciwa                      Date: Wed Oct 25 10:35:20 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to version 2.0,
- release 0.1,
- used %configure
NFY

---- Files affected:
SPECS:
   mozilla-firefox.spec (1.152 -> 1.153)

---- Diffs:

================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.152 SPECS/mozilla-firefox.spec:1.153
--- SPECS/mozilla-firefox.spec:1.152	Tue Sep 26 21:47:16 2006
+++ SPECS/mozilla-firefox.spec	Wed Oct 25 12:35:12 2006
@@ -18,20 +18,20 @@
 Summary:	Mozilla Firefox web browser
 Summary(pl):	Mozilla Firefox - przeglądarka WWW
 Name:		mozilla-firefox
-Version:	1.5.0.7
-Release:	1
+Version:	2.0
+Release:	0.1
 License:	MPL/LGPL
 Group:		X11/Applications/Networking
 Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/s
ource/firefox-%{version}-source.tar.bz2 -#
 Source0-md5:	518cbd99a3fe663237070013e5cdb1a4
+# Source0-md5:	03709c15cba0e0375ff5336d538f77e7
 Source1:	%{name}.desktop
 Source2:	%{name}.sh
-Patch0:		%{name}-nss.patch
-Patch1:		%{name}-lib_path.patch
-Patch2:		%{name}-nss-system-nspr.patch
-Patch3:		%{name}-nopangoxft.patch
-Patch4:		%{name}-name.patch
-Patch5:		%{name}-fonts.patch
+#Patch0:		%{name}-nss.patch
+#Patch1:		%{name}-lib_path.patch
+#Patch2:		%{name}-nss-system-nspr.patch
+#Patch3:		%{name}-nopangoxft.patch
+#Patch4:		%{name}-name.patch
+#Patch5:		%{name}-fonts.patch
 # UPDATE or DROP?
 #PatchX:	%{name}-searchplugins.patch
 URL:		http://www.mozilla.org/projects/firefox/
@@ -113,91 +113,116 @@
 %prep
 %setup -qc
 cd mozilla
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+#patch0 -p1
+#patch1 -p1
+#patch2 -p1
+#patch3 -p1
+#patch4 -p1
+#patch5 -p1

-sed -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure
+#sed -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure

 %build
 cd mozilla
-rm -f .mozconfig
-export CFLAGS="%{rpmcflags} `%{_bindir}/pkg-config mozilla-nspr
 --cflags-only-I`" -export CXXFLAGS="%{rpmcflags} `%{_bindir}/pkg-config
 mozilla-nspr --cflags-only-I`" -
-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
-
-LIBIDL_CONFIG="%{_bindir}/libIDL-config-2"; export LIBIDL_CONFIG
-
-cat << 'EOF' > .mozconfig
-. $topsrcdir/browser/config/mozconfig
-
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-
-ac_add_options --prefix=%{_prefix}
-ac_add_options --exec-prefix=%{_exec_prefix}
-ac_add_options --bindir=%{_bindir}
-ac_add_options --sbindir=%{_sbindir}
-ac_add_options --sysconfdir=%{_sysconfdir}
-ac_add_options --datadir=%{_datadir}
-ac_add_options --includedir=%{_includedir}
-ac_add_options --libdir=%{_libdir}
-ac_add_options --libexecdir=%{_libexecdir}
-ac_add_options --localstatedir=%{_localstatedir}
-ac_add_options --sharedstatedir=%{_sharedstatedir}
-ac_add_options --mandir=%{_mandir}
-ac_add_options --infodir=%{_infodir}
-ac_add_options --enable-optimize="%{rpmcflags}"
+#rm -f .mozconfig
+#export CFLAGS="%{rpmcflags} `%{_bindir}/pkg-config mozilla-nspr
 --cflags-only-I`" +#export CXXFLAGS="%{rpmcflags} `%{_bindir}/pkg-config
 mozilla-nspr --cflags-only-I`" +
+#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
+
+#LIBIDL_CONFIG="%{_bindir}/libIDL-config-2"; export LIBIDL_CONFIG
+
+#cat << 'EOF' > .mozconfig
+#. $topsrcdir/browser/config/mozconfig
+
+#export BUILD_OFFICIAL=1
+#export MOZILLA_OFFICIAL=1
+#mk_add_options BUILD_OFFICIAL=1
+#mk_add_options MOZILLA_OFFICIAL=1
+
+#ac_add_options --prefix=%{_prefix}
+#ac_add_options --exec-prefix=%{_exec_prefix}
+#ac_add_options --bindir=%{_bindir}
+#ac_add_options --sbindir=%{_sbindir}
+#ac_add_options --sysconfdir=%{_sysconfdir}
+#ac_add_options --datadir=%{_datadir}
+#ac_add_options --includedir=%{_includedir}
+#ac_add_options --libdir=%{_libdir}
+#ac_add_options --libexecdir=%{_libexecdir}
+#ac_add_options --localstatedir=%{_localstatedir}
+#ac_add_options --sharedstatedir=%{_sharedstatedir}
+#ac_add_options --mandir=%{_mandir}
+#ac_add_options --infodir=%{_infodir}
+#ac_add_options --enable-optimize="%{rpmcflags}"
+#%if %{?debug:1}0
+#ac_add_options --enable-debug
+#ac_add_options --enable-debug-modules
+#%else
+#ac_add_options --disable-debug
+#ac_add_options --disable-debug-modules
+#%endif
+#%if %{with tests}
+#ac_add_options --enable-tests
+#%else
+#ac_add_options --disable-tests
+#%endif
+#ac_add_options --disable-composer
+#ac_add_options --disable-dtd-debug
+#ac_add_options --disable-freetype2
+#ac_add_options --disable-installer
+#ac_add_options --disable-jsd
+#ac_add_options --disable-ldap
+#ac_add_options --disable-mailnews
+#ac_add_options --disable-profilesharing
+#ac_add_options --disable-xprint
+#ac_add_options --enable-canvas
+#ac_add_options --enable-crypto
+#ac_add_options --enable-default-toolkit=gtk2
+#ac_add_options --enable-mathml
+#ac_add_options --enable-pango
+#ac_add_options --enable-reorder
+#ac_add_options --enable-single-profile
+#ac_add_options --enable-strip
+#ac_add_options --enable-strip-libs
+#ac_add_options --enable-svg
+#ac_add_options --enable-system-cairo
+#ac_add_options --enable-xft
+#ac_add_options --enable-xinerama
+#ac_add_options --enable-xpctools
+#ac_add_options --with-pthreads
+#ac_add_options --with-system-jpeg
+#ac_add_options --with-system-nspr
+#ac_add_options --with-system-png
+#ac_add_options --with-system-zlib
+#ac_cv_visibility_pragma=no
+#EOF
+#
+%configure \
 %if %{?debug:1}0
-ac_add_options --enable-debug
-ac_add_options --enable-debug-modules
+		--enable-debug \
+		--enable-debug-modules \
 %else
-ac_add_options --disable-debug
-ac_add_options --disable-debug-modules
+		--disable-debug \
+		--disable-debug-modules \
 %endif
-%if %{with tests}
-ac_add_options --enable-tests
-%else
-ac_add_options --disable-tests
-%endif
-ac_add_options --disable-composer
-ac_add_options --disable-dtd-debug
-ac_add_options --disable-freetype2
-ac_add_options --disable-installer
-ac_add_options --disable-jsd
-ac_add_options --disable-ldap
-ac_add_options --disable-mailnews
-ac_add_options --disable-profilesharing
-ac_add_options --disable-xprint
-ac_add_options --enable-canvas
-ac_add_options --enable-crypto
-ac_add_options --enable-default-toolkit=gtk2
-ac_add_options --enable-mathml
-ac_add_options --enable-pango
-ac_add_options --enable-reorder
-ac_add_options --enable-single-profile
-ac_add_options --enable-strip
-ac_add_options --enable-strip-libs
-ac_add_options --enable-svg
-ac_add_options --enable-system-cairo
-ac_add_options --enable-xft
-ac_add_options --enable-xinerama
-ac_add_options --enable-xpctools
-ac_add_options --with-pthreads
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-nspr
-ac_add_options --with-system-png
-ac_add_options --with-system-zlib
-ac_cv_visibility_pragma=no
-EOF
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-jpeg \
+		--with-system-zlib \
+		--with-system-png \
+		--enable-canvas \
+		--enable-freetype2 \
+		--enable-xft \
+		--enable-pangi \
+		--enable-gnomevfs \
+		--enable-gnomeui \
+		--enable-xinerama \
+		--enable-ctl \
+		--enable-extensions \
+		--enable-svg
+

 %{__make} -j1 -f client.mk build \
 	CC="%{__cc}" \
@@ -368,6 +393,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org

 $Log$
+Revision 1.153  2006/10/25 10:35:12  cieciwa
+- updated to version 2.0,
+- release 0.1,
+- used %configure
+NFY
+
 Revision 1.152  2006/09/26 19:47:16  glen
 - exact mktemp dep

================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mozilla-firefox.spec?r1=1.152&r2=1.153&f=u

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit at lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

-------------------------------------------------------

-- 
glen

More information about the pld-devel-en mailing list