From 3ea6c2ff511f85904016a16437a8d761836642d062d2f13c978d288eea5c1afe Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Sun, 15 Feb 2015 19:47:31 +0000 Subject: [PATCH] Accepting request 286124 from home:pluskalm:branches:benchmark - Update url - Remove ctcs glue - Install bench.sh and multiview.sh to /usr/bin - Don't install object files and headers OBS-URL: https://build.opensuse.org/request/show/286124 OBS-URL: https://build.opensuse.org/package/show/benchmark/libmicro?expand=0&rev=9 --- ctcstools-0.4.0.tar.bz2 | 3 -- libmicro.changes | 8 ++++ libmicro.spec | 83 ++++++++++++----------------------------- 3 files changed, 32 insertions(+), 62 deletions(-) delete mode 100644 ctcstools-0.4.0.tar.bz2 diff --git a/ctcstools-0.4.0.tar.bz2 b/ctcstools-0.4.0.tar.bz2 deleted file mode 100644 index 7d1076c..0000000 --- a/ctcstools-0.4.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3dfbf57cb18928b8ae9e360da150637e639ee7854d952665c03ca091189f9206 -size 270 diff --git a/libmicro.changes b/libmicro.changes index 5f39683..5baa6b1 100644 --- a/libmicro.changes +++ b/libmicro.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Feb 14 17:04:27 UTC 2015 - mpluskal@suse.com + +- Update url +- Remove ctcs glue +- Install bench.sh and multiview.sh to /usr/bin +- Don't install object files and headers + ------------------------------------------------------------------- Mon Mar 26 15:11:31 UTC 2012 - cfarrell@suse.com diff --git a/libmicro.spec b/libmicro.spec index ec3aeed..98a72db 100644 --- a/libmicro.spec +++ b/libmicro.spec @@ -1,7 +1,7 @@ # # spec file for package libmicro # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,85 +15,50 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: libmicro +Version: 0.4.0 +Release: 0 +Summary: LibMicro is a portable set of microbenchmarks License: CDDL-1.0 Group: System/Benchmark -Requires: kernel-source gcc make -AutoReqProv: on -Summary: kernel test suite, micro benchmark -Url: http://www.opensolaris.org/os/project/libmicro/ -Version: 0.4.0 -Release: 91 +Url: https://java.net/projects/libmicro Source0: %{name}-%{version}.tar.bz2 -Source1: ctcstools-%{version}.tar.bz2 Patch0: find_binary.patch Patch1: removed_undefined_warning.patch Patch2: fix-link.diff +Requires: gcc BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -LibMicro is intended to measure the performance of various system and -library calls. LibMicro was developed by Bart Smaalders and Phil -Harman. - -%if %suse_version < 1200 - -%package ctcs-glue -License: CDDL-1.0 -Summary: The let-libmicro-be-run-via-ctcs glue -Group: Development/Tools/Other -AutoReqProv: on -Requires: ctcs2 >= 0.1.6 -Requires: libmicro = %{version} - -%description ctcs-glue -This package contains the glue for integrating libmicro into the ctcs -testing framework. -%endif +LibMicro is a portable set of microbenchmarks that many Solaris +engineers used during Solaris 10 development to measure the +performance of various system and library calls. %prep -%setup -a1 +%setup -q %patch0 -p1 -%patch1 +%patch1 %patch2 -p1 %build -make +make %{?_smp_mflags} %install -mkdir -p $RPM_BUILD_ROOT/usr/lib/libMicro -mkdir -p $RPM_BUILD_ROOT/usr/lib/libMicro/bin -install -m 644 README $RPM_BUILD_ROOT/usr/lib/libMicro -cp bin/* $RPM_BUILD_ROOT/usr/lib/libMicro/bin -cp bin-*/* $RPM_BUILD_ROOT/usr/lib/libMicro/bin -install -m 755 *.sh $RPM_BUILD_ROOT/usr/lib/libMicro/bin -#the sequence is important! -#install -m 755 runtests.sh $RPM_BUILD_ROOT/usr/lib/libMicro -mkdir -p $RPM_BUILD_ROOT/usr/lib/ctcs2/tcf -mkdir -p $RPM_BUILD_ROOT/usr/lib/ctcs2/tools -cp ctcstools/libmicro-run $RPM_BUILD_ROOT/usr/lib/ctcs2/tools -cp ctcstools/libmicro.tcf $RPM_BUILD_ROOT/usr/lib/ctcs2/tcf - -%if %suse_version >= 1200 -rm -rf $RPM_BUILD_ROOT/usr/lib/ctcs2 -%endif +rm bin-*/*.a +rm bin-*/*.h +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_libexecdir}/libMicro/bin +cp bin/* %{buildroot}%{_libexecdir}/libMicro/bin +cp bin-*/* %{buildroot}%{_libexecdir}/libMicro/bin +install -m 755 bench.sh %{buildroot}%{_bindir} +install -m 755 multiview.sh %{buildroot}%{_bindir} %files %defattr(-,root,root) -/usr/lib/libMicro -%doc README - -%if %suse_version < 1200 - -%files ctcs-glue -%defattr(-,root,root) -/usr/lib/ctcs2 -%endif - -%clean -rm -rf $RPM_BUILD_ROOT +%doc README OPENSOLARIS.LICENSE +%{_libexecdir}/libMicro +%{_bindir}/bench.sh +%{_bindir}/multiview.sh %changelog