rpms/xfce4-panel/EL-5 xfce4-panel-4.6.0-defaults.patch, NONE, 1.1 xfce4-panel-4.6.1-multilib.patch, NONE, 1.1 sources, 1.8, 1.9 xfce4-panel.spec, 1.21, 1.22

Kevin Fenzi kevin at fedoraproject.org
Mon Jul 26 02:49:44 UTC 2010 

Author: kevin

Update of /cvs/pkgs/rpms/xfce4-panel/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8439

Modified Files:
	sources xfce4-panel.spec 
Added Files:
	xfce4-panel-4.6.0-defaults.patch 
	xfce4-panel-4.6.1-multilib.patch 
Log Message:
initial version for epel5


xfce4-panel-4.6.0-defaults.patch:
 panels.xml |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE xfce4-panel-4.6.0-defaults.patch ---
diff -dur xfce4-panel-4.6.0.orig/config/panels.xml xfce4-panel-4.6.0/config/panels.xml
--- xfce4-panel-4.6.0.orig/config/panels.xml	2009-02-24 14:14:35.000000000 -0700
+++ xfce4-panel-4.6.0/config/panels.xml	2009-02-27 11:07:35.000000000 -0700
@@ -23,11 +23,13 @@
 			<item name="launcher" id="10"/>
 			<item name="tasklist" id="3"/>
 			<item name="systray" id="4"/>
+			<item name="thunar-tpa" id="21"/>
 			<item name="pager" id="2"/>
 			<item name="showdesktop" id="1"/>
 			<item name="separator" id="11"/>
 			<item name="clock" id="14"/>
 			<item name="separator" id="13"/>
+			<item name="xfswitch-plugin" id="20"/>
 			<item name="actions" id="12"/>
 		</items>
 	</panel>

xfce4-panel-4.6.1-multilib.patch:
 panel/Makefile.in               |    2 +-
 plugins/actions/Makefile.in     |    2 +-
 plugins/clock/Makefile.in       |    2 +-
 plugins/iconbox/Makefile.in     |    2 +-
 plugins/launcher/Makefile.in    |    2 +-
 plugins/pager/Makefile.in       |    2 +-
 plugins/separator/Makefile.in   |    2 +-
 plugins/showdesktop/Makefile.in |    2 +-
 plugins/systray/Makefile.in     |    2 +-
 plugins/tasklist/Makefile.in    |    2 +-
 plugins/windowlist/Makefile.in  |    2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

--- NEW FILE xfce4-panel-4.6.1-multilib.patch ---
diff -dur xfce4-panel-4.6.1.orig/panel/Makefile.in xfce4-panel-4.6.1/panel/Makefile.in
--- xfce4-panel-4.6.1.orig/panel/Makefile.in	2009-04-18 17:40:09.000000000 +0200
+++ xfce4-panel-4.6.1/panel/Makefile.in	2009-06-12 00:08:17.000000000 +0200
@@ -289,7 +289,7 @@
 	-I$(top_srcdir)								\
 	-I$(top_builddir)							\
 	-DG_LOG_DOMAIN=\"xfce4-panel\"						\
-	-DDATADIR=\"$(datadir)\"						\
+	-DDATADIR=\"$(libdir)\"						\
 	-DLIBDIR=\"$(libdir)/xfce4\"						\
 	-DLIBEXECDIR=\"$(libexecdir)/xfce4\"					\
 	-DSYSCONFDIR=\"$(sysconfdir)\"						\
diff -dur xfce4-panel-4.6.1.orig/plugins/actions/Makefile.in xfce4-panel-4.6.1/plugins/actions/Makefile.in
--- xfce4-panel-4.6.1.orig/plugins/actions/Makefile.in	2009-04-18 17:40:09.000000000 +0200
+++ xfce4-panel-4.6.1/plugins/actions/Makefile.in	2009-06-12 00:17:15.000000000 +0200
@@ -325,7 +325,7 @@
 # .desktop file
 #
 desktopdir = \
-	$(datadir)/xfce4/panel-plugins
+	$(libdir)/xfce4/panel-plugins
 
 desktop_in_in_files = \
 	actions.desktop.in.in
diff -dur xfce4-panel-4.6.1.orig/plugins/clock/Makefile.in xfce4-panel-4.6.1/plugins/clock/Makefile.in
--- xfce4-panel-4.6.1.orig/plugins/clock/Makefile.in	2009-04-18 17:40:09.000000000 +0200
+++ xfce4-panel-4.6.1/plugins/clock/Makefile.in	2009-06-12 00:17:15.000000000 +0200
@@ -341,7 +341,7 @@
 # .desktop file
 #
 desktopdir = \
-	$(datadir)/xfce4/panel-plugins
+	$(libdir)/xfce4/panel-plugins
 
 desktop_in_in_files = \
 	clock.desktop.in.in
