diff --git a/libxkbfile.spec b/libxkbfile.spec index b094941..5759e9e 100644 --- a/libxkbfile.spec +++ b/libxkbfile.spec @@ -1,13 +1,14 @@ Summary: X.Org X11 libxkbfile runtime library Name: libxkbfile 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/libxkbfile/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: pkgconfig BuildRequires: xorg-x11-proto-devel BuildRequires: libX11-devel @@ -44,9 +45,9 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" 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 @@ -60,7 +61,6 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING README INSTALL ChangeLog -%dir %{_libdir} %{_libdir}/libxkbfile.so.1 %{_libdir}/libxkbfile.so.1.0.2 @@ -82,6 +82,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/xkbfile.pc %changelog +* Mon Jun 05 2006 Mike A. Harris 1.0.3-2 +- Added "BuildRequires: pkgconfig" for (#193424) +- 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