From c228757573fad46667079a9bf61b89c83fbfe17d Mon Sep 17 00:00:00 2001 From: mharris Date: Sep 30 2005 11:21:59 +0000 Subject: - Renamed package to remove xorg-x11 from the name due to unanimous decision between developers. - Use Fedora Extras style BuildRoot tag. - Disable static library creation by default. - Add missing defattr to devel subpackage - Add missing documentation files to doc macro --- diff --git a/libXinerama.spec b/libXinerama.spec index 17a1837..399be5d 100644 --- a/libXinerama.spec +++ b/libXinerama.spec @@ -1,19 +1,19 @@ -%define pkgname libXinerama + Summary: X.Org X11 libXinerama runtime library -Name: xorg-x11-%{pkgname} +Name: libXinerama Version: 0.99.0 -Release: 2 +Release: 3 License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org -Source0: %{pkgname}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-proto-devel BuildRequires: libX11-devel BuildRequires: libXext-devel -Provides: %{pkgname} + Conflicts: XFree86-libs, xorg-x11-libs %description @@ -24,22 +24,28 @@ Summary: X.Org X11 libXinerama development package Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Provides: %{pkgname}-devel + Conflicts: XFree86-devel, xorg-x11-devel %description devel X.Org X11 libXinerama development package %prep -%setup -q -c %{name}-%{version} +%setup -q + +# Disable static library creation by default. +%define with_static 0 %build -cd %{pkgname}-%{version} -%configure + +%configure \ +%if ! %{with_static} + --disable-static +%endif make %install -cd %{pkgname}-%{version} + rm -rf $RPM_BUILD_ROOT %makeinstall @@ -54,18 +60,29 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc +%doc AUTHORS COPYING README INSTALL ChangeLog %dir %{_libdir} %{_libdir}/libXinerama.so.1 %{_libdir}/libXinerama.so.1.0.0 %files devel +%defattr(-,root,root,-) +%if %{with_static} %{_libdir}/libXinerama.a +%endif %{_libdir}/libXinerama.so %dir %{_libdir}/pkgconfig %{_libdir}/pkgconfig/xinerama.pc %changelog +* Thu Sep 29 2005 Mike A. Harris 0.99.0-3 +- Renamed package to remove xorg-x11 from the name due to unanimous decision + between developers. +- Use Fedora Extras style BuildRoot tag. +- Disable static library creation by default. +- Add missing defattr to devel subpackage +- Add missing documentation files to doc macro + * Tue Aug 23 2005 Mike A. Harris 0.99.0-2 - Renamed package to prepend "xorg-x11" to the name for consistency with the rest of the X11R7 packages.