diff -dur xfce4-panel-4.6.1.orig/plugins/iconbox/Makefile.in xfce4-panel-4.6.1/plugins/iconbox/Makefile.in
--- xfce4-panel-4.6.1.orig/plugins/iconbox/Makefile.in	2009-04-18 17:40:10.000000000 +0200
+++ xfce4-panel-4.6.1/plugins/iconbox/Makefile.in	2009-06-12 00:17:15.000000000 +0200
@@ -328,7 +328,7 @@
 # .desktop file
 #
 desktopdir = \
-	$(datadir)/xfce4/panel-plugins
+	$(libdir)/xfce4/panel-plugins
 
 desktop_in_in_files = \
 	iconbox.desktop.in.in
diff -dur xfce4-panel-4.6.1.orig/plugins/launcher/Makefile.in xfce4-panel-4.6.1/plugins/launcher/Makefile.in
--- xfce4-panel-4.6.1.orig/plugins/launcher/Makefile.in	2009-04-18 17:40:12.000000000 +0200
+++ xfce4-panel-4.6.1/plugins/launcher/Makefile.in	2009-06-12 00:17:15.000000000 +0200
@@ -339,7 +339,7 @@
 # .desktop file
 #
 desktopdir = \
-	$(datadir)/xfce4/panel-plugins
+	$(libdir)/xfce4/panel-plugins
 
 desktop_in_in_files = \
 	launcher.desktop.in.in
diff -dur xfce4-panel-4.6.1.orig/plugins/pager/Makefile.in xfce4-panel-4.6.1/plugins/pager/Makefile.in
--- xfce4-panel-4.6.1.orig/plugins/pager/Makefile.in	2009-04-18 17:40:12.000000000 +0200
+++ xfce4-panel-4.6.1/plugins/pager/Makefile.in	2009-06-12 00:17:15.000000000 +0200
@@ -331,7 +331,7 @@
 # .desktop file
 #
 desktopdir = \
-	$(datadir)/xfce4/panel-plugins
+	$(libdir)/xfce4/panel-plugins
 
 desktop_in_in_files = \
 	pager.desktop.in.in
diff -dur xfce4-panel-4.6.1.orig/plugins/separator/Makefile.in xfce4-panel-4.6.1/plugins/separator/Makefile.in
--- xfce4-panel-4.6.1.orig/plugins/separator/Makefile.in	2009-04-18 17:40:12.000000000 +0200
+++ xfce4-panel-4.6.1/plugins/separator/Makefile.in	2009-06-12 00:17:15.000000000 +0200
@@ -325,7 +325,7 @@
 # .desktop file
 #
 desktopdir = \
-	$(datadir)/xfce4/panel-plugins
+	$(libdir)/xfce4/panel-plugins
 
 desktop_in_in_files = \
 	separator.desktop.in.in
diff -dur xfce4-panel-4.6.1.orig/plugins/showdesktop/Makefile.in xfce4-panel-4.6.1/plugins/showdesktop/Makefile.in
--- xfce4-panel-4.6.1.orig/plugins/showdesktop/Makefile.in	2009-04-18 17:40:13.000000000 +0200
+++ xfce4-panel-4.6.1/plugins/showdesktop/Makefile.in	2009-06-12 00:17:15.000000000 +0200
@@ -329,7 +329,7 @@
 # .desktop file
 #
 desktopdir = \
-	$(datadir)/xfce4/panel-plugins
+	$(libdir)/xfce4/panel-plugins
 
 desktop_in_in_files = \
 	showdesktop.desktop.in.in
diff -dur xfce4-panel-4.6.1.orig/plugins/systray/Makefile.in xfce4-panel-4.6.1/plugins/systray/Makefile.in
--- xfce4-panel-4.6.1.orig/plugins/systray/Makefile.in	2009-04-18 17:40:13.000000000 +0200
+++ xfce4-panel-4.6.1/plugins/systray/Makefile.in	2009-06-12 00:17:15.000000000 +0200
@@ -348,7 +348,7 @@
 # .desktop file
 #
 desktopdir = \
-	$(datadir)/xfce4/panel-plugins
+	$(libdir)/xfce4/panel-plugins
 
 desktop_in_in_files = \
 	systray.desktop.in.in
diff -dur xfce4-panel-4.6.1.orig/plugins/tasklist/Makefile.in xfce4-panel-4.6.1/plugins/tasklist/Makefile.in
--- xfce4-panel-4.6.1.orig/plugins/tasklist/Makefile.in	2009-04-18 17:40:13.000000000 +0200
+++ xfce4-panel-4.6.1/plugins/tasklist/Makefile.in	2009-06-12 00:17:15.000000000 +0200
@@ -332,7 +332,7 @@
 # .desktop file
 #
 desktopdir = \
