- 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
This commit is contained in:
mharris 2005-09-30 11:22:12 +00:00
parent 500ec010b1
commit 8c22d824d7

View File

@ -1,23 +1,23 @@
%define libXp_deprecated 0 %define libXp_deprecated 0
%define pkgname libXp
Summary: X.Org X11 libXp runtime library Summary: X.Org X11 libXp runtime library
#FIXME: Change name to xorg-x11-deprecated-libs like before? #FIXME: Change name to xorg-x11-deprecated-libs like before?
Name: xorg-x11-%{pkgname} Name: libXp
Version: 0.99.0 Version: 0.99.0
Release: 2 Release: 3
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: %{pkgname}-%{version}.tar.bz2 Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: xorg-x11-proto-devel BuildRequires: xorg-x11-proto-devel
BuildRequires: libX11-devel BuildRequires: libX11-devel
BuildRequires: libXext-devel BuildRequires: libXext-devel
BuildRequires: libXau-devel BuildRequires: libXau-devel
Provides: %{pkgname}
Conflicts: XFree86-libs, xorg-x11-libs Conflicts: XFree86-libs, xorg-x11-libs
%description %description
@ -29,7 +29,7 @@ Summary: X.Org X11 libXp development package
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Provides: %{pkgname}-devel
Conflicts: XFree86-devel, xorg-x11-devel Conflicts: XFree86-devel, xorg-x11-devel
%description devel %description devel
@ -37,16 +37,22 @@ X.Org X11 libXp development package
%endif %endif
%prep %prep
%setup -q -c %{name}-%{version} %setup -q
# Disable static library creation by default.
%define with_static 0
%build %build
cd %{pkgname}-%{version}
%configure %configure \
%if ! %{with_static}
--disable-static
%endif
make make
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
cd %{pkgname}-%{version}
%makeinstall %makeinstall
%if %{libXp_deprecated} %if %{libXp_deprecated}
@ -70,14 +76,17 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc %doc AUTHORS COPYING README INSTALL ChangeLog
%dir %{_libdir} %dir %{_libdir}
%{_libdir}/libXp.so.6 %{_libdir}/libXp.so.6
%{_libdir}/libXp.so.6.2.0 %{_libdir}/libXp.so.6.2.0
%if ! %{libXp_deprecated} %if ! %{libXp_deprecated}
%files devel %files devel
%defattr(-,root,root,-)
%if %{with_static}
%{_libdir}/libXp.a %{_libdir}/libXp.a
%endif
# FIXME: Should we remove the shared lib during deprecation, so that things # FIXME: Should we remove the shared lib during deprecation, so that things
# that keep linking to libXp, will always get the static lib and not break # that keep linking to libXp, will always get the static lib and not break
# when we eventually drop libXp? # when we eventually drop libXp?
@ -88,6 +97,14 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Thu Sep 29 2005 Mike A. Harris <mharris.com> 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 <mharris@redhat.com> 0.99.0-2 * Tue Aug 23 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-2
- Renamed package to prepend "xorg-x11" to the name for consistency with - Renamed package to prepend "xorg-x11" to the name for consistency with
the rest of the X11R7 packages. the rest of the X11R7 packages.