[libxfce4util/el6] Merge from master - 4.8.1

[Orion Poplawski]

commit 7a2b6fdef462109cc8cd2c5a8c4fc4c0d6939292
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu May 19 11:42:03 2011 -0600

    Merge from master - 4.8.1

 .gitignore        |    3 ++
 libxfce4util.spec |   63 +++++++++++++++++++++++++++++++++++++++-------------
 sources           |    2 +-
 3 files changed, 51 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e935ace..ceb9ae1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 libxfce4util-4.6.2.tar.bz2
+/libxfce4util-4.7.5.tar.bz2
+/libxfce4util-4.8.0.tar.bz2
+/libxfce4util-4.8.1.tar.bz2
diff --git a/libxfce4util.spec b/libxfce4util.spec
index bd66386..70fb92e 100644
--- a/libxfce4util.spec
+++ b/libxfce4util.spec
@@ -1,16 +1,19 @@
-Summary: Utility library for the Xfce4 desktop environment
-Name: libxfce4util
-Version: 4.6.2
-Release: 1%{?dist}
-License: LGPLv2+
-URL: http://www.xfce.org/
-Source0: http://archive.xfce.org/src/xfce/libxfce4util/4.6/libxfce4util-%{version}.tar.bz2
-Group: System Environment/Libraries
-Requires: glib2 >= 2.0.0
-BuildRequires: glib2-devel >= 2.0.0
-BuildRequires: gettext
-BuildRequires: intltool
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+%global xfceversion 4.8
+
+Name:           libxfce4util
+Version:        4.8.1
+Release:        2%{?dist}
+Summary:        Utility library for the Xfce4 desktop environment
+
+Group:          System Environment/Libraries
+License:        LGPLv2+
+URL:            http://www.xfce.org/
+Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires:  glib2-devel >= 2.0.0
+BuildRequires:  gettext
+BuildRequires:  intltool
+BuildRequires:  gtk-doc
 
 %description
 This package includes basic utility non-GUI functions for Xfce4.
@@ -22,7 +25,6 @@ Requires: %{name} = %{version}-%{release}
 Requires: glib2-devel
 Requires: gtk2-devel
 Requires: pkgconfig
-Requires: gtk-doc
 
 %description devel
 This package includes static libraries and header files for the
@@ -32,10 +34,15 @@ libxfce4util library.
 %setup -q
 
 %build
-%configure --disable-static
+%configure --enable-gtk-doc --disable-static
+# Remove rpaths
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
+# The LD_LIBRARY_PATH hack is needed for --enable-gtk-doc
+# because lt-libxfce4util-scan is linked against libxfce4util
+export LD_LIBRARY_PATH=$( pwd )/libxfce4util/.libs
+
 make %{?_smp_mflags}
 
 %install
@@ -64,9 +71,33 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/xfce4
-%doc %{_datadir}/gtk-doc/html/libxfce4util/
+%doc %{_datadir}/gtk-doc/
 
 %changelog
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.8.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Sun Jan 16 2011 Kevin Fenzi <kevin at tummy.com> - 4.8.1-1
+- Update to 4.8.1
+
+* Sun Jan 16 2011 Kevin Fenzi <kevin at tummy.com> - 4.8.0-1
+- Update to 4.8.0 final 
+
+* Sun Jan 02 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.5-1
+- Update to 4.7.5
+
+* Fri Dec 03 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.4-1
+- Update to 4.7.4
+
+* Sun Nov 07 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.3-1
+- Update to 4.7.3
+
+* Sun Sep 05 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.2-1
+- Update to 4.7.2
+
+* Mon Aug 23 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.2-2
+- Remove unneeded gtk-doc dep. Fixes bug #604400
+
 * Fri May 21 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.2-1
 - Update to 4.6.2
 
diff --git a/sources b/sources
index 01e2b01..dbd85e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c3129d827d480f0906c575e7a13f1e9  libxfce4util-4.6.2.tar.bz2
+2be3af4c7db5ad293a7525e1021e6f0f  libxfce4util-4.8.1.tar.bz2