[xfce4-settings] - Update to 4.7.7
Christoph Wickert
cwickert at fedoraproject.org
Sat Jan 8 22:04:37 UTC 2011
commit 65fca45af6c3504c8c844a8b5bc8a7bc7da90506
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Sat Jan 8 23:04:26 2011 +0100
- Update to 4.7.7
.gitignore | 1 +
sources | 2 +-
xfce4-settings-4.6.4-dsofix.patch | 24 -------
xfce4-settings-4.6.5-libnotify.patch | 12 ----
xfce4-settings.spec | 112 +++++++++++++---------------------
5 files changed, 45 insertions(+), 106 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e03f97b..807ab38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
xfce4-settings-4.6.5.tar.bz2
+/xfce4-settings-4.7.7.tar.bz2
diff --git a/sources b/sources
index 2191839..2150d80 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f988cb732913b5fbc115ad7105d2231e xfce4-settings-4.6.5.tar.bz2
+e18fb70781bc45d60b7ec9031fa3bf35 xfce4-settings-4.7.7.tar.bz2
diff --git a/xfce4-settings.spec b/xfce4-settings.spec
index 972e1d6..5b744be 100644
--- a/xfce4-settings.spec
+++ b/xfce4-settings.spec
@@ -1,35 +1,33 @@
-%global xfceversion 4.6
+%global xfceversion 4.7
Name: xfce4-settings
-Version: 4.6.5
-Release: 2%{?dist}
+Version: 4.7.7
+Release: 1%{?dist}
Summary: Settings Manager for Xfce
Group: User Interface/Desktops
# xfce4-settings-helper is GPLv2 only.
License: GPLv2+ and GPLv2
URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
-# Upstream bug: http://bugzilla.xfce.org/show_bug.cgi?id=6236
-Patch1: xfce4-settings-4.6.4-dsofix.patch
-Patch2: xfce4-settings-4.6.5-libnotify.patch
+Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
# use vendor's artwork
-Patch10: xfce4-settings-4.6.0-fedora.patch
+Patch0: xfce4-settings-4.6.0-fedora.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gettext
-BuildRequires: intltool
-BuildRequires: exo-devel >= 0.3.93
-BuildRequires: libxfcegui4-devel >= %{xfceversion}
-BuildRequires: libxfce4util-devel >= %{xfceversion}
-BuildRequires: xfconf-devel >= %{xfceversion}
-BuildRequires: libglade2-devel
-BuildRequires: libwnck-devel
-BuildRequires: desktop-file-utils >= 0.7
-BuildRequires: libnotify-devel
-BuildRequires: libcanberra-devel
-BuildRequires: libxklavier-devel
-Requires: xfconf
+BuildRequires: gettext
+BuildRequires: intltool
+BuildRequires: exo-devel >= 0.5.0
+BuildRequires: libxfce4ui-devel >= %{xfceversion}
+BuildRequires: libxfce4util-devel >= %{xfceversion}
+BuildRequires: xfconf-devel >= %{xfceversion}
+BuildRequires: libglade2-devel
+BuildRequires: libwnck-devel
+BuildRequires: desktop-file-utils >= 0.7
+BuildRequires: libnotify-devel
+BuildRequires: libcanberra-devel
+BuildRequires: libxklavier-devel
+BuildRequires: libXrandr-devel
+Requires: xfconf
Obsoletes: xfce-mcs-manager < 4.4.3-2
Obsoletes: xfce-mcs-plugins < 4.4.3-2
@@ -42,65 +40,28 @@ This package includes the settings manager applications for the Xfce desktop.
%prep
%setup -q
-%patch1 -p1 -b .dsofix
-%patch2 -p1 -b .libnotify
-%patch10 -p1 -b .vendor
+%patch0 -p1 -b .vendor
+
%build
-%configure --enable-sound-settings
+%configure --enable-sound-settings --enable-pluggable-dialogs
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-desktop-file-install \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/ \
- --delete-original \
- ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-display-settings.desktop
-
-desktop-file-install \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/ \
- --delete-original \
- ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-keyboard-settings.desktop
-
-desktop-file-install \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/ \
- --delete-original \
- ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-mouse-settings.desktop
-
-desktop-file-install \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/ \
- --delete-original \
- --remove-key="Encoding" \
- ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-settings-manager.desktop
-
-desktop-file-install \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/ \
- --delete-original \
- ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-ui-settings.desktop
-
-desktop-file-install \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/ \
- --delete-original \
- ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce4-accessibility-settings.desktop
-
-desktop-file-install \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/ \
- --delete-original \
- --remove-key="Encoding" \
- ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce4-settings-editor.desktop
-
-desktop-file-install \
- --dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/ \
- --delete-original \
- --add-only-show-in=XFCE \
- --remove-key=Terminal \
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+
+for file in ${RPM_BUILD_ROOT}%{_datadir}/applications/*.desktop ; do
+ desktop-file-validate $file
+done
+
+desktop-file-validate \
${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/xfce4-settings-helper-autostart.desktop
%find_lang %{name}
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -122,6 +83,19 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/applications/xfce*.desktop
%changelog
+* Sun Jan 02 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.7-1
+- Update to 4.7.7
+
+* Sun Dec 05 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.6-1
+- Update to 4.7.6
+- Drop libnotify fix (upstreamed)
+
+* Fri Dec 03 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.5-1
+- Update to 4.7.5
+
+* Mon Nov 08 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.4-1
+- Update to 4.7.4
+
* Fri Nov 05 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.5-2
- Update for new libnotify
More information about the scm-commits
mailing list