- Replace "makeinstall" with "make install DESTDIR=..."

- Added "Requires: xorg-x11-proto-devel >= 7.0-10, libXfixes-devel to devel
    subpackage needed by xcomposite.pc
- Remove package ownership of mandir/libdir/etc.
This commit is contained in:
mharris 2006-06-07 17:58:15 +00:00
parent 47da4c357b
commit 4d26dbc2e0

View File

@ -1,7 +1,7 @@
Summary: X.Org X11 libXcomposite runtime library Summary: X.Org X11 libXcomposite runtime library
Name: libXcomposite Name: libXcomposite
Version: 0.3 Version: 0.3
Release: 4 Release: 5
License: MIT/X11 License: MIT/X11
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.x.org URL: http://www.x.org
@ -22,8 +22,11 @@ X.Org X11 libXcomposite runtime library
%package devel %package devel
Summary: X.Org X11 libXcomposite development package Summary: X.Org X11 libXcomposite 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 >= 7.0-10
Requires: libXfixes-devel
Obsoletes: XFree86-devel, xorg-x11-devel Obsoletes: XFree86-devel, xorg-x11-devel
@ -47,7 +50,7 @@ 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
@ -61,7 +64,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}/libXcomposite.so.1 %{_libdir}/libXcomposite.so.1
%{_libdir}/libXcomposite.so.1.0.0 %{_libdir}/libXcomposite.so.1.0.0
@ -74,10 +76,15 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libXcomposite.a %{_libdir}/libXcomposite.a
%endif %endif
%{_libdir}/libXcomposite.so %{_libdir}/libXcomposite.so
%dir %{_libdir}/pkgconfig
%{_libdir}/pkgconfig/xcomposite.pc %{_libdir}/pkgconfig/xcomposite.pc
%changelog %changelog
* Wed Jun 07 2006 Mike A. Harris <mharris@redhat.com> 0.3-5
- Replace "makeinstall" with "make install DESTDIR=..."
- Added "Requires: xorg-x11-proto-devel >= 7.0-10, libXfixes-devel to devel
subpackage needed by xcomposite.pc
- Remove package ownership of mandir/libdir/etc.
* Mon Apr 10 2006 Kristian Høgsberg <krh@redhat.com> 0.3-4 * Mon Apr 10 2006 Kristian Høgsberg <krh@redhat.com> 0.3-4
- Bump for build in fc5-bling. - Bump for build in fc5-bling.