- Replace "makeinstall" with "make install DESTDIR=..."
- Added "Requires: xorg-x11-proto-devel" to devel for xinerama.pc - Remove package ownership of mandir/libdir/etc.
This commit is contained in:
parent
9b0088b5e5
commit
f43c05b673
@ -1,13 +1,14 @@
|
||||
Summary: X.Org X11 libXinerama runtime library
|
||||
Name: libXinerama
|
||||
Version: 1.0.1
|
||||
Release: 1.2
|
||||
Release: 2
|
||||
License: MIT/X11
|
||||
Group: System Environment/Libraries
|
||||
URL: http://www.x.org
|
||||
Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/%{name}-%{version}.tar.bz2
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/%{name}-%{version}.tar.bz2
|
||||
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: xorg-x11-proto-devel
|
||||
BuildRequires: libX11-devel
|
||||
@ -22,8 +23,11 @@ X.Org X11 libXinerama runtime library
|
||||
%package devel
|
||||
Summary: X.Org X11 libXinerama development package
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires(pre): xorg-x11-filesystem >= 0.99.2-3
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
# needed by xinerama.pc
|
||||
Requires: xorg-x11-proto-devel
|
||||
|
||||
Obsoletes: XFree86-devel, xorg-x11-devel
|
||||
|
||||
@ -45,9 +49,9 @@ X.Org X11 libXinerama 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
|
||||
@ -61,7 +65,6 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS COPYING README INSTALL ChangeLog
|
||||
%dir %{_libdir}
|
||||
%{_libdir}/libXinerama.so.1
|
||||
%{_libdir}/libXinerama.so.1.0.0
|
||||
|
||||
@ -71,14 +74,18 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_libdir}/libXinerama.a
|
||||
%endif
|
||||
%{_libdir}/libXinerama.so
|
||||
%dir %{_libdir}/pkgconfig
|
||||
%{_libdir}/pkgconfig/xinerama.pc
|
||||
|
||||
%changelog
|
||||
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.0.1-1.2
|
||||
* Fri Jun 09 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-2
|
||||
- Replace "makeinstall" with "make install DESTDIR=..."
|
||||
- Added "Requires: xorg-x11-proto-devel" to devel for xinerama.pc
|
||||
- Remove package ownership of mandir/libdir/etc.
|
||||
|
||||
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> 1.0.1-1.2
|
||||
- bump again for double-long bug on ppc(64)
|
||||
|
||||
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.0.1-1.1
|
||||
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> 1.0.1-1.1
|
||||
- rebuilt for new gcc4.1 snapshot and glibc changes
|
||||
|
||||
* Wed Jan 18 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-1
|
||||
|
Loading…
Reference in New Issue
Block a user