- upgrade to freetype 2.0.9 - kill freetype 1 stuff (it's already in freetype1 package)

freetype/freetype.spec

@@ -23,9 +23,6 @@
 ##  SUCH DAMAGE. 
 ##  
 
-%define       V_one  1.3.1
-%define       V_two  2.0.8
-
 #   package information
 Name:         freetype
 Summary:      A TrueType Font (TTF) Rendering Library
@@ -35,12 +32,11 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [REL]
 Group:        Graphics
 License:      GPL
-Version:      %{V_two}
-Release:      20020212
+Version:      2.0.9
+Release:      20020311
 
 #   list of sources
-Source0:      ftp://ftp.freetype.org/freetype/freetype1/freetype-%{V_one}.tar.gz
-Source1:      ftp://ftp.freetype.org/freetype/freetype2/freetype-%{V_two}.tar.gz
+Source0:      ftp://ftp.freetype.org/freetype/freetype2/freetype-%{version}.tar.gz
 
 #   build information
 Prefix:       %{l_prefix}
@@ -51,41 +47,23 @@ AutoReq:      no
 AutoReqProv:  no
 
 %description
-    FreeType is a full-featured rendering library for TrueType Fonts
-    (TTF).
+    FreeType is a full-featured rendering library for TrueType Fonts (TTF).
 
 %prep
-    %setup0 -q -c -n freetype-%{version}
-    %setup1 -q -T -D -a 1
+    %setup -q
 
 %build
-    ( cd freetype-%{V_one}
-      CC="%{l_cc}" \
-      CFLAGS="%{l_cflags -O}" \
-      ./configure \
-          --prefix=$RPM_BUILD_ROOT%{l_prefix} \
-          --disable-shared \
-          --disable-nls 
-      %{l_make} %{l_mflags}
-    )
-    ( cd freetype-%{V_two}
-      %{l_make} %{l_mflags} setup \
-          CFG="--prefix=$RPM_BUILD_ROOT%{l_prefix}" 
-      %{l_make} %{l_mflags}
-    )
+    %{l_make} %{l_mflags} setup \
+        CFG="--prefix=$RPM_BUILD_ROOT%{l_prefix}" 
+    %{l_make} %{l_mflags}
 
 %install
     rm -rf $RPM_BUILD_ROOT
-    ( cd freetype-%{V_one}
-      %{l_make} %{l_mflags} install
-    )
-    ( cd freetype-%{V_two}
-      %{l_make} %{l_mflags} install
-      %{l_shtool} subst \
-          -e 's;^\(prefix=\).*;\1%{l_prefix};' \
-          $RPM_BUILD_ROOT%{l_prefix}/bin/freetype-config
-      rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*.orig
-    )
+    %{l_make} %{l_mflags} install
+    %{l_shtool} subst \
+        -e 's;^\(prefix=\).*;\1%{l_prefix};' \
+        $RPM_BUILD_ROOT%{l_prefix}/bin/freetype-config
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*.orig
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}