From 19e0a517d2539b9060a74a11d87bbfd093a0d96d Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Dec 14 2012 20:16:19 +0000 Subject: Specfile clean-up --- diff --git a/globus-xioperf.spec b/globus-xioperf.spec index 5862868..7fe0c50 100644 --- a/globus-xioperf.spec +++ b/globus-xioperf.spec @@ -7,7 +7,7 @@ Name: globus-xioperf %global _name %(tr - _ <<< %{name}) Version: 3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Globus Toolkit - XIO Performance Tool Group: Applications/Internet @@ -58,14 +58,13 @@ sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} -GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages +GLOBUSPACKAGEDIR=%{buildroot}%{_datadir}/globus/packages # Install README file -install -m 644 -p %{SOURCE8} \ - $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README +install -m 644 -p %{SOURCE8} %{buildroot}%{_docdir}/%{name}-%{version}/README # Generate package filelists cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \ @@ -74,7 +73,7 @@ cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \ | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' >> package.filelist %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files -f package.filelist %defattr(-,root,root,-) @@ -83,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_docdir}/%{name}-%{version}/README %changelog +* Fri Dec 07 2012 Mattias Ellert - 3.1-3 +- Specfile clean-up + * Thu Jul 19 2012 Fedora Release Engineering - 3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild