[libxfce4ui] Update to 4.9.1
Kevin Fenzi
kevin at fedoraproject.org
Wed Apr 4 22:35:22 UTC 2012
commit 27d1f0528372344e18dba6176385c18b48db9880
Author: Kevin Fenzi <kevin at scrye.com>
Date: Wed Apr 4 16:35:17 2012 -0600
Update to 4.9.1
.gitignore | 1 +
libxfce4ui-4.7.6-keyboard-shortcuts.patch | 25 ---------------------
libxfce4ui-4.8.0-fix-control-shortcuts.patch | 30 --------------------------
libxfce4ui.spec | 25 ++++++++++++---------
sources | 2 +-
5 files changed, 16 insertions(+), 67 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 906477e..6de8907 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ libxfce4ui-4.7.2.tar.bz2
/libxfce4ui-4.7.6.tar.bz2
/libxfce4ui-4.8.0.tar.bz2
/libxfce4ui-4.8.1.tar.bz2
+/libxfce4ui-4.9.1.tar.bz2
diff --git a/libxfce4ui.spec b/libxfce4ui.spec
index 1efe932..afa4836 100644
--- a/libxfce4ui.spec
+++ b/libxfce4ui.spec
@@ -1,10 +1,10 @@
# Review at https://bugzilla.redhat.com/show_bug.cgi?id=554599
-%global xfceversion 4.8
+%global xfceversion 4.9
Name: libxfce4ui
-Version: 4.8.1
-Release: 2%{?dist}
+Version: 4.9.1
+Release: 1%{?dist}
Summary: Commonly used Xfce widgets
Group: System Environment/Libraries
@@ -12,10 +12,6 @@ License: LGPLv2+
URL: http://xfce.org/
#VCS git:git://git.xfce.org/xfce/libxfce4ui
Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
-Patch0: libxfce4ui-4.7.6-keyboard-shortcuts.patch
-# From https://bugzilla.redhat.com/show_bug.cgi?id=768704
-# Still needs to be upstreamed
-Patch1: libxfce4ui-4.8.0-fix-control-shortcuts.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glib2-devel >= 2.12.0
@@ -25,6 +21,7 @@ BuildRequires: libxfce4util-devel >= %{xfceversion}
BuildRequires: xfconf-devel >= %{xfceversion}
BuildRequires: startup-notification-devel >= 0.4
BuildRequires: gtk-doc
+BuildRequires: desktop-file-utils
# FIXME: Enable libglade again one day
#BuildRequires: glade3-libgladeui-devel >= 3.5.0
BuildRequires: gettext
@@ -57,8 +54,6 @@ developing applications that use %{name}.
%prep
%setup -q
-%patch0 -p1 -b .shortcut
-%patch1 -p1 -b .fix-control-shortcuts
%build
@@ -80,7 +75,10 @@ rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%find_lang %{name}
-
+desktop-file-install \
+ --delete-original \
+ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+ ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce4-about.desktop
%clean
rm -rf $RPM_BUILD_ROOT
@@ -101,13 +99,18 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-,root,root,-)
%doc TODO
+%{_bindir}/xfce4-about
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%doc %{_datadir}/gtk-doc/
-
+%{_datadir}/applications/xfce4-about.desktop
+%{_datadir}/icons/hicolor/48x48/apps/xfce4-logo.png
%changelog
+* Sun Apr 01 2012 Kevin Fenzi <kevin at scrye.com> - 4.9.1-1
+- Update to 4.9.1
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.8.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 96c0904..2f0ebcf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-30bd432dd0f19305e846a122d4c7c6fe libxfce4ui-4.8.1.tar.bz2
+ad3a9b4e1fc395d0372788cfa0eb3eb2 libxfce4ui-4.9.1.tar.bz2
More information about the scm-commits
mailing list