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

- Replace "makeinstall" with "make install DESTDIR=..." for (#192725)
- Remove package ownership of mandir/libdir/etc.
This commit is contained in:
mharris 2006-06-06 04:51:53 +00:00
parent 215a517193
commit eca4c29bcf

View File

@ -1,13 +1,14 @@
Summary: X.Org X11 libXres runtime library Summary: X.Org X11 libXres runtime library
Name: libXres Name: libXres
Version: 1.0.1 Version: 1.0.1
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/%{name}-%{version}.tar.bz2 Source0: http://xorg.freedesktop.org/releases/individual/lib/%{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: libX11-devel BuildRequires: libX11-devel
BuildRequires: libXext-devel BuildRequires: libXext-devel
@ -42,9 +43,8 @@ X.Org X11 libXres development package
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
@ -58,7 +58,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}/libXRes.so.1 %{_libdir}/libXRes.so.1
%{_libdir}/libXRes.so.1.0.0 %{_libdir}/libXRes.so.1.0.0
@ -73,11 +72,15 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libXRes.so %{_libdir}/libXRes.so
%dir %{_libdir}/pkgconfig %dir %{_libdir}/pkgconfig
%{_libdir}/pkgconfig/xres.pc %{_libdir}/pkgconfig/xres.pc
%dir %{_mandir} #%dir %{_mandir}/man3x
%dir %{_mandir}/man3
%{_mandir}/man3/*.3x* %{_mandir}/man3/*.3x*
%changelog %changelog
* Mon Jun 05 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-2
- Added "BuildRequires: pkgconfig" for (#193502)
- Replace "makeinstall" with "make install DESTDIR=..." for (#192725)
- Remove package ownership of mandir/libdir/etc.
* Thu Apr 27 2006 Adam Jackson <ajackson@redhat.com> 1.0.1-1 * Thu Apr 27 2006 Adam Jackson <ajackson@redhat.com> 1.0.1-1
- Update to 1.0.1 - Update to 1.0.1