packages (LIBPNG_1_2): libpng/libpng.spec - pass rpmcppflags, verbose files...

[glen]

Author: glen                         Date: Fri Mar  2 07:34:34 2012 GMT
Module: packages                      Tag: LIBPNG_1_2
---- Log message:
- pass rpmcppflags, verbose files (HEAD merge)

---- Files affected:
packages/libpng:
   libpng.spec (1.175.4.4 -> 1.175.4.5) 

---- Diffs:

================================================================
Index: packages/libpng/libpng.spec
diff -u packages/libpng/libpng.spec:1.175.4.4 packages/libpng/libpng.spec:1.175.4.5
--- packages/libpng/libpng.spec:1.175.4.4	Fri Mar  2 08:30:35 2012
+++ packages/libpng/libpng.spec	Fri Mar  2 08:34:29 2012
@@ -168,15 +168,15 @@
 	LIBPATH=%{_libdir} \
 	CC="%{__cc}" \
 %ifarch %{x8664} sparc sparcv9 sparc64
-	OPT_FLAGS="%{rpmcflags} -DPNG_NO_MMX_CODE"
+	OPT_FLAGS="%{rpmcppflags} %{rpmcflags} -DPNG_NO_MMX_CODE"
 %else
-	OPT_FLAGS="%{rpmcflags}"
+	OPT_FLAGS="%{rpmcppflags} %{rpmcflags}"
 %endif
 
 %{__make} -C contrib/pngminus -f makefile.std \
 	LIBPATH=%{_libdir} \
 	CC="%{__cc}" \
-	OPT_FLAGS="%{rpmcflags}"
+	OPT_FLAGS="%{rpmcppflags} %{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -189,8 +189,8 @@
 	LIBPATH=%{_libdir} \
 	MANPATH=%{_mandir}
 
-install contrib/pngminus/{png2pnm,pnm2png} $RPM_BUILD_ROOT%{_bindir}
-install example.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+install -p contrib/pngminus/{png2pnm,pnm2png} $RPM_BUILD_ROOT%{_bindir}
+cp -p example.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -219,7 +219,9 @@
 %{_includedir}/libpng12
 %{_includedir}/libpng
 %{_includedir}/png*.h
-%{_mandir}/man?/*
+%{_mandir}/man3/libpng.3*
+%{_mandir}/man3/libpngpf.3*
+%{_mandir}/man5/png.5*
 %{_examplesdir}/%{name}-%{version}
 
 %files static
@@ -229,7 +231,8 @@
 
 %files progs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/p*
+%attr(755,root,root) %{_bindir}/png2pnm
+%attr(755,root,root) %{_bindir}/pnm2png
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -237,6 +240,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.175.4.5  2012/03/02 07:34:29  glen
+- pass rpmcppflags, verbose files (HEAD merge)
+
 Revision 1.175.4.4  2012/03/02 07:30:35  glen
 - merge translation fixes from HEAD
 
================================================================

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