rpms/libxfcegui4/EL-5 libxfcegui4-4.4.2-xfce-exec-use-thunar.patch, NONE, 1.1 libxfcegui4-4.6.0-keyboard-shortcuts.patch, NONE, 1.1 libxfcegui4.spec, 1.20, 1.21 sources, 1.8, 1.9 .cvsignore, 1.8, 1.9

Kevin Fenzi kevin at fedoraproject.org
Sun Jul 25 22:46:18 UTC 2010


Author: kevin

Update of /cvs/pkgs/rpms/libxfcegui4/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14981

Modified Files:
	libxfcegui4.spec sources .cvsignore 
Added Files:
	libxfcegui4-4.4.2-xfce-exec-use-thunar.patch 
	libxfcegui4-4.6.0-keyboard-shortcuts.patch 
Log Message:
Iniital version for epel5


libxfcegui4-4.4.2-xfce-exec-use-thunar.patch:
 xfce-exec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libxfcegui4-4.4.2-xfce-exec-use-thunar.patch ---
--- libxfcegui4-4.4.2.orig/libxfcegui4/xfce-exec.c	2007-11-29 06:46:46.000000000 +0100
+++ libxfcegui4-4.4.2/libxfcegui4/xfce-exec.c	2008-10-03 02:23:33.000000000 +0200
@@ -218,7 +218,7 @@
         if (in_terminal)
             argv[0] = g_strdup ("xfterm4");
 	else
-	    argv[0] = g_strdup ("xftree4");
+	    argv[0] = g_strdup ("thunar");
         
         argv[1] = realcmd;
         argv[2] = NULL;

libxfcegui4-4.6.0-keyboard-shortcuts.patch:
 xfce4-keyboard-shortcuts.xml |   11 +++++++++++
 1 file changed, 11 insertions(+)

--- NEW FILE libxfcegui4-4.6.0-keyboard-shortcuts.patch ---
--- libxfcegui4-4.6.0.orig/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml	2009-02-18 09:58:22.000000000 +0100
+++ libxfcegui4-4.6.0/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml	2009-02-28 21:25:33.000000000 +0100
@@ -3,9 +3,20 @@
 <channel name="xfce4-keyboard-shortcuts" version="1.0">
   <property name="commands" type="empty">
     <property name="default" type="empty">
+      <property name="&lt;Alt&gt;F1" type="string" value="xfhelp4"/>
       <property name="&lt;Alt&gt;F2" type="string" value="xfrun4"/>
       <property name="&lt;Control&gt;&lt;Alt&gt;Delete" type="string" value="xflock4"/>
+      <property name="&lt;Control&gt;&lt;Alt&gt;Escape" type="string" value="xkill"/>
+      <property name="&lt;Control&gt;Escape" type="string" value="xfce4-popup-menu"/>
+      <property name="&lt;Control&gt;&lt;Alt&gt;L" type="string" value="xfce4-session-logout"/>
+      <property name="XF86WWW" type="string" value="xfbrowser4"/>
+      <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/>
       <property name="XF86Display" type="string" value="xrandr --auto"/>
+      <property name="XF86AudioRaiseVolume" type="string" value="amixer set Master 10%+ -q"/>
+      <property name="XF86AudioLowerVolume" type="string" value="amixer set Master 10%- -q"/>
+      <property name="XF86AudioMute" type="string" value="amixer set Master toggle -q"/>
+      <property name="Print" type="string" value="xfce4-screenshooter -f"/>
+      <property name="&lt;Alt&gt;Print" type="string" value="xfce4-screenshooter -w"/>
     </property>
   </property>
   <property name="xfwm4" type="empty">


Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxfcegui4/EL-5/libxfcegui4.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- libxfcegui4.spec	27 Aug 2007 04:46:43 -0000	1.20
+++ libxfcegui4.spec	25 Jul 2010 22:46:17 -0000	1.21
@@ -1,30 +1,40 @@
+%global xfceversion 4.6
+
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
-Version: 4.4.1
-Release: 3%{?dist}
+Version: 4.6.4
+Release: 1%{?dist}
 License: LGPLv2+
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.4.1/src/libxfcegui4-4.4.1.tar.bz2
-Group: Development/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: gtk2 >= 2.0.6
-Requires: libxfce4util >= %{version}
+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}
 BuildRequires: gtk2-devel >= 2.0.6
