[libxfcegui4] - Update to 4.7.0

[Christoph Wickert]

commit a069f6e23dcbbc91302c6b3bf9c4c639e05c9924
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Fri Jan 7 00:19:24 2011 +0100

    - Update to 4.7.0

 .gitignore                                 |    1 +
 libxfcegui4-4.6.0-keyboard-shortcuts.patch |   23 -------
 libxfcegui4.spec                           |   93 +++++++++++++++-------------
 sources                                    |    2 +-
 4 files changed, 51 insertions(+), 68 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6f8b311..7564252 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 libxfcegui4-4.6.4.tar.bz2
+/libxfcegui4-4.7.0.tar.bz2
diff --git a/libxfcegui4.spec b/libxfcegui4.spec
index 810d864..607884d 100644
--- a/libxfcegui4.spec
+++ b/libxfcegui4.spec
@@ -1,51 +1,51 @@
-%global xfceversion 4.6
-
-Summary: GTK widgets for Xfce
-Name: libxfcegui4
-Version: 4.6.4
-Release: 3%{?dist}
-License: LGPLv2+
-URL: http://www.xfce.org/
-Source0: http://archive.xfce.org/src/xfce/libxfcegui4/4.6/libxfcegui4-%{version}.tar.bz2
-Patch0: %{name}-4.4.2-xfce-exec-use-thunar.patch
-Patch1: %{name}-4.6.0-keyboard-shortcuts.patch
-Group: System Environment/Libraries
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Requires: gtk2 >= 2.10.0
-Requires: libxfce4util >= %{xfceversion}
-Requires: gnome-icon-theme-legacy
-BuildRequires: gtk2-devel >= 2.0.6
-BuildRequires: libxfce4util-devel >= %{xfceversion}
-BuildRequires: libxml2-devel >= 2.4.0
-BuildRequires: gettext
-BuildRequires: xfconf-devel
-BuildRequires: startup-notification-devel
-BuildRequires: libglade2-devel
-BuildRequires: glade3-libgladeui-devel
-BuildRequires: perl(XML::Parser)
-BuildRequires: intltool
-BuildRequires: libSM-devel
+%global xfceversion 4.7
+
+Name:           libxfcegui4
+Version:        4.7.0
+Release:        1%{?dist}
+Summary:        GTK widgets for Xfce
+
+Group:          System Environment/Libraries
+License:        LGPLv2+
+URL:            http://www.xfce.org/
+Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
+Patch0:         %{name}-4.4.2-xfce-exec-use-thunar.patch
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires:  gtk2-devel >= 2.0.6
+BuildRequires:  libxfce4util-devel >= %{xfceversion}
+BuildRequires:  libxml2-devel >= 2.4.0
+BuildRequires:  gettext
+BuildRequires:  xfconf-devel
+BuildRequires:  startup-notification-devel
+BuildRequires:  libglade2-devel
+BuildRequires:  glade3-libgladeui-devel
+BuildRequires:  perl(XML::Parser)
+BuildRequires:  intltool
+BuildRequires:  libSM-devel
+Requires:       libxfce4util >= %{xfceversion}
+Requires:       gnome-icon-theme-legacy
 
 %description
 The package includes various gtk widgets for Xfce.
 
 %package devel
-Summary: Development tools for libxfcegui4 library
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: gtk2-devel
-Requires: libxfce4util-devel
-Requires: glade3-libgladeui-devel
-Requires: pkgconfig
+Summary:        Development tools for libxfcegui4 library
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       gtk2-devel
+Requires:       libxfce4util-devel
+Requires:       glade3-libgladeui-devel
+Requires:       pkgconfig
 
 %description devel
-This package includes the static libraries and header files you will need
-to compile applications for Xfce.
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
 
 %prep
 %setup -q
 %patch0 -p1 -b .thunar
-%patch1 -p1 -b .shortcut
+
 
 %build
 %configure --enable-xinerama --disable-static
@@ -54,31 +54,33 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/modules/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/libglade/*/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/glade3/*/*.la
-
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %find_lang %{name}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
+
 %postun
 if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING 
@@ -86,7 +88,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/libglade/*/lib*.so
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_datadir}/icons/hicolor/scalable/apps/xfce-filemanager.svg
-%{_sysconfdir}/xdg/xfce4
 
 %files devel
 %defattr(-, root,root,-)
@@ -99,7 +100,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/glade3/catalogs/xfce4.xml.in
 %{_datadir}/glade3/pixmaps/hicolor/*/actions/*
 
+
 %changelog
+* Mon Nov 08 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.0-1
+- Update to 4.7.0
+
 * Sun Nov 07 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.4-3
 - Require gnome-icon-theme-legacy (fixes #647734 and #650504)
 
diff --git a/sources b/sources
index c2b3ea4..5e10622 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-88de59b222cb9977f93a4c61011c1e1f  libxfcegui4-4.6.4.tar.bz2
+6614e26739cf1500553d79b2ed1a4e5b  libxfcegui4-4.7.0.tar.bz2