-	$(datadir)/xfce4/panel-plugins
+	$(libdir)/xfce4/panel-plugins
 
 desktop_in_in_files = \
 	tasklist.desktop.in.in
diff -dur xfce4-panel-4.6.1.orig/plugins/windowlist/Makefile.in xfce4-panel-4.6.1/plugins/windowlist/Makefile.in
--- xfce4-panel-4.6.1.orig/plugins/windowlist/Makefile.in	2009-04-18 17:40:14.000000000 +0200
+++ xfce4-panel-4.6.1/plugins/windowlist/Makefile.in	2009-06-12 00:17:15.000000000 +0200
@@ -363,7 +363,7 @@
 # .desktop file
 #
 desktopdir = \
-	$(datadir)/xfce4/panel-plugins
+	$(libdir)/xfce4/panel-plugins
 
 desktop_in_in_files = \
 	windowlist.desktop.in.in


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	23 Apr 2007 02:09:49 -0000	1.8
+++ sources	26 Jul 2010 02:49:41 -0000	1.9
@@ -1 +1 @@
-56b3137c190dd722dd5109be03901feb  xfce4-panel-4.4.1.tar.bz2
+82f10a42aefca4cc26a6633e7478cc65  xfce4-panel-4.6.4.tar.bz2


Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/EL-5/xfce4-panel.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- xfce4-panel.spec	27 Aug 2007 17:29:26 -0000	1.21
+++ xfce4-panel.spec	26 Jul 2010 02:49:41 -0000	1.22
@@ -1,28 +1,25 @@
+%global xfceversion 4.6
+
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
-Version: 4.4.1
-Release: 4%{?dist}
+Version: 4.6.4
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.4.1/src/xfce4-panel-4.4.1.tar.bz2
-Patch0: xfce4-panel-4.4.1-multilib.patch
+Source0: http://www.xfce.org/archive/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
+Patch0: xfce4-panel-4.6.0-defaults.patch
+Patch1: xfce4-panel-4.6.1-multilib.patch
 Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-root
-Requires: libxfcegui4 >= %{version}
-Requires: libxfce4mcs >= %{version}
-Requires: xfce-mcs-manager >= %{version}
-Requires: libxml2 >= 2.4.0
-Requires: Terminal
-Requires: mousepad
-Requires: xfce4-icon-theme
-BuildRequires: libxfcegui4-devel >= %{version}
-BuildRequires: libxfce4mcs-devel >= %{version}
-BuildRequires: xfce-mcs-manager-devel >= %{version}
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Requires: libxfcegui4 >= %{xfceversion}
+Requires: xfce4-doc
+BuildRequires: libxfcegui4-devel >= %{xfceversion}
 BuildRequires: libxml2-devel >= 2.4.0
 BuildRequires: startup-notification-devel
-BuildRequires: imake
-BuildRequires: libXt-devel
-BuildRequires: gettext
+BuildRequires: gettext intltool
+BuildRequires: exo-devel >= 0.3.93
+BuildRequires: libwnck-devel
+
 # xfce4-iconbox isn't in Xfce 4.4
 Provides: xfce4-iconbox = %{version}-%{release}
 Obsoletes: xfce4-iconbox <= 4.2.3-4.fc6
@@ -35,9 +32,6 @@ Obsoletes: xfce4-toys <= 4.2.3-3.fc6
 # xfce4-trigger-launcher isn't in Xfce 4.4
 Provides: xfce4-trigger-launcher = %{version}-%{release}
 Obsoletes: xfce4-trigger-launcher <= 4.2.3-3.fc6
-# xfce4-modemlights-plugin isn't in Xfce 4.4
-Provides: xfce4-modemlights-plugin = %{version}-%{release}
-Obsoletes: xfce4-modemlights-plugin <= 0.1.1-9.fc6
 # xfce4-showdesktop-plugin isn't in Xfce 4.4
 Provides: xfce4-showdesktop-plugin = %{version}-%{release}
 Obsoletes: xfce4-showdesktop-plugin <= 0.4.0-7.fc6
@@ -47,6 +41,9 @@ Obsoletes: xfce4-taskbar-plugin <= 0.2.2
 # xfce4-windowlist-plugin isn't in Xfce 4.4
 Provides: xfce4-windowlist-plugin = %{version}-%{release}
 Obsoletes: xfce4-windowlist-plugin <= 0.1.0-7.fc6
+# xfce4-xmms-plugin isn't in F11
+Provides: xfce4-xmms-plugin = 0.5.1-4
+Obsoletes: xfce4-xmms-plugin <= 0.5.1-3.fc11
 
 %description
 This package includes the panel for the Xfce desktop environment.
