Mailinglist Archive: opensuse-commit (1023 mails)
| < Previous | Next > |
commit sblim-gather for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 02 Nov 2010 16:14:42 +0100
- Message-id: <20101102151443.171A320298@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package sblim-gather for openSUSE:Factory
checked in at Tue Nov 2 16:14:42 CET 2010.
--------
--- sblim-gather/sblim-gather.changes 2009-10-02 13:44:19.000000000 +0200
+++ /mounts/work_src_done/STABLE/sblim-gather/sblim-gather.changes
2010-09-14 22:26:39.000000000 +0200
@@ -1,0 +2,21 @@
+Tue Sep 14 20:25:37 UTC 2010 - kkaempf@xxxxxxxxxx
+
+- Fix RH/Fedora build
+
+-------------------------------------------------------------------
+Wed Sep 8 00:23:37 UTC 2010 - aj@xxxxxxx
+
+- BuildRequire sysfsutils-devel
+
+-------------------------------------------------------------------
+Mon Mar 29 15:36:43 UTC 2010 - kkaempf@xxxxxxxxxx
+
+- Sysfs wrapper incorrectly calls open_device_path in stead of
+ open_device_tree (bnc#590239)
+
+-------------------------------------------------------------------
+Wed Oct 14 15:50:37 CEST 2009 - mhrusecky@xxxxxxx
+
+- sending current development version to SLE11 SP1 (fate#307089)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
use-open_device_tree-in-sysfs-wrapper.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sblim-gather.spec ++++++
--- /var/tmp/diff_new_pack.bsvUes/_old 2010-11-02 16:14:17.000000000 +0100
+++ /var/tmp/diff_new_pack.bsvUes/_new 2010-11-02 16:14:17.000000000 +0100
@@ -19,22 +19,38 @@
Name: sblim-gather
-BuildRequires: gcc-c++ libvirt-devel openslp-devel openssl-devel pam-devel
sblim-cmpi-base-devel sblim-indication_helper-devel sblim-testsuite sysfsutils
+BuildRequires: gcc-c++ libvirt-devel openssl-devel pam-devel
sblim-cmpi-base-devel sblim-indication_helper-devel sblim-testsuite
+%if 0%{?rhel_version} != 501
+BuildRequires: openslp-devel
+%endif
+BuildRequires: glib2-devel
+%if 0%{?suse_version}
+BuildRequires: pkg-config
+%if 0%{?suse_version} > 1130
+BuildRequires: sysfsutils-devel
+%else
+BuildRequires: sysfsutils
+%endif
+%else
+BuildRequires: pkgconfig
+BuildRequires: libsysfs-devel
+%endif
Url: http://sblim.wiki.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: SBLIM Performance Data Gatherer and Provider
Version: 2.2.0
-Release: 1
+Release: 6
Group: System/Management
-License: Eclipse Public License 1.0
+License: IBM PL
Source0:
http://prdownloads.sourceforge.net/sblim/sblim-gather-%{version}.tar.bz2
Patch1: sblim-gather-2.1.8_pointers.patch
# see
https://sourceforge.net/tracker/?func=detail&atid=712784&aid=1845491&group_id=128809
Patch2: gather-reposdump.patch
Patch3: sblim-gather-2.2.0-redefinition.patch
+Patch4: use-open_device_tree-in-sysfs-wrapper.patch
Provides: sblim-gather-pluginz = %{version}
-PreReq: sblim-sfcb
-#!BuildIgnore: tog-pegasus
+Requires(pre): cim-server
+BuildRequires: -tog-pegasus
%description
The purpose of this package is to implement the DMTF CIM Metrics Model
@@ -58,7 +74,7 @@
SBLIM Project
%package provider
-License: Eclipse Public License 1.0
+License: IBM PL
Summary: SBLIM Gatherer Provider
Group: System/Management
Requires: %{name} = %{version}
@@ -76,7 +92,7 @@
SBLIM Project
%package devel
-License: Eclipse Public License 1.0
+License: IBM PL
Summary: SBLIM Gatherer Development Support
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
@@ -91,7 +107,7 @@
SBLIM Project
%package test
-License: Eclipse Public License 1.0
+License: IBM PL
Summary: SBLIM Gatherer Testcase Files
Group: System/Management
Requires: %{name} = %{version}
@@ -112,6 +128,7 @@
%patch1
%patch2
%patch3
+%patch4 -p1
%build
autoreconf -fi
@@ -120,21 +137,27 @@
%{__make}
%install
+%if 0%{?suse_version}
%makeinstall docdir=%{_docdir}/%{name}
+%else
+make install DESTDIR=%{buildroot} docdir=%{_docdir}/%{name}-%{version}
+%endif
find %{buildroot} -type f -name \*.la -print0 -delete
%clean
%{__rm} -rf %{buildroot}
+%define MOF
Linux_IPProtocolEndpointMetric,Linux_LocalFileSystemMetric,Linux_Metric,Linux_NetworkPortMetric,Linux_OperatingSystemMetric,Linux_ProcessorMetric,Linux_UnixProcessMetric,Linux_XenMetric,Linux_zCECMetric,Linux_zCHMetric,Linux_zECKDMetric,Linux_zLPARMetric
+
%post provider
# compile MOF
d=%_datadir/%name
-$d/provider-register.sh -t sfcb -r $d/*.registration -m $d/*.mof
+$d/provider-register.sh -t sfcb -r $d/{%{MOF}}.registration -m $d/{%{MOF}}.mof
%preun provider
if [ "$1" = "0" ]; then
d=%_datadir/%name
- $d/provider-register.sh -t sfcb -d -r $d/*.registration -m $d/*.mof
+ $d/provider-register.sh -t sfcb -d -r $d/{%{MOF}}.registration -m
$d/{%{MOF}}.mof
fi
%postun provider -p /sbin/ldconfig
@@ -150,7 +173,11 @@
%{_localstatedir}/run/gather
%{_bindir}/*
%{_sbindir}/*
+%if 0%{?suse_version}
%doc %{_docdir}/%{name}
+%else
+%doc %{_docdir}/%{name}-%{version}
+%endif
%dir %{_libdir}/gather
%dir %{_libdir}/gather/mplug
%dir %{_libdir}/gather/rplug
++++++ use-open_device_tree-in-sysfs-wrapper.patch ++++++
diff -rupN sblim-gather-2.1.6/plugin/sysfswrapper.c
sblim-gather-2.1.6-s390x/plugin/sysfswrapper.c
--- sblim-gather-2.1.6/plugin/sysfswrapper.c 2007-02-15 16:24:25.000000000
+0000
+++ sblim-gather-2.1.6-s390x/plugin/sysfswrapper.c 2010-03-19
07:08:00.000000000 +0000
@@ -65,7 +65,7 @@ void sysfsw_closeDevice(sysfsw_Device* d
}
sysfsw_Device* sysfsw_openDeviceTree(const char* devicePath) {
- return sysfs_open_device_path(devicePath);
+ return sysfs_open_device_tree(devicePath);
}
sysfsw_DeviceList* sysfsw_getDeviceList(sysfsw_Device* device) {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |