- Clean up specfile.

This commit is contained in:
mharris 2005-11-12 02:53:24 +00:00
parent a2739b2f3c
commit 9deb5963f0

View File

@ -11,7 +11,7 @@
Summary: X.Org X11 application bitmaps Summary: X.Org X11 application bitmaps
Name: xorg-x11-%{pkgname} Name: xorg-x11-%{pkgname}
Version: 0.99.1 Version: 0.99.1
Release: 1 Release: 2
License: MIT/X11 License: MIT/X11
Group: User Interface/X Group: User Interface/X
URL: http://www.x.org URL: http://www.x.org
@ -19,30 +19,9 @@ Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{pkgname}-%{version
#Source0: %{pkgname}-%{version}.tar.bz2 #Source0: %{pkgname}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
# checking TWM_LIBS... -lXmu -lXt -lSM -lICE -lXext -lX11 -ldl
#BuildRequires: xorg-x11-libX11-devel
#BuildRequires: xorg-x11-libXt-devel
#BuildRequires: xorg-x11-libXmu-devel
#BuildRequires: xorg-x11-libSM-devel
#BuildRequires: xorg-x11-libICE-devel
#BuildRequires: xorg-x11-libXext-devel
# FIXME: monolithic twm packaging has a hard dep on xterm, which might still
# be required. We'll have to examine the twm configuration files.
#Requires: xterm
Provides: %{pkgname} Provides: %{pkgname}
#
Provides: %{pkgname}-devel Provides: %{pkgname}-devel
# FIXME: Ask on mailing list wether this virtual provide is remotely
# useful or not. It was present in the monolithic twm packaging.
#Provides: windowmanager
#Obsoletes: XFree86-twm
# NOTE: The twm.1 manpage was moved from the XFree86 package to the twm
# package to fix bug #70025 on July 29 2002. This must remain here as
# long as we support upgrading from OS releases that contained a version
# of XFree86 less than that indicated, both for the RHEL case, RHL case,
# and Fedora Core case. - Mike A. Harris<mharris@redhat.com>
#Conflicts: XFree86 <= 4.2.0-57.1
%description %description
X.Org X11 application bitmaps X.Org X11 application bitmaps
@ -52,20 +31,14 @@ X.Org X11 application bitmaps
%build %build
# Build xbitmaps # Build xbitmaps
#{ %configure
# pushd %{pkgname}-%{version} make
%configure
make
# popd
#}
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
#{
# pushd %{pkgname}-%{version} %makeinstall
%makeinstall
# popd
#}
# FIXME: Upstream installs the bitmaps into /usr/include by default, however # FIXME: Upstream installs the bitmaps into /usr/include by default, however
# they are used both at compiletime via #include, as well as at runtime by # they are used both at compiletime via #include, as well as at runtime by
# other apps. Being pedantically correct, it makes sense to install them # other apps. Being pedantically correct, it makes sense to install them
@ -96,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/xbitmaps.pc %{_libdir}/pkgconfig/xbitmaps.pc
%changelog %changelog
* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-2
- Clean up specfile.
* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-1 * Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-1
- Updated to xbitmaps 0.99.1 from X11R7 RC2 - Updated to xbitmaps 0.99.1 from X11R7 RC2