dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xfce4-websearch-plugin
-# $Id$
-NAME := xfce4-websearch-plugin
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

xfce4-websearch-plugin-20070428svn2704-multilib.patch

@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	2007-06-09 14:20:46.000000000 +0200
++++ src/Makefile.in	2007-06-09 14:21:22.000000000 +0200
+@@ -255,7 +255,7 @@
+ 
+ desktop_in_in_files = websearch.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)

xfce4-websearch-plugin.spec

@@ -1,6 +1,6 @@
 Name:		xfce4-websearch-plugin
 Version:	0.1.1
-Release:	0.5.20070428svn2704%{?dist}
+Release:	0.6.20070428svn2704%{?dist}
 Summary:	Websearch plugin from the XFCE panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@ URL:		http://goodies.xfce.org/
 # tar -cjf xfce4-websearch-plugin-`date +%G%m%d`svn2704.tar.bz2 xfce4-websearch-plugin
 Source0:	%{name}-20070428svn2704.tar.bz2
 #Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz
+Patch0:		%{name}-20070428svn2704-multilib.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.0, libxfcegui4-devel >= 4.3.0, libxml2-devel
@@ -23,9 +24,10 @@ Access searchengines from the XFCE panel.
 
 %prep
 %setup -qn %{name}
+./autogen.sh
+%patch0 -b .multilib
 
 %build
-./autogen.sh
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -42,9 +44,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{_libdir}/xfce4/panel-plugins/*.so
-%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_libdir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sat Jun 09 2007 Christoph Wickert <fedora christoph-wickert de> - 0.1.1-0.6.20070428svn2704
+- Multilib fix for desktop file (#28168).
+
 * Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 0.1.1-0.5.20070428svn2704
 - Update to svn release 2704 on Xfce 4.4.1