dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xfce4-netload-plugin
-# $Id$
-NAME := xfce4-netload-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-netload-0.4.0-asneeded.patch

@@ -0,0 +1,12 @@
+diff -ur xfce4-netload-plugin-0.4.0.orig/panel-plugin/Makefile.am xfce4-netload-plugin-0.4.0/panel-plugin/Makefile.am
+--- xfce4-netload-plugin-0.4.0.orig/panel-plugin/Makefile.am	2005-09-30 10:53:07.000000000 +0300
++++ xfce4-netload-plugin-0.4.0/panel-plugin/Makefile.am	2007-01-21 23:09:59.000000000 +0200
+@@ -18,7 +18,7 @@
+ 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
+ 	@LIBXFCE4PANEL_CFLAGS@
+ 
+-xfce4_netload_plugin_LDFLAGS =						\
++xfce4_netload_plugin_LDADD =						\
+ 	@SOLLIBS@                                   			\
+ 	@LIBXFCE4PANEL_LIBS@
+ 

xfce4-netload-plugin.spec

@@ -1,23 +1,25 @@
 Name:		xfce4-netload-plugin
 Version:	0.4.0
-Release:	3%{?dist}
+Release:	5%{?dist}
 Summary:	Network-load monitor for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPL
-URL:		http://goodies.xfce.org/
+URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		xfce4-netload-0.4.0-asneeded.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
 BuildRequires:	gettext, perl(XML::Parser)
-Requires:	xfce4-panel >= 4.3.99.1
+Requires:	xfce4-panel >= 4.4.0
 
 %description
 A network-load monitor plugin for the Xfce panel.
 
 %prep
 %setup -q
+%patch0 -p1 -b .asneeded
 
 %build
 %configure --disable-static
@@ -38,6 +40,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-5
+- Rebuild for Xfce 4.4.1
+
+* Mon Jan 22 2007 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-4
+- Rebuild for Xfce 4.4.
+- Patch to compile with -Wl,--as-needed (bugzilla.xfce.org #2782)
+
 * Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-3
 - Bump release for devel checkin.