Accepting request 290710 from home:pluskalm:branches:benchmark

- Use source for url
- Cleanup spec file with spec-cleaner
- Add fs_mark-nostatic.diff

OBS-URL: https://build.opensuse.org/request/show/290710
OBS-URL: https://build.opensuse.org/package/show/benchmark/fs_mark?expand=0&rev=2

fs_mark-nostatic.diff

@@ -0,0 +1,21 @@
+Index: fs_mark/Makefile
+===================================================================
+--- fs_mark.orig/Makefile	2008-06-11 14:08:26.109985014 -0500
++++ fs_mark/Makefile	2008-06-11 14:08:40.902982531 -0500
+@@ -10,14 +10,14 @@ DIR1= /test/dir1
+ DIR2= /test/dir2
+ 
+ COBJS= fs_mark.o lib_timing.o
+-CFLAGS= -O2 -Wall -D_FILE_OFFSET_BITS=64
++CFLAGS+= -O2 -Wall -D_FILE_OFFSET_BITS=64
+ 
+ all: fs_mark 
+ 
+ fs_mark.o: fs_mark.c fs_mark.h
+ 
+ fs_mark: fs_mark.o lib_timing.o
+-	${CC} -static -o fs_mark fs_mark.o lib_timing.o
++	${CC} -o fs_mark fs_mark.o lib_timing.o
+ 
+ test: fs_mark
+ 	./fs_mark -d ${DIR1} -d ${DIR2} -s 51200 -n 4096

fs_mark.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Mar 13 18:48:38 UTC 2015 - mpluskal@suse.com
+
+- Use source for url
+- Cleanup spec file with spec-cleaner
+- Add fs_mark-nostatic.diff
+
 -------------------------------------------------------------------
 Tue Jul 26 18:49:05 CEST 2011 - dsterba@suse.cz
 

fs_mark.spec

@@ -1,8 +1,8 @@
 #
 # spec file for package fs_mark
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright (C) 2003-2004 EMC Corporation
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2003-2004 EMC Corporation
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,19 +20,15 @@
 Name:           fs_mark
 Version:        3.3
 Release:        0
-Url:            http://fsmark.sf.net
-BuildRequires:  gcc
-BuildRequires:  make
-%if 0%{?suse_version} > 1140
-BuildRequires:  glibc-devel-static
-%endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        %{name}-%{version}.tar.gz
-Source1:        COPYING
-Patch1:         fs_mark-Allow-creating-files-filled-with-random-bytes.patch
 Summary:        Filesystem benchmark
 License:        GPL-2.0+
 Group:          System/Benchmark
+Url:            http://fsmark.sf.net
+Source0:        http://sourceforge.net/projects/fsmark/files/fsmark/%{version}/%{name}-%{version}.tar.gz
+Source1:        COPYING
+Patch1:         fs_mark-Allow-creating-files-filled-with-random-bytes.patch
+Patch2:         fs_mark-nostatic.diff
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 The fs_mark benchmark tests synchronous write workloads. It can vary the number
@@ -43,14 +39,15 @@ setups.
 %prep
 %setup -q
 %patch1 -p1
-cp %{S:1} .
+%patch2 -p1
+cp %{SOURCE1} .
 
 %build
-CFLAGS=$RPM_OPT_FLAGS
-%__make
+CFLAGS="%{optflags}"
+make %{?_smp_mflags}
 
 %install
-%__install -D -m0755 fs_mark ${RPM_BUILD_ROOT}%{_bindir}/fs_mark
+install -D -m0755 fs_mark %{buildroot}%{_bindir}/fs_mark
 
 %files
 %defattr(-,root,root)