Sfoglia il codice sorgente

upgrading package: firefox 0.9.2 -> 1.0PR

Ralf S. Engelschall 21 anni fa
parent
commit
e4c72fc6d6
1 ha cambiato i file con 19 aggiunte e 9 eliminazioni
  1. 19 9
      firefox/firefox.spec

+ 19 - 9
firefox/firefox.spec

@@ -23,6 +23,12 @@
 ##  SUCH DAMAGE.
 ##
 
+#   FIXME: rse: fails to build because some .rdf/.jar stuff cannot be built
+
+#   package version
+%define       V_main   1.0PR
+%define       V_subdir 0.10
+
 #   package information
 Name:         firefox
 Summary:      Graphical Web Browser
@@ -33,15 +39,15 @@ Distribution: OpenPKG
 Class:        EVAL
 Group:        Web
 License:      MPL
-Version:      0.9.2
-Release:      20040715
+Version:      %{V_main}
+Release:      20040915
 
 #   package options
 %option       with_optimize   yes
 
 #   list of sources
-Source0:      ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/firefox-%{version}-source.tar.bz2
-Source1:      ftp://ftp.openpkg.org/sources/CPY/mozilla/mozilla-1.4-libart.tar.bz2
+Source0:      ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{V_subdir}/firefox-%{version}-source.tar.bz2
+Source1:      ftp://ftp.openpkg.org/sources/CPY/mozilla/mozilla-1.7.2-libart.tar.bz2
 Source2:      firefox.sh
 Source3:      firefox.pod
 Patch0:       firefox.patch
@@ -74,8 +80,9 @@ AutoReqProv:  no
 
 %prep
     #   extract source distribution
-    %setup -q -n mozilla
-    %setup -q -n mozilla -D -T -a 1
+    %setup -q -c
+    %setup -q -D -T -a 1
+    cd mozilla
 
     #   patch source distribution
     %patch -p0
@@ -89,6 +96,8 @@ AutoReqProv:  no
     rm -rf build/package
 
 %build
+    cd mozilla
+
     #   determine X11 paths
     x11_libdir=`%{l_prefix}/etc/rc --query x11_libdir`
     x11_incdir=`%{l_prefix}/etc/rc --query x11_incdir`
@@ -129,11 +138,11 @@ AutoReqProv:  no
         --with-system-png=%{l_prefix} \
         --with-system-zlib=%{l_prefix} \
         --with-ft-prefix=%{l_prefix} \
-        --enable-freetype2 \
         --enable-jsd \
         --enable-crypto \
         --enable-chrome-format=jar \
         --enable-svg \
+        --enable-svg-renderer-libart \
         --enable-static \
         --enable-strip \
 %if "%{with_optimize}" == "yes"
@@ -142,6 +151,7 @@ AutoReqProv:  no
         --disable-optimize \
 %endif
         --disable-xft \
+        --disable-freetype2 \
         --disable-xinerama \
         --disable-shared \
         --disable-tests \
@@ -161,7 +171,7 @@ AutoReqProv:  no
     #   build program
     %{l_make} %{l_mflags}
 
-    #   post-adjustments to builded program
+    #   post adjustments to built program
     ( cd dist/bin
       #   prepare for multi-user usage
       LD_LIBRARY_PATH=.; export LD_LIBRARY_PATH
@@ -200,7 +210,7 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/man/man1
 
     #   move files into temporary installation tree
-    ( cd dist/bin && %{l_tar} -chf - . ) |\
+    ( cd mozilla/dist/bin && %{l_tar} -chf - . ) |\
         ( cd $RPM_BUILD_ROOT%{l_prefix}/lib/firefox && %{l_tar} -xf - ) || exit $?
 
     #   add startup convenience wrapper