rpms/xfce4-panel/FC-6 xfce4-panel.spec,1.20,1.21

[Kevin Fenzi (kevin)]

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11411

Modified Files:
	xfce4-panel.spec 
Log Message:
Update License tag
Own %%{_datadir}/xfce4/
Fix multilib issues. Bug #228168



Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/FC-6/xfce4-panel.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xfce4-panel.spec	23 Apr 2007 02:09:49 -0000	1.20
+++ xfce4-panel.spec	27 Aug 2007 17:29:26 -0000	1.21
@@ -1,10 +1,11 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
 Version: 4.4.1
-Release: 1%{?dist}
-License: GPL
+Release: 4%{?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
 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}
@@ -76,6 +79,7 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel-plugins/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/xfce4/panel-plugins
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/xfce4/panel-plugins
 %find_lang %{name}
 
 %clean
@@ -110,10 +114,10 @@
 %{_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/
+%{_datadir}/xfce4/panel-plugins/
 %{_datadir}/applications/xfce4-panel-manager.desktop
 
 %files devel
@@ -124,6 +128,15 @@
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Mon Aug 27 2007 Kevin Fenzi <kevin at tummy.com> - 4.4.1-4
+- Update License tag
+
+* Mon Jul 30 2007 Kevin Fenzi <kevin at tummy.com> - 4.4.1-3
+- Own %%{_datadir}/xfce4/
+
+* 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