rpms/xfce4-panel/F-11 xfce4-panel.spec,1.37,1.38

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-panel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24406

Modified Files:
	xfce4-panel.spec 
Log Message:
* Fri Jun 12 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-2
- Bring back the multilib patch to fix #228168



Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/F-11/xfce4-panel.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- xfce4-panel.spec	21 Apr 2009 02:28:27 -0000	1.37
+++ xfce4-panel.spec	12 Jun 2009 22:13:31 -0000	1.38
@@ -1,11 +1,12 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
 Version: 4.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-panel-%{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}-%{version}-%{release}-root
 Requires: libxfcegui4 >= %{version}
@@ -63,6 +64,7 @@ plugins for xfce4-panel.
 %setup -q
 
 %patch0 -p1 -b .default
+%patch1 -p1 -b .multilib
 
 %build
 %configure
@@ -72,7 +74,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+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
@@ -125,6 +127,9 @@ fi
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* 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