- Added "BuildRequires: xorg-x11-proto-devel >= 7.0-7" for "fixesproto >=

4.0"
- Added "Requires: xorg-x11-proto-devel >= 7.0-7" for "fixesproto >= 4.0"
    to devel package, needed by xfixes.pc
- Replace "makeinstall" with "make install DESTDIR=..."
- Remove package ownership of mandir/libdir/etc.
This commit is contained in:
mharris 2006-06-07 22:26:42 +00:00
parent 7a5458335e
commit f0001a1aa7

View File

@ -1,15 +1,17 @@
Summary: X.Org X11 libXfixes runtime library Summary: X.Org X11 libXfixes runtime library
Name: libXfixes Name: libXfixes
Version: 4.0.1 Version: 4.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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: libX11-devel BuildRequires: libX11-devel
BuildRequires: xorg-x11-proto-devel >= 7.0-7
Obsoletes: XFree86-libs, xorg-x11-libs Obsoletes: XFree86-libs, xorg-x11-libs
@ -19,8 +21,11 @@ X.Org X11 libXfixes runtime library
%package devel %package devel
Summary: X.Org X11 libXfixes development package Summary: X.Org X11 libXfixes development package
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires(pre): xorg-x11-filesystem >= 0.99.2-3 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
Requires: %{name} = %{version}-%{release}
# xfixes.pc Requires: xproto fixesproto >= 4.0
Requires: xorg-x11-proto-devel >= 7.0-7
Obsoletes: XFree86-devel, xorg-x11-devel Obsoletes: XFree86-devel, xorg-x11-devel
@ -34,7 +39,6 @@ X.Org X11 libXfixes development package
%define with_static 0 %define with_static 0
%build %build
%configure \ %configure \
%if ! %{with_static} %if ! %{with_static}
--disable-static --disable-static
@ -42,9 +46,9 @@ X.Org X11 libXfixes 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 +62,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}/libXfixes.so.3 %{_libdir}/libXfixes.so.3
%{_libdir}/libXfixes.so.3.1.0 %{_libdir}/libXfixes.so.3.1.0
@ -71,13 +74,18 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libXfixes.a %{_libdir}/libXfixes.a
%endif %endif
%{_libdir}/libXfixes.so %{_libdir}/libXfixes.so
%dir %{_libdir}/pkgconfig
%{_libdir}/pkgconfig/xfixes.pc %{_libdir}/pkgconfig/xfixes.pc
%dir %{_mandir} #%dir %{_mandir}/man3x
%dir %{_mandir}/man3
%{_mandir}/man3/Xfixes.3* %{_mandir}/man3/Xfixes.3*
%changelog %changelog
* Wed Jun 07 2006 Mike A. Harris <mharris@redhat.com> 4.0.1-2
- Added "BuildRequires: xorg-x11-proto-devel >= 7.0-7" for "fixesproto >= 4.0"
- Added "Requires: xorg-x11-proto-devel >= 7.0-7" for "fixesproto >= 4.0"
to devel package, needed by xfixes.pc
- Replace "makeinstall" with "make install DESTDIR=..."
- Remove package ownership of mandir/libdir/etc.
* Fri May 12 2006 Adam Jackson <ajackson@redhat.com> 4.0.1-1 * Fri May 12 2006 Adam Jackson <ajackson@redhat.com> 4.0.1-1
- Bump to 4.0.1. - Bump to 4.0.1.