packages: libpng/libpng.spec - rel 2; use am/ac

[arekm]

Author: arekm                        Date: Thu Jan 28 09:42:57 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; use am/ac

---- Files affected:
packages/libpng:
   libpng.spec (1.175 -> 1.176) 

---- Diffs:

================================================================
Index: packages/libpng/libpng.spec
diff -u packages/libpng/libpng.spec:1.175 packages/libpng/libpng.spec:1.176
--- packages/libpng/libpng.spec:1.175	Sun Jan 10 10:14:31 2010
+++ packages/libpng/libpng.spec	Thu Jan 28 10:42:52 2010
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-# NOTE: try to switch to ac/am/lt build on 1.2.x->1.4.x upgrade
 Summary:	PNG library
 Summary(de.UTF-8):	PNG-Library
 Summary(es.UTF-8):	Biblioteca PNG
@@ -9,7 +8,7 @@
 Summary(tr.UTF-8):	PNG kitaplığı
 Name:		libpng
 Version:	1.2.42
-Release:	1
+Release:	2
 Epoch:		2
 License:	distributable
 Group:		Libraries
@@ -156,22 +155,9 @@
 %patch4 -p1
 %patch5 -p0
 
-%ifarch %{ix86}
-ln -sf scripts/makefile.gcmmx ./Makefile
-%else
-ln -sf scripts/makefile.linux ./Makefile
-%endif
-
 %build
-%{__make} \
-	prefix=%{_prefix} \
-	LIBPATH=%{_libdir} \
-	CC="%{__cc}" \
-%ifarch %{x8664} sparc sparcv9 sparc64
-	OPT_FLAGS="%{rpmcflags} -DPNG_NO_MMX_CODE"
-%else
-	OPT_FLAGS="%{rpmcflags}"
-%endif
+%configure
+%{__make}
 
 %{__make} -C contrib/pngminus -f makefile.std \
 	LIBPATH=%{_libdir} \
@@ -184,11 +170,9 @@
 	$RPM_BUILD_ROOT{%{_pkgconfigdir},%{_examplesdir}/%{name}-%{version}}
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	prefix=%{_prefix} \
-	LIBPATH=%{_libdir} \
-	MANPATH=%{_mandir}
+	DESTDIR=$RPM_BUILD_ROOT
 
+ln -s libpng12 $RPM_BUILD_ROOT%{_includedir}/libpng
 install contrib/pngminus/{png2pnm,pnm2png} $RPM_BUILD_ROOT%{_bindir}
 install example.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
@@ -237,6 +221,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.176  2010/01/28 09:42:52  arekm
+- rel 2; use am/ac
+
 Revision 1.175  2010/01/10 09:14:31  qboosh
 - updated to 1.2.42
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libpng/libpng.spec?r1=1.175&r2=1.176&f=u