Browse Source

2015-03-13 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* libpfm, papi, sysstat: updated
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9431 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 9 years ago
parent
commit
e63fdab851
3 changed files with 38 additions and 31 deletions
  1. 5 7
      lib/libp/libpfm/libpfm-vl.spec
  2. 8 2
      p/papi/papi-vl.spec
  3. 25 22
      s/sysstat/sysstat-vl.spec

+ 5 - 7
lib/libp/libpfm/libpfm-vl.spec

@@ -9,8 +9,8 @@
 %endif
 
 Name:		libpfm
-Version:	4.5.0
-Release:	6%{?_dist_release}
+Version:	4.6.0
+Release:	1%{?_dist_release}
 
 Summary:	Library to encode performance events for use by perf tool
 Summary(ja):	プロファイラが用いるパフォーマンスイベントをエンコードするライブラリ
@@ -19,8 +19,6 @@ Group:		System Environment/Libraries
 License:	MIT
 URL:		http://perfmon2.sourceforge.net/
 Source0:	http://sourceforge.net/projects/perfmon2/files/libpfm4/%{name}-%{version}.tar.gz
-Patch12:	libpfm-ac57.patch
-Patch13:	libpfm-ac53.patch
 
 %if %{with python}
 BuildRequires:	python-devel
@@ -66,9 +64,6 @@ Python bindings for libpfm4 and perf_event_open system call.
 %prep
 %setup -q
 
-%patch12 -p1
-%patch13 -p1
-
 %build
 %if %{with python}
 %global python_config CONFIG_PFMLIB_NOPYTHON=n
@@ -119,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Mar 11 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.6.0-1
+- new upstream release
+
 * Fri Feb  6 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.5.0-6
 - initial build for Vine Linux
 

+ 8 - 2
p/papi/papi-vl.spec

@@ -3,8 +3,8 @@
 Summary: Performance Application Programming Interface
 Summary(ja): パフォーマンス計測 API
 Name: papi
-Version: 5.4.0
-Release: 3%{?_dist_release}
+Version: 5.4.1
+Release: 1%{?_dist_release}
 License: BSD
 Group: Development/Tools
 URL: http://icl.cs.utk.edu/papi/
@@ -27,6 +27,7 @@ BuildRequires: libpfm-static >= 4.4.0-5
 BuildRequires: net-tools
 # Following required for inifiband component
 # BuildRequires: libibmad-devel
+BuildRequires: pkgconfig
 
 Requires: papi-libs = %{version}-%{release}
 
@@ -51,6 +52,7 @@ Summary: Header files for the compiling programs with PAPI
 Summary(ja): PAPI を用いたプログラムのコンパイルに必要なヘッダファイル
 Group: Development/Libraries
 Requires: papi = %{version}-%{release}
+Requires: pkgconfig
 
 %description devel
 PAPI-devel includes the C header files that specify the PAPI user-space
@@ -149,6 +151,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/perfmon/*.h
 %endif
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
 %doc %{_mandir}/man3/*
 
 %files testsuite
@@ -164,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Wed Mar 11 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 5.4.1-1
+- new upstream release
+
 * Fri Feb  6 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 5.4.0-3
 - initial build for Vine Linux
 

+ 25 - 22
s/sysstat/sysstat-vl.spec

@@ -1,24 +1,22 @@
 Summary:	Collection of performance monitoring tools for Linux
 Summary(ja):	Linux 用パフォーマンス計測ツール集
 Name:		sysstat
-Version:	10.2.1
+Version:	11.1.3
 Release:	1%{?_dist_release}
 License:	GPLv2+
 Group:		Applications/System
 URL:		http://sebastien.godard.pagesperso-orange.fr/
-Source:		http://pagesperso-orange.fr/sebastien.godard/%{name}-%{version}.tar.bz2
+Source:		http://pagesperso-orange.fr/sebastien.godard/%{name}-%{version}.tar.xz
 
-Requires:	vixie-cron, fileutils, grep, sh-utils, textutils
+BuildRoot::     %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  gettext, lm-sensors-devel
+Requires:	cronie, findutils, xz
 Requires(post):   /sbin/chkconfig
 Requires(preun):  /sbin/chkconfig
-Requires(postun): /sbin/chkconfig
-
-BuildRequires: kernel-headers, gettext, lm-sensors-devel, perl
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: shaolin
 
+Vendor:         Project Vine
+Distribution:   Vine Linux
+Packager:       shaolin
 
 %description
 The sysstat package contains sar, sadf, mpstat, iostat, pidstat, nfsiostat,
@@ -45,15 +43,16 @@ mv CREDITS.aux CREDITS
 
 
 %build
-%configure sa_lib_dir=%{_libdir}/sa history=28 compressafter=31 \
-    --disable-man-group --disable-stripping
-%{__sed} -i 's/SADC_OPTIONS=""/SADC_OPTIONS="-S DISK"/' sysstat.sysconfig
-export CFLAGS="$RPM_OPT_FLAGS -DSADC_PATH=\\\"%{_libdir}/sa/sadc\\\""
-#make %{?_smp_mflags}   # doesn't work in 10.1.6
-make
+%configure \
+    --enable-install-cron --enable-copy-only --disable-file-attr \
+    --disable-stripping --docdir=%{_docdir}/%{name}-%{version} \
+    sadc_options='-S DISK' \
+    history=28 compressafter=31
+make %{?_smp_mflags}
 
 
 %install
+rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 # Install cron file
@@ -66,17 +65,18 @@ install -m 0755 sysstat %{buildroot}%{_initdir}/
 
 %find_lang %{name}
 
+%clean
+rm -rf %{buildroot}
 
 %post
 /sbin/chkconfig --add sysstat
 
-
 %preun
 if [[ $1 -eq 0 ]]; then
-  # Remove sa logs if removing sysstat completely
-  rm -f %{_localstatedir}/log/sa/*
-  # Remove service
-  /sbin/chkconfig --del sysstat
+    # Remove sa logs if removing sysstat completely
+    rm -f %{_localstatedir}/log/sa/*
+    # Remove service
+    /sbin/chkconfig --del sysstat
 fi
 
 
@@ -94,8 +94,11 @@ fi
 %{_mandir}/man8/*
 %{_localstatedir}/log/sa
 
-
 %changelog
+* Wed Mar 11 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 11.1.3-1
+- updated to 11.1.3
+- changed Requires: cronie instead of vixie-cron
+
 * Tue May 13 2014 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 10.2.1-1
 - new upstream (stable) release
 - spec file was in Shift-JIS somehow - fixed