dist-git conversion

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xfce4-diskperf-plugin
-# $Id: Makefile,v 1.1 2006/01/28 00:20:03 cwickert Exp $
-NAME := xfce4-diskperf-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 $$d/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-diskperf-plugin-2.2.0-dsofix.patch

@@ -0,0 +1,11 @@
+--- xfce4-diskperf-plugin-2.2.0.orig/panel-plugin/Makefile.in	2008-04-17 09:11:47.000000000 +0200
++++ xfce4-diskperf-plugin-2.2.0/panel-plugin/Makefile.in	2010-02-17 10:40:37.000000000 +0100
+@@ -138,7 +138,7 @@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -lm
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBXFCE4PANEL_CFLAGS = @LIBXFCE4PANEL_CFLAGS@

xfce4-diskperf-plugin.spec

@@ -1,6 +1,6 @@
 Name:		xfce4-diskperf-plugin
 Version:	2.2.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Disk performance plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -9,6 +9,7 @@ URL:		http://goodies.xfce.org/panel-plugins/{%name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
 # http://bugzilla.xfce.org/show_bug.cgi?id=3074
 Patch0:		%{name}-2.2.0-colors-at-startup.patch
+Patch1:		xfce4-diskperf-plugin-2.2.0-dsofix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.90, libxfcegui4-devel >= 4.3.90, libxml2-devel
@@ -22,6 +23,7 @@ second) based on data provided by the kernel.
 %prep
 %setup -q
 %patch0 -p1 -b .orig
+%patch1 -p1 -b .dsofix
 
 %build
 %configure --disable-static
@@ -42,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Wed Feb 17 2010 Christoph Wickert <cwickert@fedoraproject.org> - 2.2.0-6
+- Add patch to fix DSO linking (#564985)
+
 * Thu Sep 10 2009 Christoph Wickert <cwickert@fedoraproject.org> - 2.2.0-5
 - Fix custom bar colors at startup (bugzilla.xfce.org #3074)