From 4691b872426d578613958142b7692fb50d54979b Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 13 Oct 2009 18:02:09 +0000 Subject: [PATCH] - xbitmaps 1.1.0 - BuildArch: noarch --- .cvsignore | 2 +- sources | 2 +- xorg-x11-xbitmaps.spec | 19 +++++++++++-------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9bc7e2e..bc84429 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xbitmaps-1.0.1.tar.bz2 +xbitmaps-1.1.0.tar.bz2 diff --git a/sources b/sources index f477a3d..582ed1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b28a9840cde3c38d7c09716372fea257 xbitmaps-1.0.1.tar.bz2 +f9ddd4e70a5375508b3acaf17be0d0ab xbitmaps-1.1.0.tar.bz2 diff --git a/xorg-x11-xbitmaps.spec b/xorg-x11-xbitmaps.spec index 43fc14e..f9f9672 100644 --- a/xorg-x11-xbitmaps.spec +++ b/xorg-x11-xbitmaps.spec @@ -4,12 +4,13 @@ Summary: X.Org X11 application bitmaps Name: xorg-x11-%{pkgname} -Version: 1.0.1 -Release: 9%{?dist} +Version: 1.1.0 +Release: 1%{?dist} License: MIT Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch Source0: ftp://ftp.x.org/pub/individual/data/xbitmaps-%{version}.tar.bz2 @@ -23,8 +24,9 @@ X.Org X11 application bitmaps %setup -q -n xbitmaps-%{version} %build -# Build xbitmaps -%configure +# hack to move the pc file +sed -i 's/^libdir.*//' *.pc.in +%configure --libdir=%{_datadir} make %install @@ -38,13 +40,14 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) #%doc -%dir %{_includedir}/X11/bitmaps -%{_includedir}/X11/bitmaps/* -# Symlink for devel linking %{_includedir}/X11/bitmaps -%{_libdir}/pkgconfig/xbitmaps.pc +%{_datadir}/pkgconfig/xbitmaps.pc %changelog +* Tue Oct 13 2009 Adam Jackson 1.1.0-1 +- xbitmaps 1.1.0 +- BuildArch: noarch + * Mon Jul 27 2009 Fedora Release Engineering - 1.0.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild