From 368313d70a144680963244d190f9f76da6ecc8f6 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Feb 28 2012 22:08:47 +0000 Subject: Add patch to fix DSO linking - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - Rebuild for new libpng --- diff --git a/xfce4-diskperf-plugin-2.3.0-dsofix.patch b/xfce4-diskperf-plugin-2.3.0-dsofix.patch new file mode 100644 index 0000000..2881530 --- /dev/null +++ b/xfce4-diskperf-plugin-2.3.0-dsofix.patch @@ -0,0 +1,11 @@ +--- xfce4-diskperf-plugin-2.3.0.orig/panel-plugin/Makefile.in 2011-01-21 02:03:31.000000000 +0100 ++++ xfce4-diskperf-plugin-2.3.0/panel-plugin/Makefile.in 2012-02-28 23:05:37.889487815 +0100 +@@ -145,7 +145,7 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + LD = @LD@ +-LDFLAGS = @LDFLAGS@ ++LDFLAGS = @LDFLAGS@ -lm + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ diff --git a/xfce4-diskperf-plugin.spec b/xfce4-diskperf-plugin.spec index 5f51ba9..6c6d09e 100644 --- a/xfce4-diskperf-plugin.spec +++ b/xfce4-diskperf-plugin.spec @@ -4,13 +4,14 @@ Name: xfce4-diskperf-plugin Version: 2.3.0 -Release: 4%{?dist} +Release: 3%{?dist} Summary: Disk performance plugin for the Xfce panel Group: User Interface/Desktops License: BSD URL: http://goodies.xfce.org/panel-plugins/{%name} Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2 +Patch0: %{name}-0.5.6-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 @@ -23,6 +24,7 @@ second) based on data provided by the kernel. %prep %setup -q +%patch0 -p1 -b .dsofix %build @@ -31,13 +33,13 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} INSTALL='install -p' %find_lang %{name} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) @@ -47,10 +49,9 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sat Jan 14 2012 Fedora Release Engineering - 2.3.0-4 +* Tue Feb 28 2012 Christoph Wickert - 2.3.0-3 +- Add patch to fix DSO linking - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Dec 06 2011 Adam Jackson - 2.3.0-3 - Rebuild for new libpng * Mon Jun 06 2011 Christoph Wickert - 2.3.0-2