From ac2bff5b48906a49c8e27b5cc3802c91fc8c6ee8 Mon Sep 17 00:00:00 2001 From: mharris Date: Sep 30 2005 11:24:08 +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/libfontenc.spec b/libfontenc.spec index b0ab7ec..c1d6cbf 100644 --- a/libfontenc.spec +++ b/libfontenc.spec @@ -1,18 +1,18 @@ -%define pkgname libfontenc + Summary: X.Org X11 libfontenc runtime library -Name: xorg-x11-%{pkgname} +Name: libfontenc Version: 0.99.0 -Release: 3 +Release: 4 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: zlib-devel -Provides: %{pkgname} + Conflicts: XFree86-libs, xorg-x11-libs %description @@ -23,22 +23,28 @@ Summary: X.Org X11 libfontenc development package Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Provides: %{pkgname}-devel + Conflicts: XFree86-devel, xorg-x11-devel %description devel X.Org X11 libfontenc 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 @@ -53,21 +59,32 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc +%doc AUTHORS COPYING README INSTALL ChangeLog %dir %{_libdir} %{_libdir}/libfontenc.so.1 %{_libdir}/libfontenc.so.1.0.0 %files devel +%defattr(-,root,root,-) %dir %{_includedir}/X11 %dir %{_includedir}/X11/fonts %{_includedir}/X11/fonts/fontenc.h +%if %{with_static} %{_libdir}/libfontenc.a +%endif %{_libdir}/libfontenc.so %dir %{_libdir}/pkgconfig %{_libdir}/pkgconfig/fontenc.pc %changelog +* Thu Sep 29 2005 Mike A. Harris 0.99.0-4 +- 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 + * Wed Aug 24 2005 Mike A. Harris 0.99.0-3 - Added zlib-devel build dependency