-BuildRequires: libxfce4util-devel >= %{version}
+BuildRequires: libxfce4util-devel >= %{xfceversion}
 BuildRequires: libxml2-devel >= 2.4.0
-BuildRequires: imake
-BuildRequires: libXt-devel
 BuildRequires: gettext
+BuildRequires: xfconf-devel
+BuildRequires: startup-notification-devel
+BuildRequires: libglade2-devel
+BuildRequires: perl(XML::Parser)
+BuildRequires: intltool
+BuildRequires: libSM-devel
 
 %description
 The package includes various gtk widgets for Xfce.
 
 %package devel
-Summary: Developpment tools for libxfcegui4 library
+Summary: Development tools for libxfcegui4 library
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: gtk2-devel
 Requires: libxfce4util-devel
+Requires: pkgconfig
+Requires: gtk-doc
 
 %description devel
 This package includes the static libraries and header files you will need
@@ -32,9 +42,13 @@ to compile applications for Xfce.
 
 %prep
 %setup -q
+%patch0 -p1 -b .thunar
+%patch1 -p1 -b .shortcut
 
 %build
 %configure --enable-xinerama --disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 make %{?_smp_mflags}
 
@@ -43,6 +57,8 @@ 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
 
 %find_lang %{name}
 
@@ -50,30 +66,94 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mo
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-/sbin/ldconfig
+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 
 %{_libdir}/lib*.so.*
+%{_libdir}/libglade/*/lib*.so
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_datadir}/icons/hicolor/scalable/apps/xfce-filemanager.svg
+%{_sysconfdir}/xdg/xfce4
 
 %files devel
 %defattr(-, root,root,-)
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/xfce4/*
-%{_datadir}/gtk-doc/html/libxfcegui4/
+%doc %{_datadir}/gtk-doc/html/libxfcegui4/
 
 %changelog
+* Fri May 21 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.4-1
+- Update to 4.6.4
+
+* Wed May 19 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.3-2
+- Rebuild for new glade version. 
+
+* Wed Jan 21 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.3-1
+- Update to 4.6.3
+
+* Tue Jan 05 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.2-1
+- Update to 4.6.2
+- Drop upstreamed patches
+- Update BuildRoot tag and Sourc0 URL
+
+* Mon Nov 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-3
+- Fix SEGV inside disconnect() helper (#532179)
+- Update gtk-icon-cache scriptlets
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
+* Mon Mar 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-3
+- Patch to bring back missing keyboard shortcuts from Xfce 4.4
+- Make devel package require glade3-libgladeui-devel, pkgconfig and gtk-doc
+- Mark gtk-doc files as %%doc
+
+* Fri Feb 27 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-2
+- Add back in libSM-devel to BuildRequires
+
+* Thu Feb 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-1
+- Update to 4.6.0
+- Remove some unneeded BuildRequires
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.5.99.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Jan 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.99.1-1
+- Update to 4.5.99.1
+
+* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
+- Update to 4.5.93
+
+* Sun Dec 21 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
+- Update to 4.5.92
+
+* Mon Oct 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-1
+- Update to 4.4.3
+
+* Fri Oct 03 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.2-3
+- Make xfce-exec use Thunar
+
+* Sun Feb 10 2008 Kevin Fenzi <kevin at tummy.com> - 4.4.2-2
+- Rebuild for gcc43
+
+* Sun Nov 18 2007 Kevin Fenzi <kevin at tummy.com> - 4.4.2-1
+- Update to 4.4.2
+
 * Sun Aug 26 2007 Kevin Fenzi <kevin at tummy.com> - 4.4.1-3
 - Update License tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxfcegui4/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	23 Apr 2007 01:33:07 -0000	1.8
+++ sources	25 Jul 2010 22:46:17 -0000	1.9
@@ -1 +1 @@
-1e695429e9b7fbfb1bb5e78f6006be43  libxfcegui4-4.4.1.tar.bz2
+88de59b222cb9977f93a4c61011c1e1f  libxfcegui4-4.6.4.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libxfcegui4/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	23 Apr 2007 01:33:07 -0000	1.8
+++ .cvsignore	25 Jul 2010 22:46:18 -0000	1.9
@@ -1 +1 @@
-libxfcegui4-4.4.1.tar.bz2
+libxfcegui4-4.6.4.tar.bz2



More information about the scm-commits mailing list