Changes - j0ke.net Open Build Service

Changes of Revision 5

[-] [+]	Changed	sigar.spec
@@ -1,5 +1,6 @@ %define pkg_name sigar -Name: lib%{pkg_name} +%define soname 0 +Name: lib%{pkg_name}%{soname} Version: 1.6.5 #Release: 0.2.git833ca18%{?dist} Release: 5 @@ -24,10 +25,13 @@ Source0: %{pkg_name}-%{version}-%{sigar_hash}.tbz2 BuildRoot: %{_tmppath}/%{pkg_name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gcc cmake - -Patch100: bz714249-1-cpu-count.patch -Patch101: bz746288-1-cpu-count-arch.patch +BuildRequires: gcc cmake binutils +BuildRequires: autoconf automake +BuildRequires: lua-devel + +Patch0: sigar-1.6.5_autogen.patch +Patch100: bz714249-1-cpu-count.patch +Patch101: bz746288-1-cpu-count-arch.patch %description The Sigar API provides a portable interface for gathering system @@ -50,7 +54,7 @@ License: ASL 2.0 Group: Development/Libraries Summary: SIGAR Development package - System Information Gatherer And Reporter -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{soname} = %{version}-%{release} %description -n %{pkg_name}-devel Header files for developing against the Sigar API @@ -59,27 +63,29 @@ # When using the GitHub tarballs, use: # setup -q -n hyperic-{name}-{sigar_hash} %setup -q -n %{pkg_name}-%{version} +%patch0 %patch100 -p1 -b .bz714249 %patch101 -p1 -b .bz746288 %build - # Fix lib directory sed -i.sed s:DESTINATION\ lib:DESTINATION\ %{_lib}: src/CMakeLists.txt - -mkdir build -pushd build -cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} .. +%configure +##ls -al src/ +##mkdir build +##pushd build +##cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} .. make %{?_smp_mflags} -popd +##popd %install rm -rf $RPM_BUILD_ROOT -pushd build -cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} .. -make install DESTDIR=$RPM_BUILD_ROOT -popd +##pushd build +##cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} .. +make install DESTDIR=%{buildroot} +##popd +objdump -x %{buildroot}%{_libdir}/libsigar.so \| grep sigar_version_get %clean rm -rf $RPM_BUILD_ROOT @@ -90,12 +96,16 @@ %files %defattr(-,root,root,-) -%doc ChangeLog README LICENSE NOTICE AUTHORS -%{_libdir}/libsigar.so +%doc ChangeLog README LICENSE NOTICE +%{_libdir}/libsigar.so.0.0.0 %files -n %{pkg_name}-devel %defattr(-,root,root,-) %{_includedir}/sigar*.h -%doc LICENSE NOTICE AUTHORS +%{_libdir}/libsigar.so.0 +%{_libdir}/libsigar.so +%{_libdir}/libsigar.a +%{_libdir}/libsigar.la +%doc LICENSE NOTICE %changelog
[-] [+]	Added	sigar-1.6.5_autogen.patch ^
@@ -0,0 +1,24 @@ +--- configure.ac.orig 2013-11-18 16:33:42.097145778 +0100 ++++ configure.ac 2013-11-18 16:33:53.593144860 +0100 +@@ -148,10 +148,7 @@ + src/os/freebsd/Makefile + src/os/hpux/Makefile + src/os/linux/Makefile +-src/os/netware/Makefile +-src/os/osf1/Makefile + src/os/solaris/Makefile +-src/os/stub/Makefile + src/os/win32/Makefile + examples/Makefile + src/sigar_version_autoconf.c +--- src/os/Makefile.am.orig 2013-11-18 16:33:26.337145896 +0100 ++++ src/os/Makefile.am 2013-11-18 16:33:35.009145302 +0100 +@@ -4,8 +4,5 @@ + freebsd \ + hpux \ + linux \ +- netware \ +- osf1 \ + solaris \ +- stub \ + win32
	Changed	sigar-1.6.5-58097d9.tbz2 ^