upgrade by switching to new Autoconf build environment

gd/gd.spec

@@ -32,8 +32,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [BASE]
 Group:        Graphics
 License:      GPL
-Version:      2.0.4
+Version:      2.0.5
-Release:      20021024
+Release:      20021114
 
 #   list of sources
 Source0:      http://www.boutell.com/gd/http/gd-%{version}.tar.gz
@@ -58,50 +58,28 @@ Provides:     GD
 
 %prep
     %setup -q
-    awk <configure '/^print OUT/,/^EOM/ { print $0 }' >Makefile
-    %{l_shtool} subst \
-        -e 's;^print OUT.*;;' \
-        -e 's;^EOM;all: libgd.a $(PROGRAMS);' \
-        -e 's;^install: .*;install: all;' \
-        -e 's;$sharedLinkHead;;' \
-        -e 's;$sharedLinkTail;;' \
-        -e 's;$oflags;;' \
-        -e 's;$lflags;;' \
-        -e 's;$includeDirs;;' \
-        -e 's;$libDirs;;' \
-        -e 's;$compiler;;' \
-        -e 's;$safePrograms;pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng annotate;' \
-        -e 's;$installCommands.*;;' \
-        -e 's;$installPrefix;%{l_prefix};' \
-        -e 's;sh \./install-item ;%{l_shtool} install -c -m ;' \
-        -e 's;--verbose; ;' \
-        -e 's;\\\(.\);\1;g' \
-        Makefile
 
 %build
-    %{l_make} %{l_mflags} \
+    echo "ac_cv_header_iconv_h=no" >config.cache
-        COMPILER="%{l_cc}" \
+    CC="%{l_cc}" \
-        CFLAGS="%{l_cflags -O} -DHAVE_LIBPNG -DHAVE_LIBZ -DHAVE_LIBJPEG -DHAVE_LIBFREETYPE" \
+    CFLAGS="%{l_cflags -O}" \
-        INCLUDEDIRS="-I. -I%{l_prefix}/include/libpng -I%{l_prefix}/include/freetype2 -I%{l_prefix}/include" \
+    CPPFLAGS="%{l_cppflags} -I. -I%{l_prefix}/include/libpng -I%{l_prefix}/include/freetype2" \
-        LIBDIRS="-L. -L%{l_prefix}/lib" \
+    LDFLAGS="%{l_ldflags} -L." \
-        LIBS="-lm -lgd -lpng -lz -ljpeg -lfreetype -lm" \
+    LIBS="-lm" \
-        all
+    ./configure \
+        --cache-file=./config.cache \
+        --prefix=%{l_prefix} \
+        --with-x \
+        --with-png=%{l_prefix} \
+        --with-freetype=%{l_prefix} \
+        --with-jpeg=%{l_prefix} \
+        --disable-shared
+    %{l_shtool} subst -e 's;-LNONE;;' Makefile
+    %{l_make} %{l_mflags}
 
 %install
     rm -rf $RPM_BUILD_ROOT
-    %{l_shtool} mkdir -f -p -m 755 \
+    %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
-        $RPM_BUILD_ROOT%{l_prefix}/bin \
-        $RPM_BUILD_ROOT%{l_prefix}/lib \
-        $RPM_BUILD_ROOT%{l_prefix}/include
-    %{l_make} %{l_mflags} install \
-        INSTALL_BIN=$RPM_BUILD_ROOT%{l_prefix}/bin \
-        INSTALL_LIB=$RPM_BUILD_ROOT%{l_prefix}/lib \
-        INSTALL_INCLUDE=$RPM_BUILD_ROOT%{l_prefix}/include
-	%{l_shtool} install -c -m 755 \
-        bdftogd pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng annotate \
-        $RPM_BUILD_ROOT%{l_prefix}/bin
-    %{l_shtool} install -c -m 644 \
-        libgd.a $RPM_BUILD_ROOT%{l_prefix}/lib
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2> /dev/null || true
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}