- Although ./configure checks for libXt and libXext, and indicates that

they are missing, it continues to build anyway, and just does not build
    sxpm if they are not present. Therefore, libXt-devel and libXext-devel
    are required build deps in order to get sxpm built.
- Added missing defattr to devel subpackage.
This commit is contained in:
mharris 2005-09-04 10:18:54 +00:00
parent acdca7bf01
commit b04b9c5409

View File

@ -2,7 +2,7 @@
Summary: X.Org X11 libXpm runtime library Summary: X.Org X11 libXpm runtime library
Name: xorg-x11-%{pkgname} Name: xorg-x11-%{pkgname}
Version: 3.5.2 Version: 3.5.2
Release: 2 Release: 4
License: MIT/X11 License: MIT/X11
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.x.org URL: http://www.x.org
@ -11,6 +11,43 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: xorg-x11-proto-devel BuildRequires: xorg-x11-proto-devel
BuildRequires: xorg-x11-libX11-devel BuildRequires: xorg-x11-libX11-devel
# FIXME: Although ./configure checks for libXt and libXext, and indicates
# that they are missing, it continues to build anyway, and just does not
# build sxpm if they are not present. Therefore, libXt-devel and
# libXext-devel are required build deps in order to get sxpm built.
BuildRequires: libXt-devel
BuildRequires: libXext-devel
%if 0
[root@fc4i386 RPMS]# ldd /usr/bin/sxpm
linux-gate.so.1 => (0x0044b000)
libXt.so.6 => /usr/lib/libXt.so.6 (0x00f7b000)
libSM.so.6 => /usr/lib/libSM.so.6 (0x0081f000)
libICE.so.6 => /usr/lib/libICE.so.6 (0x00b6b000)
libXext.so.6 => /usr/lib/libXext.so.6 (0x00959000)
libXpm.so.4 => /usr/lib/libXpm.so.4 (0x00b01000)
libX11.so.6 => /usr/lib/libX11.so.6 (0x00d7e000)
libdl.so.2 => /lib/libdl.so.2 (0x00408000)
libc.so.6 => /lib/libc.so.6 (0x002b6000)
libXau.so.6 => /usr/lib/libXau.so.6 (0x00111000)
libXdmcp.so.6 => /usr/lib/libXdmcp.so.6 (0x00114000)
/lib/ld-linux.so.2 (0x00298000)
[root@fc4i386 RPMS]# rpm -qp --requires xorg-x11-libXpm-devel-3.5.2-2.i386.rpm
libICE.so.6
libSM.so.6
libX11.so.6
libXext.so.6
libXpm.so.4
libXt.so.6
libc.so.6
libc.so.6(GLIBC_2.0)
libc.so.6(GLIBC_2.1)
libc.so.6(GLIBC_2.3)
libdl.so.2
rpmlib(CompressedFileNames) <= 3.0.4-1
rpmlib(PayloadFilesHavePrefix) <= 4.0-1
xorg-x11-libXpm = 3.5.2-2
%endif
Provides: %{pkgname} Provides: %{pkgname}
Conflicts: XFree86-libs, xorg-x11-libs Conflicts: XFree86-libs, xorg-x11-libs
@ -59,6 +96,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libXpm.so.4.11.0 %{_libdir}/libXpm.so.4.11.0
%files devel %files devel
%defattr(-,root,root,-)
%{_bindir}/cxpm %{_bindir}/cxpm
%{_bindir}/sxpm %{_bindir}/sxpm
%dir %{_includedir}/X11 %dir %{_includedir}/X11
@ -69,13 +107,20 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/xpm.pc %{_libdir}/pkgconfig/xpm.pc
%changelog %changelog
* Wed Aug 24 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-3 * Sun Sep 4 2005 Mike A. Harris <mharris@redhat.com> 3.5.2-4
- Although ./configure checks for libXt and libXext, and indicates
that they are missing, it continues to build anyway, and just does not
build sxpm if they are not present. Therefore, libXt-devel and
libXext-devel are required build deps in order to get sxpm built.
- Added missing defattr to devel subpackage.
* Wed Aug 24 2005 Mike A. Harris <mharris@redhat.com> 3.5.2-3
- Changed all virtual BuildRequires to the "xorg-x11-" prefixed non-virtual - Changed all virtual BuildRequires to the "xorg-x11-" prefixed non-virtual
package names, as we want xorg-x11 libs to explicitly build against package names, as we want xorg-x11 libs to explicitly build against
X.Org supplied libs, rather than "any implementation", which is what the X.Org supplied libs, rather than "any implementation", which is what the
virtual provides is intended for. virtual provides is intended for.
* Tue Aug 23 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-2 * Tue Aug 23 2005 Mike A. Harris <mharris@redhat.com> 3.5.2-2
- Renamed package to prepend "xorg-x11" to the name for consistency with - Renamed package to prepend "xorg-x11" to the name for consistency with
the rest of the X11R7 packages. the rest of the X11R7 packages.
- Added "Requires: %%{name} = %%{version}-%%{release}" dependency to devel - Added "Requires: %%{name} = %%{version}-%%{release}" dependency to devel