diff --git a/.gitignore b/.gitignore index 3458e6a..68f7e53 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ libXmu-1.0.5.tar.bz2 +/libXmu-1.1.0.tar.bz2 diff --git a/libXmu.spec b/libXmu.spec index 0e997b3..8317566 100644 --- a/libXmu.spec +++ b/libXmu.spec @@ -1,11 +1,12 @@ +# TODO: libXmuu split and/or elf filter emulation + Summary: X.Org X11 libXmu/libXmuu runtime libraries Name: libXmu -Version: 1.0.5 -Release: 2%{?dist} +Version: 1.1.0 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 @@ -13,6 +14,7 @@ BuildRequires: xorg-x11-util-macros BuildRequires: libX11-devel BuildRequires: libXext-devel BuildRequires: libXt-devel +BuildRequires: xmlto %description X.Org X11 libXmu/libXmuu runtime libraries @@ -32,14 +34,8 @@ X.Org X11 libXmu development package %prep %setup -q -# Disable static library creation by default. -%define with_static 0 - %build -%configure \ -%if ! %{with_static} - --disable-static -%endif +%configure --disable-static make %{?_smp_mflags} %install @@ -50,6 +46,9 @@ make install DESTDIR=$RPM_BUILD_ROOT # We intentionally don't ship *.la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +# fixup later +rm -rf $RPM_BUILD_ROOT%{_docdir} + %clean rm -rf $RPM_BUILD_ROOT @@ -67,6 +66,7 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) %dir %{_includedir}/X11/Xmu +%doc doc/*.txt %{_includedir}/X11/Xmu/Atoms.h %{_includedir}/X11/Xmu/CharSet.h %{_includedir}/X11/Xmu/CloseHook.h @@ -85,20 +85,20 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/X11/Xmu/StdCmap.h %{_includedir}/X11/Xmu/StdSel.h %{_includedir}/X11/Xmu/SysUtil.h +%{_includedir}/X11/Xmu/WhitePoint.h %{_includedir}/X11/Xmu/WidgetNode.h %{_includedir}/X11/Xmu/WinUtil.h %{_includedir}/X11/Xmu/Xct.h %{_includedir}/X11/Xmu/Xmu.h -%if %{with_static} -%{_libdir}/libXmu.a -%{_libdir}/libXmuu.a -%endif %{_libdir}/libXmu.so %{_libdir}/libXmuu.so %{_libdir}/pkgconfig/xmu.pc %{_libdir}/pkgconfig/xmuu.pc %changelog +* Mon Nov 08 2010 Adam Jackson 1.1.0-1 +- libXmu 1.1.0 + * Fri Feb 05 2010 Peter Hutterer 1.0.5-2 - Remove BR of libXau-devel, not needed. diff --git a/sources b/sources index 14ca741..f294b96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fc4d66be7a1a1eb474954728415e46d6 libXmu-1.0.5.tar.bz2 +6836883a0120e8346cf7f58dc42e465a libXmu-1.1.0.tar.bz2