[xfconf] - Update to 4.7.5

[Christoph Wickert]

commit 9c5d18b0969e1f098da7446760f4f941809ba644
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Thu Jan 6 23:32:49 2011 +0100

    - Update to 4.7.5

 .gitignore  |    1 +
 sources     |    2 +-
 xfconf.spec |   65 +++++++++++++++++++++++++++++++++-------------------------
 3 files changed, 39 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bff547b..c098ac6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 xfconf-4.6.2.tar.bz2
+/xfconf-4.7.5.tar.bz2
diff --git a/sources b/sources
index c3ba2c4..33a6f85 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5ff93c15077c6dbbcd38c437bc1ab2ef  xfconf-4.6.2.tar.bz2
+c72007ce68808b64f39d26e2fb51da46  xfconf-4.7.5.tar.bz2
diff --git a/xfconf.spec b/xfconf.spec
index ad6333b..908afea 100644
--- a/xfconf.spec
+++ b/xfconf.spec
@@ -1,20 +1,25 @@
+%global xfceversion 4.7
+
 Name:           xfconf
-Version:        4.6.2
-Release:        3%{?dist}
+Version:        4.7.5
+Release:        1%{?dist}
 Summary:        Hierarchical configuration system for Xfce
 
 Group:          System Environment/Base
 License:        GPLv2
 URL:            http://www.xfce.org/
-Source0:	http://archive.xfce.org/src/xfce/xfconf/4.6/xfconf-%{version}.tar.bz2
+Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
-BuildRequires:  libxfce4util-devel = %{version}
+BuildRequires:  libxfce4util-devel >= %{xfceversion}
 BuildRequires:  dbus-devel
 BuildRequires:  dbus-glib-devel
-BuildRequires:  perl(ExtUtils::Depends) perl(ExtUtils::PkgConfig) perl(Glib)
-BuildRequires:  perl(ExtUtils::MakeMaker) perl(Glib::MakeHelper)
+BuildRequires:  perl(ExtUtils::Depends)
+BuildRequires:  perl(ExtUtils::PkgConfig)
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Glib)
+BuildRequires:  perl(Glib::MakeHelper)
 BuildRequires:  gettext
 BuildRequires:  intltool
 
@@ -27,26 +32,26 @@ Xfconf is a hierarchical (tree-like) configuration system where the
 immediate child nodes of the root are called "channels".  All settings
 beneath the channel nodes are called "properties."
 
-%package devel
-Summary: Development tools for xfconf
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
-Requires: dbus-devel
-Requires: dbus-glib-devel
-Requires: glib2-devel
-Obsoletes: libxfce4mcs-devel < 4.4.3-3
-Obsoletes: xfce-mcs-manager-devel < 4.4.3-3
+%package        devel
+Summary:        Development tools for xfconf
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
+Requires:       dbus-devel
+Requires:       dbus-glib-devel
+Requires:       glib2-devel
+Obsoletes:      libxfce4mcs-devel < 4.4.3-3
+Obsoletes:      xfce-mcs-manager-devel < 4.4.3-3
 
 %description devel
 This package includes the libraries and header files you will need
 to compile applications for xfconf.
 
 %package perl
-Summary: Perl modules for xfconf
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Summary:        Perl modules for xfconf
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description perl
 This package includes the perl modules and files you will need to 
@@ -64,7 +69,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 # remove unneeded la files. 
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
@@ -79,10 +84,6 @@ chmod 755 $RPM_BUILD_ROOT/%{perl_vendorarch}/auto/Xfce4/Xfconf/Xfconf.so
 
 %find_lang %{name}
 
-# we need to own
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/xfce4/
-mkdir -p ${RPM_BUILD_ROOT}%{_libexecdir}/xfce4/
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -95,10 +96,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog NEWS TODO COPYING
 %{_libdir}/lib*.so.*
 %{_bindir}/xfconf-query
-%{_libexecdir}/xfconfd
+%{_libdir}/xfce4/xfconf/
 %{_datadir}/dbus-1/services/org.xfce.Xfconf.service
-%ghost %dir %{_libdir}/xfce4/
-%ghost %dir %{_libexecdir}/xfce4/
 
 %files devel
 %defattr(-,root,root,-)
@@ -114,6 +113,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* 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
+- Fix directory ownership
+
+* Sun Sep 05 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.3-1
+- Update to 4.7.3
+
 * Mon Aug 23 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.2-3
 - Remove unneeded gtk-doc dep. Fixes bug #604423