From a7d1700190bef8db5a352c875763581f53f321f1 Mon Sep 17 00:00:00 2001 From: mharris Date: Fri, 30 Sep 2005 11:20:09 +0000 Subject: [PATCH] - 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 --- libSM.spec | 49 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/libSM.spec b/libSM.spec index e36d5c0..8eb6630 100644 --- a/libSM.spec +++ b/libSM.spec @@ -1,19 +1,19 @@ -%define pkgname libSM + Summary: X.Org X11 libSM runtime library -Name: xorg-x11-%{pkgname} +Name: libSM 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: xorg-x11-xtrans-devel BuildRequires: libICE-devel -Provides: %{pkgname} + Conflicts: XFree86-libs, xorg-x11-libs %description @@ -25,23 +25,29 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libICE-devel -Provides: %{pkgname}-devel + Conflicts: XFree86-devel, xorg-x11-devel %description devel X.Org X11 libSM 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 rm -rf $RPM_BUILD_ROOT -cd %{pkgname}-%{version} + %makeinstall # We intentionally don't ship *.la files @@ -55,23 +61,42 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc +%doc AUTHORS COPYING README INSTALL ChangeLog %dir %{_libdir} %{_libdir}/libSM.so.6 %{_libdir}/libSM.so.6.0.0 %files devel +%defattr(-,root,root,-) %dir %{_includedir}/X11 %dir %{_includedir}/X11/SM %{_includedir}/X11/SM/SM.h %{_includedir}/X11/SM/SMlib.h %{_includedir}/X11/SM/SMproto.h +%if %{with_static} %{_libdir}/libSM.a +%endif %{_libdir}/libSM.so %dir %{_libdir}/pkgconfig %{_libdir}/pkgconfig/sm.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 + +* 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.