packages: libpng12/libpng12.spec - rel 2; use am/ac for build now (so we ge...

[arekm]

Author: arekm                        Date: Thu Jan 28 10:03:57 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; use am/ac for build now (so we get libpng12.so.0(PNG12_0) versioning)

---- Files affected:
packages/libpng12:
   libpng12.spec (1.176 -> 1.177) 

---- Diffs:

================================================================
Index: packages/libpng12/libpng12.spec
diff -u packages/libpng12/libpng12.spec:1.176 packages/libpng12/libpng12.spec:1.177
--- packages/libpng12/libpng12.spec:1.176	Sun Jan 10 20:46:26 2010
+++ packages/libpng12/libpng12.spec	Thu Jan 28 11:03:48 2010
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Biblioteka PNG w wersji 1.2.x
 Name:		libpng12
 Version:	1.2.42
-Release:	1
+Release:	2
 Epoch:		2
 License:	distributable
 Group:		Libraries
@@ -81,22 +81,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}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -104,18 +91,14 @@
 	$RPM_BUILD_ROOT{%{_pkgconfigdir},%{_examplesdir}/%{name}-%{version}}
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	prefix=%{_prefix} \
-	LIBPATH=%{_libdir} \
-	MANPATH=%{_mandir}
+	DESTDIR=$RPM_BUILD_ROOT
 
 # these come from libpng (1.4.x) now
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/libpng-config \
 	$RPM_BUILD_ROOT%{_includedir}/png*.h \
 	$RPM_BUILD_ROOT%{_libdir}/libpng.{so,a} \
 	$RPM_BUILD_ROOT%{_pkgconfigdir}/libpng.pc
-%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/libpng \
-	$RPM_BUILD_ROOT%{_mandir}/man[35]
+%{__rm} -r $RPM_BUILD_ROOT%{_mandir}/man[35]
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -150,6 +133,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.177  2010/01/28 10:03:48  arekm
+- rel 2; use am/ac for build now (so we get libpng12.so.0(PNG12_0) versioning)
+
 Revision 1.176  2010/01/10 19:46:26  qboosh
 - libpng 1.2.x as alternative libpng
 
================================================================

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