rpms/libpng10/devel libpng10.spec,1.5,1.6

[Paul Howarth (pghmcfc)]

Author: pghmcfc

Update of /cvs/extras/rpms/libpng10/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv821

Modified Files:
	libpng10.spec 
Log Message:
Own directory %%{_docdir}/%%{name}-%%{version} (#233869)


Index: libpng10.spec
===================================================================
RCS file: /cvs/extras/rpms/libpng10/devel/libpng10.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libpng10.spec	21 Nov 2006 08:33:02 -0000	1.5
+++ libpng10.spec	25 Mar 2007 17:16:53 -0000	1.6
@@ -1,8 +1,8 @@
 Summary:	Old version of libpng, needed to run old binaries
 Name:		libpng10
 Version:	1.0.21
-Release:	1%{?dist}
-License:	zlib License
+Release:	2%{?dist}
+License:	zlib/libpng License
 Group:		System Environment/Libraries
 URL:		http://www.libpng.org/pub/png/libpng.html
 Source:		ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-%{version}.tar.bz2
@@ -91,7 +91,8 @@
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,755)
+%defattr(-,root,root,-)
+%dir %{_docdir}/%{name}-%{version}/
 %doc %{_docdir}/%{name}-%{version}/CHANGES
 %doc %{_docdir}/%{name}-%{version}/LICENSE
 %doc %{_docdir}/%{name}-%{version}/README
@@ -100,7 +101,7 @@
 %{_libdir}/libpng.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc %{_docdir}/%{name}-%{version}/example.c
 %doc %{_docdir}/%{name}-%{version}/libpng.txt
 %{_includedir}/libpng10/
@@ -108,6 +109,10 @@
 %{_libdir}/pkgconfig/libpng10.pc
 
 %changelog
+* Sun Mar 25 2007 Paul Howarth <paul at city-fan.org> 1.0.21-2
+- Own directory %%{_docdir}/%%{name}-%%{version} (#233869)
+- Describe license as "zlib/libpng" rather than just "zlib"
+
 * Sat Nov 18 2006 Paul Howarth <paul at city-fan.org> 1.0.21-1
 - update to 1.0.21 to address DoS issue (#216263, CVE-2006-5793)
 - update soname patch