- Added "Requires: xorg-x11-proto-devel"

- Replace "makeinstall" with "make install DESTDIR=..."
- Remove package ownership of mandir/libdir/etc.
This commit is contained in:
mharris 2006-06-06 16:04:24 +00:00
parent a2657802ee
commit bedcc3a1b4

View File

@ -1,7 +1,7 @@
Summary: X.Org X11 libICE runtime library Summary: X.Org X11 libICE runtime library
Name: libICE Name: libICE
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
@ -20,8 +20,10 @@ X.Org X11 libICE runtime library
%package devel %package devel
Summary: X.Org X11 libICE development package Summary: X.Org X11 libICE 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}
Requires: xorg-x11-proto-devel
Obsoletes: XFree86-devel, xorg-x11-devel Obsoletes: XFree86-devel, xorg-x11-devel
@ -43,7 +45,8 @@ 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
@ -57,34 +60,32 @@ 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}/libICE.so.6 %{_libdir}/libICE.so.6
%{_libdir}/libICE.so.6.3.0 %{_libdir}/libICE.so.6.3.0
%files devel %files devel
%dir %{_includedir}/X11 %dir %{_includedir}/X11
%dir %{_includedir}/X11/ICE %dir %{_includedir}/X11/ICE
%{_includedir}/X11/ICE/ICE.h %{_includedir}/X11/ICE/*.h
%{_includedir}/X11/ICE/ICEconn.h
%{_includedir}/X11/ICE/ICElib.h
%{_includedir}/X11/ICE/ICEmsg.h
%{_includedir}/X11/ICE/ICEproto.h
%{_includedir}/X11/ICE/ICEutil.h
%if %{with_static} %if %{with_static}
%{_libdir}/libICE.a %{_libdir}/libICE.a
%endif %endif
%{_libdir}/libICE.so %{_libdir}/libICE.so
%dir %{_libdir}/pkgconfig
%{_libdir}/pkgconfig/ice.pc %{_libdir}/pkgconfig/ice.pc
%changelog %changelog
* Mon Jun 05 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-2
- Added "Requires: xorg-x11-proto-devel"
- Replace "makeinstall" with "make install DESTDIR=..."
- 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
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.0.0-2.2 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> 1.0.0-2.2
- bump again for double-long bug on ppc(64) - bump again for double-long bug on ppc(64)
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.0.0-2.1 * Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> 1.0.0-2.1
- rebuilt for new gcc4.1 snapshot and glibc changes - rebuilt for new gcc4.1 snapshot and glibc changes
* Mon Jan 23 2006 Mike A. Harris <mharris@redhat.com> 1.0.0-2 * Mon Jan 23 2006 Mike A. Harris <mharris@redhat.com> 1.0.0-2