diff --git a/libgsf.spec b/libgsf.spec
index 4edfb35..9e68b9b 100644
--- a/libgsf.spec
+++ b/libgsf.spec
@@ -4,18 +4,16 @@
 Summary: GNOME Structured File library
 Name: libgsf
 Version: 1.14.3
-Release: 2
+Release: 3%{?dist}
 Group: System Environment/Libraries
 License: LGPL
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.11/%{name}-%{version}.tar.bz2
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: glib2 >= 2.2.0
-BuildRequires: glib2-devel >= 2.2.0, perl-XML-Parser
+Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.14/%{name}-%{version}.tar.bz2
+URL: http://www.gnome.org/projects/libgsf/
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: glib2-devel, perl-XML-Parser
 BuildRequires: libtool, libxml2-devel, gnome-vfs2-devel, bzip2-devel, gettext
 BuildRequires: libbonobo-devel, pygtk2-devel
 
-Obsoletes: libgsf113
-
 %description
 A library for reading and writing structured files (eg MS OLE and Zip)
 
@@ -29,28 +27,19 @@ Requires: gnome-vfs2
 Libraries for using libgsf in conjunction with the GNOME applications
 
 %package devel
-Summary: Support files necessary to compile applications with libgsf.
+Summary: Support files necessary to compile applications with libgsf
 Group: Development/Libraries
-Requires: libgsf = %{version}-%{release}
-# pkgconfig
-Requires: glib2-devel
-Requires: libxml2-devel
-# headers included
-Obsoletes: libgsf113-devel
+Requires: libgsf = %{version}-%{release}, glib2-devel, libxml2-devel
+Requires: pkgconfig
 
 %description devel
-Libraries, headers, and support files necessary to compile applications using libgsf.
+Libraries, headers, and support files necessary to compile applications using 
+libgsf.
 
 %package gnome-devel
 Summary: Support files necessary to compile applications with libgsf and GNOME
 Group: Development/Libraries
-Requires: libgsf = %{version}-%{release}
-Requires: libgsf-devel = %{version}-%{release}
-# pkgconfig
-Requires: glib2-devel
-Requires: libxml2-devel
-# headers included
-Requires: gnome-vfs2-devel
+Requires: libgsf-devel = %{version}-%{release}, gnome-vfs2-devel
 
 %description gnome-devel
 Libraries, headers, and support files necessary to compile applications using
@@ -67,23 +56,22 @@ Python bindings for libgsf
 %setup -q
 
 %build
-%configure --disable-gtk-doc
+%configure --disable-gtk-doc --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make DESTDIR=$RPM_BUILD_ROOT install
 %find_lang libgsf
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{python_lib_sitearch}/gsf/*.la
-rm -f $RPM_BUILD_ROOT/%{python_lib_sitearch}/gsf/*.a
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files -f libgsf.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{_libdir}/libgsf-1.so.*
 %{_bindir}/gsf-office-thumbnailer
@@ -91,14 +79,17 @@ rm -f $RPM_BUILD_ROOT/%{python_lib_sitearch}/gsf/*.a
 %{_mandir}/man1/gsf-office-thumbnailer.1.gz
 
 %files gnome
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/libgsf-gnome-1.so.*
 
+%post gnome -p /sbin/ldconfig
+
+%postun gnome -p /sbin/ldconfig
+
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/gsf
 %{_bindir}/gsf-vba-dump
-%{_libdir}/libgsf-1.a
 %{_libdir}/libgsf-1.so
 %{_libdir}/pkgconfig/libgsf-1.pc
 %{_includedir}/libgsf-1/gsf
@@ -106,14 +97,13 @@ rm -f $RPM_BUILD_ROOT/%{python_lib_sitearch}/gsf/*.a
 %{_datadir}/gtk-doc/html/gsf
 
 %files gnome-devel
-%defattr(-,root,root)
-%{_libdir}/libgsf-gnome-1.a
+%defattr(-,root,root,-)
 %{_libdir}/libgsf-gnome-1.so
 %{_libdir}/pkgconfig/libgsf-gnome-1.pc
 %{_includedir}/libgsf-1/gsf-gnome
 
 %files python
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %dir %{python_py_sitearch}/gsf
 %{python_py_sitearch}/gsf/__init__.*
 %dir %{python_lib_sitearch}/gsf
@@ -123,6 +113,9 @@ rm -f $RPM_BUILD_ROOT/%{python_lib_sitearch}/gsf/*.a
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Fri Feb 09 2007 Caolan McNamara <caolanm@redhat.com> 1.14.3-3
+- some spec cleanups
+
 * Thu Dec  7 2006 Jeremy Katz <katzj@redhat.com> - 1.14.3-2
 - rebuild for python 2.5