From b6d8f509f65de475833671cb525c8dc3d7b1fa13 Mon Sep 17 00:00:00 2001 From: mharris Date: Fri, 9 Jun 2006 11:42:15 +0000 Subject: [PATCH] trivial spec cleanups --- libXpm.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libXpm.spec b/libXpm.spec index 07c4942..90b9682 100644 --- a/libXpm.spec +++ b/libXpm.spec @@ -5,9 +5,10 @@ Release: 2 License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org -Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2 + BuildRequires: pkgconfig BuildRequires: xorg-x11-proto-devel BuildRequires: libX11-devel @@ -27,9 +28,9 @@ X.Org X11 libXpm runtime library %package devel Summary: X.Org X11 libXpm development package Group: Development/Libraries - -Requires: %{name} = %{version}-%{release} Requires(pre): xorg-x11-filesystem >= 0.99.2-3 +Requires: %{name} = %{version}-%{release} + Requires: libX11-devel Obsoletes: XFree86-devel, xorg-x11-devel @@ -81,7 +82,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libXpm.a %endif %{_libdir}/libXpm.so -%dir %{_libdir}/pkgconfig %{_libdir}/pkgconfig/xpm.pc #%dir %{_mandir}/man1x %{_mandir}/man1/*.1* @@ -96,10 +96,10 @@ rm -rf $RPM_BUILD_ROOT * Thu Apr 26 2006 Adam Jackson 3.5.5-1 - Update to 3.5.5 -* Fri Feb 10 2006 Jesse Keating - 3.5.4.2-2.2 +* Fri Feb 10 2006 Jesse Keating 3.5.4.2-2.2 - bump again for double-long bug on ppc(64) -* Tue Feb 07 2006 Jesse Keating - 3.5.4.2-2.1 +* Tue Feb 07 2006 Jesse Keating 3.5.4.2-2.1 - rebuilt for new gcc4.1 snapshot and glibc changes * Mon Jan 23 2006 Mike A. Harris 3.5.4.2-2 @@ -125,7 +125,6 @@ rm -rf $RPM_BUILD_ROOT - Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes' - Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes' - * Mon Oct 24 2005 Mike A. Harris 3.5.3-1 - Updated libXpm to version 3.5.3 from X11R7 RC1 - Added manpages for sxpm, cxpm