From bbff641f486ffec21bc2980c7a97025c917f6e30 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Jan 06 2011 22:48:58 +0000 Subject: - Update to 4.7.6 --- diff --git a/.gitignore b/.gitignore index ae55b28..8d5db45 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ libxfce4ui-4.7.2.tar.bz2 /libxfce4ui-4.7.3.tar.bz2 +/libxfce4ui-4.7.6.tar.bz2 diff --git a/libxfce4ui-4.7.3-keyboard-shortcuts.patch b/libxfce4ui-4.7.3-keyboard-shortcuts.patch deleted file mode 100644 index e12e6a4..0000000 --- a/libxfce4ui-4.7.3-keyboard-shortcuts.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- libxfce4ui-4.7.3.orig/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml 2010-09-05 12:34:39.000000000 +0200 -+++ libxfce4ui-4.7.3/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml 2010-09-05 23:42:24.000000000 +0200 -@@ -3,10 +3,21 @@ - - - -+ - - -+ -+ -+ -+ -+ - - -+ -+ -+ -+ -+ - - - diff --git a/libxfce4ui-4.7.6-keyboard-shortcuts.patch b/libxfce4ui-4.7.6-keyboard-shortcuts.patch new file mode 100644 index 0000000..e6aab11 --- /dev/null +++ b/libxfce4ui-4.7.6-keyboard-shortcuts.patch @@ -0,0 +1,25 @@ +--- libxfce4ui-4.7.6.orig/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml 2011-01-02 13:51:19.000000000 +0100 ++++ libxfce4ui-4.7.6/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml 2011-01-02 15:25:28.037969250 +0100 +@@ -3,11 +3,22 @@ + + + ++ + + ++ ++ ++ ++ ++ + + + ++ ++ ++ ++ ++ + + + diff --git a/libxfce4ui.spec b/libxfce4ui.spec index 39fd813..c5e3a9a 100644 --- a/libxfce4ui.spec +++ b/libxfce4ui.spec @@ -1,7 +1,7 @@ %global xfceversion 4.7 Name: libxfce4ui -Version: 4.7.3 +Version: 4.7.6 Release: 1%{?dist} Summary: Commonly used Xfce widgets @@ -9,23 +9,19 @@ Group: System Environment/Libraries License: LGPLv2+ URL: http://xfce.org/ Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2 -Patch0: libxfce4ui-4.7.3-keyboard-shortcuts.patch +Patch0: libxfce4ui-4.7.6-keyboard-shortcuts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel >= 2.12.0 BuildRequires: gtk2-devel >= 2.12.0 BuildRequires: libSM-devel -# FIXME: replace 4.6.0 with %{xfceversion} or %{version} once this is stable -BuildRequires: libxfce4util-devel >= 4.6.0 -BuildRequires: xfconf-devel >= 4.6.0 +BuildRequires: libxfce4util-devel >= %{xfceversion} +BuildRequires: xfconf-devel >= %{xfceversion} BuildRequires: startup-notification-devel >= 0.4 BuildRequires: glade3-libgladeui-devel >= 3.5.0 BuildRequires: gettext BuildRequires: intltool -# FIXME: remove after libxfcegui4 -> libxfce4ui transition -Requires: libxfcegui4 - -# do this later +# FIXME: obsolete libxfcegui4 one day #Provides: libxfcegui4 = %{version} #Obsoletes: libxfcegui4 < %{version} @@ -41,7 +37,7 @@ Requires: gtk2-devel Requires: libxfce4util-devel Requires: glade3-libgladeui-devel Requires: pkgconfig -# do this later +# FIXME: obsolete libxfcegui4 one day #Provides: libxfcegui4-devel = %{version} #Obsoletes: libxfcegui4-devel < %{version} @@ -74,8 +70,6 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %find_lang %{name} -# to fix the file conflict, remove after libxfcegui4 -> libxfce4ui transition -rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/xdg/xfce4 %clean rm -rf $RPM_BUILD_ROOT @@ -89,8 +83,7 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README THANKS -# FIXME: re-enable after libxfcegui4 -> libxfce4ui transition -#%config(noreplace) %{_sysconfdir}/xdg/xfce4 +%config(noreplace) %{_sysconfdir}/xdg/xfce4 %{_libdir}/*.so.* %files devel @@ -106,6 +99,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jan 02 2011 Christoph Wickert - 4.7.6-1 +- Update to 4.7.6 + +* Mon Nov 29 2010 Christoph Wickert - 4.7.5-1 +- Update to 4.7.5 + +* Mon Nov 08 2010 Christoph Wickert - 4.7.4-1 +- Update to 4.7.4 + * Sun Sep 05 2010 Christoph Wickert - 4.7.3-1 - Update to 4.7.3 - Drop dependency on gtk-doc (#604399) diff --git a/sources b/sources index 289d1f8..3774f48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -919ebc5891a4403fa352f65e42ee401f libxfce4ui-4.7.3.tar.bz2 +beccb7eb6fb36bec38b5d140ed42480e libxfce4ui-4.7.6.tar.bz2