From 719a8f12c17a8c4c271def9c5c4ff1c10eed9506 Mon Sep 17 00:00:00 2001 From: mharris Date: Jun 09 2006 12:06:39 +0000 Subject: - Added "Requires: xorg-x11-proto-devel" to devel package for xres.pc --- diff --git a/libXres.spec b/libXres.spec index 8de80f8..b07f5cb 100644 --- a/libXres.spec +++ b/libXres.spec @@ -1,13 +1,14 @@ Summary: X.Org X11 libXres runtime library Name: libXres Version: 1.0.1 -Release: 2 +Release: 3 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 BuildRequires: libXext-devel @@ -20,8 +21,11 @@ X.Org X11 libXres runtime library %package devel Summary: X.Org X11 libXres development package Group: Development/Libraries -Requires: %{name} = %{version}-%{release} Requires(pre): xorg-x11-filesystem >= 0.99.2-3 +Requires: %{name} = %{version}-%{release} + +# needed by xres.pc +Requires: xorg-x11-proto-devel Obsoletes: XFree86-devel, xorg-x11-devel @@ -35,7 +39,6 @@ X.Org X11 libXres development package %define with_static 0 %build - %configure \ %if ! %{with_static} --disable-static @@ -44,6 +47,7 @@ make %install rm -rf $RPM_BUILD_ROOT + make install DESTDIR=$RPM_BUILD_ROOT # We intentionally don't ship *.la files @@ -70,12 +74,14 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libXRes.a %endif %{_libdir}/libXRes.so -%dir %{_libdir}/pkgconfig %{_libdir}/pkgconfig/xres.pc #%dir %{_mandir}/man3x %{_mandir}/man3/*.3x* %changelog +* Fri Jun 09 2006 Mike A. Harris 1.0.1-3 +- Added "Requires: xorg-x11-proto-devel" to devel package for xres.pc + * Mon Jun 05 2006 Mike A. Harris 1.0.1-2 - Added "BuildRequires: pkgconfig" for (#193502) - Replace "makeinstall" with "make install DESTDIR=..." for (#192725)