[prev in list] [next in list] [prev in thread] [next in thread] 

List:       annvix-cvs
Subject:    [cvs] SVN commit in packages r7254 - releases/2.1-CURRENT/xpm/SPECS
From:       cvsrep () annvix ! org
Date:       2007-04-26 2:16:28
Message-ID: E1HgtX2-00070h-C4 () ares ! annvix ! ca
[Download RAW message or body]

Author: vdanen
Date: 2007-04-25 20:16:28 -0600 (Wed, 25 Apr 2007)
New Revision: 7254

Modified:
   releases/2.1-CURRENT/xpm/SPECS/xpm.spec
Log:
- clean some provides and obsoletes
- don't use %%libnamedev macro
- buildreq: X11-devel instead of XFree86-devel


Modified: releases/2.1-CURRENT/xpm/SPECS/xpm.spec
===================================================================
--- releases/2.1-CURRENT/xpm/SPECS/xpm.spec	2007-04-26 02:08:06 UTC (rev 7253)
+++ releases/2.1-CURRENT/xpm/SPECS/xpm.spec	2007-04-26 02:16:28 UTC (rev 7254)
@@ -16,7 +16,6 @@
 %define	major		4
 %define	LIBVER		4.11
 %define libname		%mklibname %{name} %{major}
-%define libnamedev	%mklibname %{name} %{major} -d
 
 Summary:	A pixmap library for the X Window System
 Name:		%{name}
@@ -40,7 +39,7 @@
 Patch8:		xpm-3.4k-avx-norman.patch
 
 BuildRoot:	%{_buildroot}/%{name}-%{version}
-BuildRequires:	XFree86-devel
+BuildRequires:	X11-devel
 
 %description
 The xpm package contains the XPM pixmap library for the X Window
@@ -51,10 +50,7 @@
 %package -n %{libname}
 Summary:	A pixmap library for the X Window System
 Group:		System/Libraries
-Provides:	%{name}
-Provides:	xpm3.4k
-Obsoletes:	%{name}
-Provides:	xpm3.4k
+Provides:	%{name} = %{version}
 
 %description -n %{libname}
 The xpm package contains the XPM pixmap library for the X Window
@@ -62,17 +58,14 @@
 pixmapped images, and is used by many popular X programs.
 
 
-%package -n %{libnamedev}
+%package -n %{libname}-devel
 Summary:	Tools for developing apps which will use the XPM pixmap library
 Group:		Development/C
 Requires:	%{libname} = %{version}
-Provides:	%{name}-devel
-Provides:	lib%{name}-devel
-Provides:	xpm3.4k-devel
-Obsoletes:	%{name}-devel
-Obsoletes:	xpm3.4k-devel
+Provides:	%{name}-devel = %{version}
+Provides:	lib%{name}-devel = %{version}
 
-%description -n %{libnamedev}
+%description -n %{libname}-devel
 The xpm-devel package contains the development libraries and header
 files  necessary for developing applications which will use the XPM
 library.  The XPM library is used by many programs for displaying
@@ -134,7 +127,7 @@
 %defattr(-,root,root)
 %{prefix}/%{_lib}/libXpm.so.*
 
-%files -n %{libnamedev}
+%files -n %{libname}-devel
 %defattr(-,root,root)
 %{prefix}/bin/*
 %{prefix}/include/X11/*
@@ -150,6 +143,9 @@
 %changelog
 * Wed Apr 25 2007 Vincent Danen <vdanen-at-build.annvix.org> 3.4k
 - rebuild (needed to build php-gd)
+- clean some provides and obsoletes
+- don't use %%libnamedev macro
+- buildreq: X11-devel instead of XFree86-devel
 
 * Sat Jun 10 2006 Vincent Danen <vdanen-at-build.annvix.org> 3.4k
 - add -doc subpackage


_______________________________________________
cvs mailing list
cvs@annvix.org
http://annvix.org/mailman/listinfo/cvs

[prev in list] [next in list] [prev in thread] [next in thread]