From f9607cc2b808f45b2e7ea4fce617227618c22977 Mon Sep 17 00:00:00 2001 From: paragn Date: Thu, 8 Oct 2009 10:40:33 +0000 Subject: [PATCH] - Merge-Review #226071 - Removed XFree86-libs, xorg-x11-libs, XFree86-devel, xorg-x11-devel as Obsoletes - Removed BR:pkgconfig - spec cleanups --- libXfixes.spec | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/libXfixes.spec b/libXfixes.spec index 8684374..e209029 100644 --- a/libXfixes.spec +++ b/libXfixes.spec @@ -1,7 +1,7 @@ -Summary: X.Org X11 libXfixes runtime library +Summary: X Fixes library Name: libXfixes Version: 4.0.3 -Release: 8%{?dist} +Release: 9%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -9,27 +9,23 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 -BuildRequires: pkgconfig BuildRequires: libX11-devel BuildRequires: xorg-x11-proto-devel >= 7.0-7 -Obsoletes: XFree86-libs, xorg-x11-libs - %description -X.Org X11 libXfixes runtime library +X Fixes library. %package devel -Summary: X.Org X11 libXfixes development package +Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: pkgconfig # xfixes.pc Requires: xproto fixesproto >= 4.0 Requires: xorg-x11-proto-devel >= 7.0-7 -Obsoletes: XFree86-devel, xorg-x11-devel - %description devel -X.Org X11 libXfixes development package +libXfixes development package %prep %setup -q @@ -42,12 +38,12 @@ X.Org X11 libXfixes development package %if ! %{with_static} --disable-static %endif -make +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" # We intentionally don't ship *.la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.la @@ -75,6 +71,12 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/Xfixes.3* %changelog +* Thu Oct 08 2009 Parag - 4.0.3-9 +- Merge-Review #226071 +- Removed XFree86-libs, xorg-x11-libs, XFree86-devel, xorg-x11-devel as Obsoletes +- Removed BR:pkgconfig +- spec cleanups + * Fri Jul 24 2009 Fedora Release Engineering - 4.0.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild