|
|
@@ -1,5 +1,5 @@
|
|
|
# do not include minor version number in MOZILLA_FIVE_HOME
|
|
|
-%define tbmajor 17.0
|
|
|
+%define tbmajor 17.0.2
|
|
|
#%define tbversion %{tbmajor}.10
|
|
|
%define tbversion %{tbmajor}
|
|
|
%define tbrelease 1%{?_dist_release}
|
|
|
@@ -101,21 +101,27 @@ BuildRequires: freetype2-devel >= %{freetype_version}
|
|
|
## see related bug: https://bugzilla.mozilla.org/show_bug.cgi?id=478463
|
|
|
BuildRequires: libnotify-devel >= %{libnotify_version}
|
|
|
BuildRequires: bzip2-devel
|
|
|
-BuildRequires: gnome-vfs2-devel
|
|
|
+#BuildRequires: gnome-vfs2-devel
|
|
|
BuildRequires: libgnome-devel
|
|
|
-BuildRequires: libgnomeui-devel
|
|
|
+#BuildRequires: libgnomeui-devel
|
|
|
BuildRequires: krb5-devel
|
|
|
BuildRequires: pango-devel
|
|
|
BuildRequires: libXt-devel
|
|
|
BuildRequires: libXrender-devel
|
|
|
+BuildRequires: curl-devel
|
|
|
# hunspell is in plus category for vine
|
|
|
#BuildRequires: hunspell-devel
|
|
|
+%if %{build_vine7}
|
|
|
BuildRequires: sqlite3-devel >= %{sqlite_version}
|
|
|
+%endif
|
|
|
BuildRequires: startup-notification-devel
|
|
|
BuildRequires: desktop-file-utils
|
|
|
BuildRequires: alsa-lib-devel
|
|
|
BuildRequires: yasm
|
|
|
+BuildRequires: autoconf213
|
|
|
+%if %{build_vine7}
|
|
|
Requires: sqlite3 >= %{sqlite_version}
|
|
|
+%endif
|
|
|
Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
|
|
|
Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
|
|
|
|
|
|
@@ -174,34 +180,40 @@ INTERNAL_GECKO=%{version_internal}
|
|
|
MOZ_APP_DIR=%{mozappdir}
|
|
|
|
|
|
|
|
|
-%if %{build_vine7}
|
|
|
-MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %__sed -e 's/-Wall//')
|
|
|
-%else
|
|
|
-%ifarch x86_64
|
|
|
-#MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %__sed -e 's/-O2/-Os/' -e 's/-Wall//')
|
|
|
-MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %__sed -e 's/-O2//' -e 's/-Wall//')
|
|
|
-%else
|
|
|
-MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %__sed -e 's/-Wall//')
|
|
|
-%endif
|
|
|
-%endif
|
|
|
+#%if %{build_vine7}
|
|
|
+#MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %__sed -e 's/-Wall//')
|
|
|
+#%else
|
|
|
+#%ifarch x86_64
|
|
|
+##MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %__sed -e 's/-O2/-Os/' -e 's/-Wall//')
|
|
|
+#MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %__sed -e 's/-O2//' -e 's/-Wall//')
|
|
|
+#%else
|
|
|
+#MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %__sed -e 's/-Wall//')
|
|
|
+#%endif
|
|
|
+#%endif
|
|
|
+MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \
|
|
|
+ %{__sed} -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')
|
|
|
export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
|
|
|
export CFLAGS="$RPM_OPT_FLAGS"
|
|
|
#export CFLAGS=""
|
|
|
export CXXFLAGS="$CFLAGS"
|
|
|
export MOZ_APP_DISPLAYNAME="Tb for Vine Linux"
|
|
|
|
|
|
-%ifarch ppc ppc64 s390 s390x
|
|
|
-%define moz_make_flags -j1
|
|
|
-%else
|
|
|
-%define moz_make_flags %{?_smp_mflags}
|
|
|
-%endif
|
|
|
-
|
|
|
export PREFIX='%{_prefix}'
|
|
|
export LIBDIR='%{_libdir}'
|
|
|
|
|
|
-export LDFLAGS="-Wl,-rpath,%{mozappdir}"
|
|
|
-export MAKE="gmake %{moz_make_flags}"
|
|
|
-%{__make} -f client.mk build
|
|
|
+MOZ_SMP_FLAGS=-j1
|
|
|
+# On x86 architectures, Mozilla can build up to 4 jobs at once in parallel,
|
|
|
+# however builds tend to fail on other arches when building in parallel.
|
|
|
+%ifarch %{ix86} x86_64
|
|
|
+[ -z "$RPM_BUILD_NCPUS" ] && \
|
|
|
+ RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
|
|
|
+[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
|
|
|
+[ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4
|
|
|
+[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8
|
|
|
+ %endif
|
|
|
+
|
|
|
+%__make -f client.mk build STRIP="/bin/true" \
|
|
|
+ MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
|
|
|
|
|
|
## build locales
|
|
|
#LOCALEDIRS=`find . -print | grep 'locales/Makefile$' | \
|
|
|
@@ -344,6 +356,11 @@ fi
|
|
|
#===============================================================================
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Jan 09 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 17.0.2-1
|
|
|
+- new upstream release
|
|
|
+- update Source1010,1020
|
|
|
+- fix %% build
|
|
|
+
|
|
|
* Wed Nov 21 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 17.0-1
|
|
|
- new upstream release
|
|
|
|
Takemikaduchi