- Replace "makeinstall" with "make install DESTDIR=..."
- Added "Requires: xorg-x11-proto-devel, libX11-devel, libXt-devel" to devel subpackage needed by xmu.pc, xmuu.pc - Remove package ownership of mandir/libdir/etc.
This commit is contained in:
parent
d94a428e07
commit
06247f087a
30
libXmu.spec
30
libXmu.spec
@ -1,13 +1,14 @@
|
|||||||
Summary: X.Org X11 libXmu/libXmuu runtime libraries
|
Summary: X.Org X11 libXmu/libXmuu runtime libraries
|
||||||
Name: libXmu
|
Name: libXmu
|
||||||
Version: 1.0.2
|
Version: 1.0.2
|
||||||
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: xorg-x11-util-macros
|
BuildRequires: xorg-x11-util-macros
|
||||||
BuildRequires: libX11-devel
|
BuildRequires: libX11-devel
|
||||||
@ -23,8 +24,14 @@ X.Org X11 libXmu/libXmuu runtime libraries
|
|||||||
%package devel
|
%package devel
|
||||||
Summary: X.Org X11 libXmu development package
|
Summary: X.Org X11 libXmu 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}
|
||||||
|
|
||||||
|
# proto and x11 needed by both xmu.pc and xmuu.pc
|
||||||
|
Requires: xorg-x11-util-macros
|
||||||
|
Requires: libX11-devel
|
||||||
|
# xt needed by xmu.pc
|
||||||
|
Requires: libXt-devel
|
||||||
|
|
||||||
Obsoletes: XFree86-devel, xorg-x11-devel
|
Obsoletes: XFree86-devel, xorg-x11-devel
|
||||||
|
|
||||||
@ -38,7 +45,6 @@ X.Org X11 libXmu development package
|
|||||||
%define with_static 0
|
%define with_static 0
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
%configure \
|
%configure \
|
||||||
%if ! %{with_static}
|
%if ! %{with_static}
|
||||||
--disable-static
|
--disable-static
|
||||||
@ -46,9 +52,9 @@ X.Org X11 libXmu 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
|
||||||
@ -62,7 +68,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}/libXmu.so.6
|
%{_libdir}/libXmu.so.6
|
||||||
%{_libdir}/libXmu.so.6.2.0
|
%{_libdir}/libXmu.so.6.2.0
|
||||||
%{_libdir}/libXmuu.so.1
|
%{_libdir}/libXmuu.so.1
|
||||||
@ -100,21 +105,26 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%endif
|
%endif
|
||||||
%{_libdir}/libXmu.so
|
%{_libdir}/libXmu.so
|
||||||
%{_libdir}/libXmuu.so
|
%{_libdir}/libXmuu.so
|
||||||
%dir %{_libdir}/pkgconfig
|
|
||||||
%{_libdir}/pkgconfig/xmu.pc
|
%{_libdir}/pkgconfig/xmu.pc
|
||||||
%{_libdir}/pkgconfig/xmuu.pc
|
%{_libdir}/pkgconfig/xmuu.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jun 09 2006 Mike A. Harris <mharris@redhat.com> 1.0.2-2
|
||||||
|
- Replace "makeinstall" with "make install DESTDIR=..."
|
||||||
|
- Added "Requires: xorg-x11-proto-devel, libX11-devel, libXt-devel" to devel
|
||||||
|
subpackage needed by xmu.pc, xmuu.pc
|
||||||
|
- Remove package ownership of mandir/libdir/etc.
|
||||||
|
|
||||||
* Fri May 12 2006 Adam Jackson <ajackson@redhat.com> 1.0.2-1
|
* Fri May 12 2006 Adam Jackson <ajackson@redhat.com> 1.0.2-1
|
||||||
- Update to 1.0.2
|
- Update to 1.0.2
|
||||||
|
|
||||||
* 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
|
||||||
|
Loading…
Reference in New Issue
Block a user