- Merge Review #226081 Spec cleanups

This commit is contained in:
pnemade 2008-01-14 09:32:18 +00:00
parent caeeef3cce
commit cd9db6ee19

View File

@ -1,8 +1,8 @@
Summary: X.Org X11 libXpm runtime library Summary: X.Org X11 libXpm runtime library
Name: libXpm Name: libXpm
Version: 3.5.7 Version: 3.5.7
Release: 1%{?dist} Release: 2%{?dist}
License: MIT/X11 License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.x.org URL: http://www.x.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -10,7 +10,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
BuildRequires: gettext BuildRequires: gettext
BuildRequires: pkgconfig
BuildRequires: xorg-x11-proto-devel BuildRequires: xorg-x11-proto-devel
BuildRequires: libX11-devel BuildRequires: libX11-devel
# FIXME: Although ./configure checks for libXt and libXext, and indicates # FIXME: Although ./configure checks for libXt and libXext, and indicates
@ -32,7 +31,7 @@ Group: Development/Libraries
Requires(pre): xorg-x11-filesystem >= 0.99.2-3 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: libX11-devel Requires: libX11-devel pkgconfig
Obsoletes: XFree86-devel, xorg-x11-devel Obsoletes: XFree86-devel, xorg-x11-devel
@ -50,7 +49,7 @@ X.Org X11 libXpm development package
%if ! %{with_static} %if ! %{with_static}
--disable-static --disable-static
%endif %endif
make make %{?_smp_mflags}
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -68,13 +67,12 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS COPYING README ChangeLog %doc AUTHORS COPYING CHANGES ChangeLog
%{_libdir}/libXpm.so.4 %{_libdir}/libXpm.so.4
%{_libdir}/libXpm.so.4.11.0 %{_libdir}/libXpm.so.4.11.0
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%defattr(-,root,root,-)
%{_bindir}/cxpm %{_bindir}/cxpm
%{_bindir}/sxpm %{_bindir}/sxpm
%dir %{_includedir}/X11 %dir %{_includedir}/X11
@ -89,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
#%{_mandir}/man1/*.1x* #%{_mandir}/man1/*.1x*
%changelog %changelog
* Mon Jan 14 2008 parag <paragn@fedoraproject.org> 3.5.7-2
- Merge Review #226081 Spec cleanups
* Mon Sep 24 2007 Adam Jackson <ajax@redhat.com> 3.5.7-1 * Mon Sep 24 2007 Adam Jackson <ajax@redhat.com> 3.5.7-1
- libXpm 3.5.7 - libXpm 3.5.7