From 7d29e01ec258ef34b607788e9caf08ccecf40bc7 Mon Sep 17 00:00:00 2001 From: mharris Date: Wed, 7 Jun 2006 20:42:37 +0000 Subject: [PATCH] - Added "BuildRequires: xorg-x11-proto-devel >= 7.0-1" as xcursor.pc indicates "damageproto >= 1.0" is required. - Added "Requires: xorg-x11-proto-devel >= 7.0-1, libXfixes-devel" to devel package also, as per xcursor.pc - Replace "makeinstall" with "make install DESTDIR=..." - Remove package ownership of mandir/libdir/etc. --- libXdamage.spec | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/libXdamage.spec b/libXdamage.spec index f7dd974..d21c85c 100644 --- a/libXdamage.spec +++ b/libXdamage.spec @@ -1,15 +1,17 @@ Summary: X.Org X11 libXdamage runtime library Name: libXdamage Version: 1.0.3 -Release: 1 +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: libX11-devel +# NOTE: Needs damageproto >= 1.0 +BuildRequires: xorg-x11-proto-devel >= 7.0-1 BuildRequires: libXfixes-devel Obsoletes: XFree86-libs, xorg-x11-libs @@ -20,8 +22,12 @@ X.Org X11 libXdamage runtime library %package devel Summary: X.Org X11 libXdamage development package Group: Development/Libraries -Requires: %{name} = %{version}-%{release} Requires(pre): xorg-x11-filesystem >= 0.99.2-3 +Requires: %{name} = %{version}-%{release} + +# xdamage.pc Requires: xproto damageproto >= 1.0 xfixes +Requires: xorg-x11-proto-devel >= 7.0-1 +Requires: libXfixes-devel Obsoletes: XFree86-devel, xorg-x11-devel @@ -35,7 +41,6 @@ X.Org X11 libXdamage development package %define with_static 0 %build - %configure \ %if ! %{with_static} --disable-static @@ -43,9 +48,9 @@ X.Org X11 libXdamage development package make %install - rm -rf $RPM_BUILD_ROOT -%makeinstall + +make install DESTDIR=$RPM_BUILD_ROOT # We intentionally don't ship *.la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.la @@ -59,7 +64,6 @@ rm -rf $RPM_BUILD_ROOT %%files %defattr(-,root,root,-) %doc AUTHORS COPYING README INSTALL ChangeLog -%dir %{_libdir} %{_libdir}/libXdamage.so.1 %{_libdir}/libXdamage.so.1.0.0 @@ -72,17 +76,24 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libXdamage.a %endif %{_libdir}/libXdamage.so -%dir %{_libdir}/pkgconfig %{_libdir}/pkgconfig/xdamage.pc %changelog +* Wed Jun 07 2006 Mike A. Harris 1.0.3-2 +- Added "BuildRequires: xorg-x11-proto-devel >= 7.0-1" as xcursor.pc indicates + "damageproto >= 1.0" is required. +- Added "Requires: xorg-x11-proto-devel >= 7.0-1, libXfixes-devel" to devel + package also, as per xcursor.pc +- Replace "makeinstall" with "make install DESTDIR=..." +- Remove package ownership of mandir/libdir/etc. + * Thu Apr 27 2006 Adam Jackson 1.0.3-1 - Update to 1.0.3 -* Fri Feb 10 2006 Jesse Keating - 1.0.2.2-2.2 +* Fri Feb 10 2006 Jesse Keating 1.0.2.2-2.2 - bump again for double-long bug on ppc(64) -* Tue Feb 07 2006 Jesse Keating - 1.0.2.2-2.1 +* Tue Feb 07 2006 Jesse Keating 1.0.2.2-2.1 - rebuilt for new gcc4.1 snapshot and glibc changes * Mon Jan 23 2006 Mike A. Harris 1.0.2.2-2