Sfoglia il codice sorgente

libart is already part of the Mozilla 1.4 tarball, so no more need for extra packaging; enable SVG rendering with libart

Ralf S. Engelschall 22 anni fa
parent
commit
417013ad58
1 ha cambiato i file con 11 aggiunte e 18 eliminazioni
  1. 11 18
      mozilla/mozilla.spec

+ 11 - 18
mozilla/mozilla.spec

@@ -23,10 +23,6 @@
 ##  SUCH DAMAGE.
 ##
 
-#   package versions
-%define       V_mozilla 1.4
-%define       V_libart  1.2.1
-
 #   package information
 Name:         mozilla
 Summary:      Graphical Internet Communication Frontend
@@ -36,26 +32,27 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [EVAL]
 Group:        Web
 License:      MPL
-Version:      %{V_mozilla}
-Release:      20030725
+Version:      1.4
+Release:      20030817
 
 #   package options
-%option       with_optimize   no
+%option       with_optimize   yes
 %option       with_mailnews   no
 %option       with_composer   no
 
 #   list of sources
-Source0:      ftp://ftp.mozilla.org/pub/mozilla/releases/mozilla%{V_mozilla}/src/mozilla-source-%{V_mozilla}.tar.bz2
-Source1:      http://people.freebsd.org/~marcus/libart_lgpl-%{V_libart}.tar.bz2
-Source2:      mozilla.sh
-Source3:      mozilla.pod
+Source0:      ftp://ftp.mozilla.org/pub/mozilla/releases/mozilla%{version}/src/mozilla-source-%{version}.tar.bz2
+Source1:      mozilla.sh
+Source2:      mozilla.pod
 Patch0:       mozilla.patch
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030717, X11, glib, gtk, orbit, libiconv, infozip, openssl, freetype, make, gcc, perl
-PreReq:       OpenPKG, openpkg >= 20030717, X11, glib, gtk, orbit, libiconv, infozip, openssl, freetype, xsel
+BuildPreReq:  OpenPKG, openpkg >= 20030717, make, gcc, perl
+PreReq:       OpenPKG, openpkg >= 20030717, xsel
+BuildPreReq:  X11, glib, gtk, orbit, libiconv, infozip, openssl, freetype
+PreReq:       X11, glib, gtk, orbit, libiconv, infozip, openssl, freetype
 AutoReq:      no
 AutoReqProv:  no
 
@@ -75,10 +72,6 @@ AutoReqProv:  no
     #   extract source distribution
     %setup -q -n mozilla
 
-    #   add back the modified libart which is included in Mozilla CVS
-    #   but left out of the source distribution for licensing reasons.
-    %{l_bzip2} -d -c %{SOURCE1} | %{l_tar} xf -
-
     #   patch source distribution
     %patch -p0
 
@@ -134,6 +127,7 @@ AutoReqProv:  no
         --enable-jsd \
         --enable-crypto \
         --enable-chrome-format=jar \
+        --enable-svg \
         --enable-static \
         --enable-strip \
 %if "%{with_optimize}" == "yes"
@@ -155,7 +149,6 @@ AutoReqProv:  no
         --disable-xinerama \
         --disable-shared \
         --disable-tests \
-        --disable-svg \
         --disable-ldap \
         --disable-accessibility \
         --disable-debug \