- Added "BuildRequires: pkgconfig" for (#193424)

- Replace "makeinstall" with "make install DESTDIR=..."
- Remove package ownership of mandir/libdir/etc.
This commit is contained in:
mharris 2006-06-06 05:02:02 +00:00
parent 160417bb61
commit 9a6d4b175f

View File

@ -1,13 +1,14 @@
Summary: X.Org X11 libxkbfile runtime library Summary: X.Org X11 libxkbfile runtime library
Name: libxkbfile Name: libxkbfile
Version: 1.0.3 Version: 1.0.3
Release: 1 Release: 2
License: MIT/X11 License: MIT/X11
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.x.org URL: http://www.x.org
Source0: http://xorg.freedesktop.org/releases/individual/lib/libxkbfile/%{name}-%{version}.tar.bz2 Source0: http://xorg.freedesktop.org/releases/individual/lib/libxkbfile/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig
BuildRequires: xorg-x11-proto-devel BuildRequires: xorg-x11-proto-devel
BuildRequires: libX11-devel BuildRequires: libX11-devel
@ -44,9 +45,9 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
make make
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%makeinstall
make install DESTDIR=$RPM_BUILD_ROOT
# We intentionally don't ship *.la files # We intentionally don't ship *.la files
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@ -60,7 +61,6 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS COPYING README INSTALL ChangeLog %doc AUTHORS COPYING README INSTALL ChangeLog
%dir %{_libdir}
%{_libdir}/libxkbfile.so.1 %{_libdir}/libxkbfile.so.1
%{_libdir}/libxkbfile.so.1.0.2 %{_libdir}/libxkbfile.so.1.0.2
@ -82,6 +82,11 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/xkbfile.pc %{_libdir}/pkgconfig/xkbfile.pc
%changelog %changelog
* Mon Jun 05 2006 Mike A. Harris <mharris@redhat.com> 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 <ajackson@redhat.com> 1.0.3-1 * Thu Apr 27 2006 Adam Jackson <ajackson@redhat.com> 1.0.3-1
- Update to 1.0.3 - Update to 1.0.3