From e2db27002e4afd0c088f83b7b15a5f9402f8f290 Mon Sep 17 00:00:00 2001 From: mharris Date: Wed, 1 Mar 2006 06:50:17 +0000 Subject: [PATCH] minor spec cleanups --- xorg-x11-xbitmaps.spec | 50 +++++++++++------------------------------- 1 file changed, 13 insertions(+), 37 deletions(-) diff --git a/xorg-x11-xbitmaps.spec b/xorg-x11-xbitmaps.spec index 241f4f0..f54d993 100644 --- a/xorg-x11-xbitmaps.spec +++ b/xorg-x11-xbitmaps.spec @@ -1,14 +1,18 @@ %define pkgname xbitmaps +%define debug_package %{nil} + Summary: X.Org X11 application bitmaps Name: xorg-x11-%{pkgname} Version: 1.0.1 -Release: 1.2 +Release: 2 License: MIT/X11 Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/%{pkgname}-%{version}.tar.bz2 +Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2 + +BuildArchitecture: noarch # NOTE: This dependency on xorg-x11-filesystem is required to work around # a nasty upgrade problem when going from FC4->FC5 or monolithic to @@ -34,57 +38,29 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -# 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 -# other apps. Being pedantically correct, it makes sense to install them -# into the FHS sanctioned /usr/share heirarchy instead for runtime arch -# independent data. Then provide a symlink from /usr/include to the -# runtime dir for apps to link to. Since this is too much overhead for -# a separate devel subpackage, I've added a virtual Provide above so this -# package provides both. This should be fixed upstream IMHO to use -# /usr/share by default. -%if 0 -{ - mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11 - mv $RPM_BUILD_ROOT%{_includedir}/X11/bitmaps $RPM_BUILD_ROOT%{_datadir}/X11/ - ln -sf ../../..%{_datadir}/X11/bitmaps $RPM_BUILD_ROOT%{_includedir}/X11/ -} -%endif - %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc -%if 0 - -%dir %{_datadir} -%dir %{_datadir}/X11 -%dir %{_datadir}/X11/bitmaps -%{_datadir}/X11/bitmaps/* -# Symlink for devel linking -%{_includedir}/X11/bitmaps - -%else - -%dir %{_includedir} %dir %{_includedir}/X11 %dir %{_includedir}/X11/bitmaps %{_includedir}/X11/bitmaps/* # Symlink for devel linking %{_includedir}/X11/bitmaps - -%endif - -%dir %{_libdir}/pkgconfig %{_libdir}/pkgconfig/xbitmaps.pc %changelog -* Fri Feb 10 2006 Jesse Keating - 1.0.1-1.2 +* Wed Mar 01 2006 Mike A. Harris 1.0.1-2 +- Cleaned up file manifest. +- Made package noarch, as it is just header files. +- Disable debuginfo processing, as there are no ELF objects in package. + +* Fri Feb 10 2006 Jesse Keating 1.0.1-1.2 - bump again for double-long bug on ppc(64) -* Tue Feb 07 2006 Jesse Keating - 1.0.1-1.1 +* Tue Feb 07 2006 Jesse Keating 1.0.1-1.1 - rebuilt for new gcc4.1 snapshot and glibc changes * Wed Jan 18 2006 Mike A. Harris 1.0.1-1