rpms/xfce4-panel/devel xfce4-panel-4.4.1-multilib.patch, NONE, 1.1 xfce4-panel.spec, 1.20, 1.21
Kevin Fenzi (kevin)
fedora-extras-commits at redhat.com
Thu Jun 7 01:26:05 UTC 2007
Author: kevin
Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17985
Modified Files:
xfce4-panel.spec
Added Files:
xfce4-panel-4.4.1-multilib.patch
Log Message:
Fix multilib issues. Bug #228168
xfce4-panel-4.4.1-multilib.patch:
--- NEW FILE xfce4-panel-4.4.1-multilib.patch ---
diff -Nur xfce4-panel-4.4.1.orig/panel/Makefile.in xfce4-panel-4.4.1/panel/Makefile.in
--- xfce4-panel-4.4.1.orig/panel/Makefile.in 2007-04-09 09:57:39.000000000 -0600
+++ xfce4-panel-4.4.1/panel/Makefile.in 2007-06-06 12:39:35.000000000 -0600
@@ -304,7 +304,7 @@
@LIBX11_CFLAGS@ \
@LIBXFCE4UTIL_CFLAGS@ \
@LIBXFCEGUI4_CFLAGS@ \
- -DDATADIR=\"$(datadir)\" \
+ -DDATADIR=\"$(libdir)\" \
-DLIBDIR=\"$(libdir)/xfce4\" \
-DLIBEXECDIR=\"$(libexecdir)/xfce4\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
diff -Nur xfce4-panel-4.4.1.orig/plugins/actions/Makefile.in xfce4-panel-4.4.1/plugins/actions/Makefile.in
--- xfce4-panel-4.4.1.orig/plugins/actions/Makefile.in 2007-04-09 09:57:39.000000000 -0600
+++ xfce4-panel-4.4.1/plugins/actions/Makefile.in 2007-06-06 12:37:11.000000000 -0600
@@ -301,7 +301,7 @@
#
desktop_in_in_files = actions.desktop.in.in
desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(libdir)/xfce4/panel-plugins
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
EXTRA_DIST = \
$(desktop_in_in_files)
diff -Nur xfce4-panel-4.4.1.orig/plugins/clock/Makefile.in xfce4-panel-4.4.1/plugins/clock/Makefile.in
--- xfce4-panel-4.4.1.orig/plugins/clock/Makefile.in 2007-04-09 09:57:40.000000000 -0600
+++ xfce4-panel-4.4.1/plugins/clock/Makefile.in 2007-06-06 12:37:25.000000000 -0600
@@ -301,7 +301,7 @@
#
desktop_in_in_files = clock.desktop.in.in
desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(libdir)/xfce4/panel-plugins
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
EXTRA_DIST = \
$(desktop_in_in_files)
diff -Nur xfce4-panel-4.4.1.orig/plugins/iconbox/Makefile.in xfce4-panel-4.4.1/plugins/iconbox/Makefile.in
--- xfce4-panel-4.4.1.orig/plugins/iconbox/Makefile.in 2007-04-09 09:57:40.000000000 -0600
+++ xfce4-panel-4.4.1/plugins/iconbox/Makefile.in 2007-06-06 12:37:33.000000000 -0600
@@ -301,7 +301,7 @@
#
desktop_in_in_files = iconbox.desktop.in.in
desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(libdir)/xfce4/panel-plugins
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
EXTRA_DIST = \
$(desktop_in_in_files)
diff -Nur xfce4-panel-4.4.1.orig/plugins/launcher/Makefile.in xfce4-panel-4.4.1/plugins/launcher/Makefile.in
--- xfce4-panel-4.4.1.orig/plugins/launcher/Makefile.in 2007-04-09 09:57:40.000000000 -0600
+++ xfce4-panel-4.4.1/plugins/launcher/Makefile.in 2007-06-06 12:37:38.000000000 -0600
@@ -306,7 +306,7 @@
#
desktop_in_in_files = launcher.desktop.in.in
desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(libdir)/xfce4/panel-plugins
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
EXTRA_DIST = \
$(desktop_in_in_files)
diff -Nur xfce4-panel-4.4.1.orig/plugins/pager/Makefile.in xfce4-panel-4.4.1/plugins/pager/Makefile.in
--- xfce4-panel-4.4.1.orig/plugins/pager/Makefile.in 2007-04-09 09:57:40.000000000 -0600
+++ xfce4-panel-4.4.1/plugins/pager/Makefile.in 2007-06-06 12:37:44.000000000 -0600
@@ -301,7 +301,7 @@
#
desktop_in_in_files = pager.desktop.in.in
desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(libdir)/xfce4/panel-plugins
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
EXTRA_DIST = \
$(desktop_in_in_files)
diff -Nur xfce4-panel-4.4.1.orig/plugins/separator/Makefile.in xfce4-panel-4.4.1/plugins/separator/Makefile.in
--- xfce4-panel-4.4.1.orig/plugins/separator/Makefile.in 2007-04-09 09:57:40.000000000 -0600
+++ xfce4-panel-4.4.1/plugins/separator/Makefile.in 2007-06-06 12:37:51.000000000 -0600
@@ -301,7 +301,7 @@
#
desktop_in_in_files = separator.desktop.in.in
desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(libdir)/xfce4/panel-plugins
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
EXTRA_DIST = \
$(desktop_in_in_files)
diff -Nur xfce4-panel-4.4.1.orig/plugins/showdesktop/Makefile.in xfce4-panel-4.4.1/plugins/showdesktop/Makefile.in
--- xfce4-panel-4.4.1.orig/plugins/showdesktop/Makefile.in 2007-04-09 09:57:41.000000000 -0600
+++ xfce4-panel-4.4.1/plugins/showdesktop/Makefile.in 2007-06-06 12:37:57.000000000 -0600
@@ -301,7 +301,7 @@
#
desktop_in_in_files = showdesktop.desktop.in.in
desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(libdir)/xfce4/panel-plugins
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
EXTRA_DIST = \
$(desktop_in_in_files)
diff -Nur xfce4-panel-4.4.1.orig/plugins/systray/Makefile.in xfce4-panel-4.4.1/plugins/systray/Makefile.in
--- xfce4-panel-4.4.1.orig/plugins/systray/Makefile.in 2007-04-09 09:57:41.000000000 -0600
+++ xfce4-panel-4.4.1/plugins/systray/Makefile.in 2007-06-06 12:38:01.000000000 -0600
@@ -301,7 +301,7 @@
#
desktop_in_in_files = systray.desktop.in.in
desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(libdir)/xfce4/panel-plugins
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
EXTRA_DIST = \
$(desktop_in_in_files)
diff -Nur xfce4-panel-4.4.1.orig/plugins/tasklist/Makefile.in xfce4-panel-4.4.1/plugins/tasklist/Makefile.in
--- xfce4-panel-4.4.1.orig/plugins/tasklist/Makefile.in 2007-04-09 09:57:41.000000000 -0600
+++ xfce4-panel-4.4.1/plugins/tasklist/Makefile.in 2007-06-06 12:38:07.000000000 -0600
@@ -301,7 +301,7 @@
#
desktop_in_in_files = tasklist.desktop.in.in
desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(libdir)/xfce4/panel-plugins
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
EXTRA_DIST = \
$(desktop_in_in_files)
diff -Nur xfce4-panel-4.4.1.orig/plugins/windowlist/Makefile.in xfce4-panel-4.4.1/plugins/windowlist/Makefile.in
--- xfce4-panel-4.4.1.orig/plugins/windowlist/Makefile.in 2007-04-09 09:57:41.000000000 -0600
+++ xfce4-panel-4.4.1/plugins/windowlist/Makefile.in 2007-06-06 12:38:12.000000000 -0600
@@ -332,7 +332,7 @@
#
desktop_in_in_files = windowlist.desktop.in.in
desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(libdir)/xfce4/panel-plugins
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
EXTRA_DIST = \
$(desktop_in_in_files)
Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xfce4-panel.spec 19 Apr 2007 02:08:12 -0000 1.20
+++ xfce4-panel.spec 7 Jun 2007 01:25:30 -0000 1.21
@@ -1,10 +1,11 @@
Summary: Next generation panel for Xfce
Name: xfce4-panel
Version: 4.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL
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
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-root
Requires: libxfcegui4 >= %{version}
@@ -65,6 +66,8 @@
%prep
%setup -q
+%patch0 -p1
+
%build
%configure
make %{?_smp_mflags}
@@ -110,7 +113,6 @@
%{_libdir}/libxfce4panel.so.*
%{_bindir}/*
%{_libexecdir}/xfce4/
-%{_datadir}/xfce4/panel-plugins/
%{_datadir}/icons/hicolor/*/*/*.png
%{_datadir}/xfce4/doc/C/xfce4-panel.html
%{_datadir}/xfce4/doc/C/images/
@@ -124,6 +126,9 @@
%{_includedir}/xfce4/libxfce4panel
%changelog
+* Wed Jun 6 2007 Kevin Fenzi <kevin at tummy.com> - 4.4.1-2
+- Fix multilib issues. Bug #228168
+
* Wed Apr 11 2007 Kevin Fenzi <kevin at tummy.com> - 4.4.1-1
- Upgrade to 4.4.1
More information about the scm-commits
mailing list