SPECS: pixman.spec - although with new soname it's parallel-instal...

[qboosh]

Author: qboosh                       Date: Tue Aug  7 17:35:10 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- although with new soname it's parallel-installable with old libpixman,
  it's successor of libpixman (now obsolete as a separate package), so merged
  whole Obsoletes lists (libpixregion*, libic*, slim)

---- Files affected:
SPECS:
   pixman.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/pixman.spec
diff -u SPECS/pixman.spec:1.5 SPECS/pixman.spec:1.6
--- SPECS/pixman.spec:1.5	Tue Aug  7 18:15:46 2007
+++ SPECS/pixman.spec	Tue Aug  7 19:35:05 2007
@@ -4,7 +4,7 @@
 Name:		pixman
 Version:	0.9.4
 Release:	1
-License:	BSD-like
+License:	MIT
 Group:		Libraries
 Source0:	http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.gz
 # Source0-md5:	44851d2c6015c5c5794c2f2041cea1a9
@@ -12,7 +12,9 @@
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
 BuildRequires:	libtool
+Obsoletes:	libic
 Obsoletes:	libpixman
+Obsoletes:	libpixregion
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -26,7 +28,10 @@
 Summary(pl.UTF-8):	Pliki dla programistów do biblioteki pixman
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Obsoletes:	libic-devel
 Obsoletes:	libpixman-devel
+Obsoletes:	libpixregion-devel
+Obsoletes:	slim
 
 %description devel
 This package contains development files for pixman library.
@@ -40,7 +45,9 @@
 Summary(pl.UTF-8):	Statyczna biblioteka pixman
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
+Obsoletes:	libic-static
 Obsoletes:	libpixman-static
+Obsoletes:	libpixregion-static
 
 %description static
 This package contains static pixman library.
@@ -75,18 +82,18 @@
 %files
 %defattr(644,root,root,755)
 %doc TODO
-%attr(755,root,root) %{_libdir}/libpixman*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libpixman-1.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpixman*.so
-%{_libdir}/libpixman*.la
-%{_includedir}/%{name}*
-%{_pkgconfigdir}/pixman*.pc
+%attr(755,root,root) %{_libdir}/libpixman-1.so
+%{_libdir}/libpixman-1.la
+%{_includedir}/pixman-1
+%{_pkgconfigdir}/pixman-1.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libpixman*.a
+%{_libdir}/libpixman-1.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -94,6 +101,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2007/08/07 17:35:05  qboosh
+- although with new soname it's parallel-installable with old libpixman,
+  it's successor of libpixman (now obsolete as a separate package), so merged
+  whole Obsoletes lists (libpixregion*, libic*, slim)
+
 Revision 1.5  2007/08/07 16:15:46  arekm
 - up to 0.9.4 (first release from new series)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/pixman.spec?r1=1.5&r2=1.6&f=u