[libFS] 1.0.2, merge review

[Adam Jackson]

commit 1176883bd44f0f42966125510811bba2ac92924f
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Aug 30 15:55:32 2010 -0400

    1.0.2, merge review

 .gitignore |    1 +
 libFS.spec |   24 ++++++++----------------
 sources    |    2 +-
 3 files changed, 10 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8ca2bd4..552ebeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 libFS-1.0.0.tar.bz2
+/libFS-1.0.2.tar.bz2
diff --git a/libFS.spec b/libFS.spec
index 6c05d2b..bc81871 100644
--- a/libFS.spec
+++ b/libFS.spec
@@ -1,12 +1,11 @@
 Summary: X.Org X11 libFS runtime library
 Name: libFS
-Version: 1.0.1
-Release: 5%{?dist}
+Version: 1.0.2
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
@@ -20,28 +19,20 @@ Summary: X.Org X11 libFS development package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
-Provides: %{name}-devel
-
 %description devel
 X.Org X11 libFS development package
 
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -61,13 +52,14 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/X11/fonts/FSlib.h
-%if %{with_static}
-%{_libdir}/libFS.a
-%endif
 %{_libdir}/libFS.so
 %{_libdir}/pkgconfig/libfs.pc
 
 %changelog
+* Mon Aug 30 2010 Adam Jackson <ajax at redhat.com> 1.0.2-1
+- libFS 1.0.2
+- merge review cleanups (#226005)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 3dc377c..4757264 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-81521249353fa33be7a4bb0062c2fbb9  libFS-1.0.1.tar.bz2
+ecf2d6a27da053500283e803efa2a808  libFS-1.0.2.tar.bz2