@@ -56,8 +53,8 @@ Summary: Development headers for xfce4-p
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
-Requires: libxfce4util-devel = %{version}
-Requires: libxfcegui4-devel = %{version}
+Requires: libxfce4util-devel >= %{xfceversion}
+Requires: libxfcegui4-devel >= %{xfceversion}
 
 %description devel
 This package includes the header files you will need to build
@@ -66,18 +63,24 @@ plugins for xfce4-panel.
 %prep
 %setup -q
 
-%patch0 -p1 
+%patch0 -p1 -b .default
+%patch1 -p1 -b .multilib
 
 %build
 %configure
+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}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel-plugins/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+# remove useless dummy files
+rm -f $RPM_BUILD_ROOT/%{_bindir}/xfce4-iconbox
+rm -f $RPM_BUILD_ROOT/%{_bindir}/xftaskbar4
+# we need to own these dirs
 mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/xfce4/panel-plugins
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/xfce4/panel-plugins
 %find_lang %{name}
@@ -86,37 +89,33 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/xfc
 rm -rf $RPM_BUILD_ROOT
                                                                                           
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 /sbin/ldconfig
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README ChangeLog NEWS COPYING AUTHORS
-%dir %{_sysconfdir}/xdg/xfce4/
 %dir %{_sysconfdir}/xdg/xfce4/panel/
-%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/launcher-10.rc
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/*.rc
 %config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/panels.xml
-%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/xfce4-menu-5.rc
-%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/launcher-9.rc
-%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/clock-14.rc
-%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/launcher-7.rc
-%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/systray-4.rc
-%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/launcher-8.rc
 
-%{_libdir}/xfce4/mcs-plugins/*
 %{_libdir}/xfce4/panel-plugins/
 %{_libdir}/libxfce4panel.so.*
 %{_bindir}/*
-%{_libexecdir}/xfce4/
+%{_libexecdir}/xfce4/panel-plugins/
 %{_datadir}/icons/hicolor/*/*/*.png
-%{_datadir}/xfce4/doc/C/xfce4-panel.html
-%{_datadir}/xfce4/doc/C/images/
+%doc %{_datadir}/xfce4/doc/*/images/*
+%doc %{_datadir}/xfce4/doc/*/*.html
 %{_datadir}/xfce4/panel-plugins/
 %{_datadir}/applications/xfce4-panel-manager.desktop
 
@@ -124,10 +123,82 @@ touch --no-create %{_datadir}/icons/hico
 %defattr(-, root,root,-)
 %{_libdir}/pkgconfig/*
 %{_libdir}/libxfce4panel.so
-%{_datadir}/gtk-doc/html/libxfce4panel
+%doc %{_datadir}/gtk-doc/html/libxfce4panel
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Fri May 21 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.4-1
+- Update to 4.6.4
+
+* Sat Feb 13 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.3-2
+- Add patch for DSO fix. Fixes bug 564694
+
+* Wed Dec 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.3-1
+- Update to 4.6.3
+
+* Fri Oct 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.2-1
+- Update to 4.6.2
+- Drop explicit requires on Terminal and mousepad
+
+* Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
+- Add xfswitch-plugin to default panel config (#525563)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jun 12 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-2
+- Bring back the multilib patch to fix #505165
+
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
+* Sat Feb 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-2
+- Fix directory ownership problems
+- Require xfce4-doc
+- Mark gtk-doc files as %%doc
+- Obsolete the xfce4-xmms-plugin
+
+* Thu Feb 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-1
+- Update to 4.6.0
+- Remove some unneeded BuildRequires
+
+* Thu Feb 26 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
+
+* Sat Dec 27 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
+- Remove mailwatch-plugin from default panel config again
+- BuildRequire intltool
+- Update gtk-update-icon-cache scriptlets
+- Fix BuildRoot tag
+
+* Thu Oct 02 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.2-5
+- Fix FTBFS (#465058)
+- Update defaults patch to include mailwatch plugin
+- Remove old xfce4-iconbox and xftaskbar dummy files
+
+* Tue Apr 08 2008 Kevin Fenzi <kevin at tummy.com> - 4.4.2-4
+- Add defaults patch. See bug 433573
+
+* Sat Feb 23 2008 Kevin Fenzi <kevin at tummy.com> - 4.4.2-3
+- Drop dependency on xfce-icon-theme. See bug 433152
+
+* Sun Feb 10 2008 Kevin Fenzi <kevin at tummy.com> - 4.4.2-2
+- Rebuild for gcc43
+
+* Sun Dec  2 2007 Kevin Fenzi <kevin at tummy.com> - 4.4.2-1
+- Update to 4.4.2 (fixes 382471)
+- Drop Provides/Obsoletes for xfce4-modemlights-plugin to come back.
+
 * Mon Aug 27 2007 Kevin Fenzi <kevin at tummy.com> - 4.4.1-4
 - Update License tag

More information about the scm-commits mailing list