Menu
▾
▴
[Omc-commit] SF.net SVN: omc:[858] contrib/xen-vm-builder/trunk
|
From: <np...@us...> - 2008-08-18 19:40:21
|
Revision: 858
http://omc.svn.sourceforge.net/omc/?rev=858&view=rev
Author: npaxton
Date: 2008-08-18 19:40:23 +0000 (Mon, 18 Aug 2008)
Log Message:
-----------
move to new registration scheme with .reg file instead of .registration file; checkin the modifed spec to sync up with the one that has been working in obs for a while now
Modified Paths:
--------------
contrib/xen-vm-builder/trunk/mof/Makefile.am
contrib/xen-vm-builder/trunk/sblim-cmpi-xenvm-builder.spec
Modified: contrib/xen-vm-builder/trunk/mof/Makefile.am
===================================================================
--- contrib/xen-vm-builder/trunk/mof/Makefile.am 2008-08-18 16:56:00 UTC (rev 857)
+++ contrib/xen-vm-builder/trunk/mof/Makefile.am 2008-08-18 19:40:23 UTC (rev 858)
@@ -12,7 +12,8 @@
owning-job-peg.reg \
settings-define-build-peg.reg \
vmcreation-data-peg.reg \
- XEN_VMBuilder.registration
+ XEN_VMBuilder.registration \
+ XEN_VMBuilder.reg
mofdir = $(datadir)/mof/$(PACKAGE_NAME)
Modified: contrib/xen-vm-builder/trunk/sblim-cmpi-xenvm-builder.spec
===================================================================
--- contrib/xen-vm-builder/trunk/sblim-cmpi-xenvm-builder.spec 2008-08-18 16:56:00 UTC (rev 857)
+++ contrib/xen-vm-builder/trunk/sblim-cmpi-xenvm-builder.spec 2008-08-18 19:40:23 UTC (rev 858)
@@ -1,7 +1,7 @@
#
# spec file for package sblim-cmpi-xenvm-builder (Version 1.0.0)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -9,39 +9,38 @@
#
# norootforbuild
-# usedforbuild aaa_base acl attr audit-libs autoconf automake bash bind-libs bind-utils binutils bison blocxx blocxx-devel bzip2 cim-schema coreutils cpio cpp cracklib cvs cyrus-sasl db dbus-1 dbus-1-glib dejagnu diffutils docbook-xsl-stylesheets docbook_4 doxygen e2fsprogs expat expect file filesystem fillup findutils flex fop gawk gcc gcc-c++ gdbm gdbm-devel gettext gettext-devel glib2 glibc glibc-devel glibc-locale gnome-filesystem gpm grep groff gzip hal hwinfo hwinfo-devel info insserv java-1_4_2-sun jpackage-utils klogd less libacl libapr-util1 libapr1 libattr libcom_err libgcc libgcrypt libgpg-error libltdl libnscd libpng libstdc++ libstdc++-devel libtool libusb libvolume_id libxcrypt libxml2 libxslt libzio limal limal-devel limal-devtools limal-runlevel limal-runlevel-devel m4 make man mktemp module-init-tools ncurses ncurses-devel neon net-tools netcfg openldap2-client openslp openslp-devel openssl openssl-devel openwbem openwbem-devel pam pam-devel pam-modules patch pcre pcre-devel perl perl-Config-IniFiles perl-XML-Parser perl-XML-Writer permissions pkgconfig popt procinfo procps psmisc pwdutils rcs readline recode rpm sed strace subversion swig sysfsutils sysvinit tar tcl tcpd texinfo timezone udev unzip util-linux vim wireless-tools zlib zlib-devel
+
Name: sblim-cmpi-xenvm-builder
-BuildRequires: gcc sblim-cmpi-devel sblim-cmpiutil-devel sqlite-devel pkgconfig
+BuildRequires: gcc pkgconfig sblim-cmpi-devel sblim-cmpiutil sblim-cmpiutil-devel sqlite-devel sblim-sfcb sblim-cmpi-base
%define tarname sblim-cmpi-xenvm-builder
-URL: http://www.omc-project.org
-%define sblimprefix /usr
-
+Url: http://www.omc-project.org
# Increment the version every time the source code changes.
-Version: 1.0.0
-Release: 1
+Version: 1.0.1
+Release: 0.2
Group: System/Management
-Summary: Linux CIM providers for CMPI instrumentation of virtual machine creation.
-PreReq: %{_datadir}/sblim-cmpi-base/provider-register.sh coreutils
-License: Other License(s), see package, Commercial
-
+Summary: Linux CIM providers for CMPI instrumentation of virtual machine creation
+PreReq: coreutils
+License: Other uncritical OpenSource License
# This is necessary to build the RPM as a non-root user.
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# "yes" is the default, but we put it here explicitly to avoid someone
# setting it to "no"
-AutoReqProv: yes
-Requires: cim-server, cim-schema, sblim-cmpiutil sblim-cmpi-base xen-tools
+AutoReqProv: yes
+Requires: sblim-sfcb cim-schema sblim-cmpiutil sblim-cmpi-base xen-tools
Source0: %{tarname}-%{version}.tar.gz
#Source1: %{tarname}-mof.tar.bz2
%description
-Linux CIM providers for CMPI instrumentation of XEN virtual machine creation.
+Linux CIM providers for CMPI instrumentation of XEN virtual machine
+creation.
+
+
Authors:
--------
Jon Carey
-
%prep
# Untar the sources.
%setup -n %{tarname}-%{version}
@@ -55,68 +54,61 @@
autoreconf --force --install
CFLAGS="$RPM_OPT_FLAGS -fstack-protector" \
CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector" \
-./configure --prefix=%{sblimprefix} \
- --libdir=%_libdir
-make %{?jobs:-j%jobs}
+%configure
+%{__make}
%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__mkdir} -p $RPM_BUILD_ROOT
# Tell 'make install' to install into the BuildRoot
make DESTDIR=$RPM_BUILD_ROOT install
-MOFDIR=$RPM_BUILD_ROOT/%{sblimprefix}/share/%{name}
-install -d $MOFDIR
-install mof/*.mof $MOFDIR/
-install mof/*.registration $MOFDIR/
-install mof/*-peg.reg $MOFDIR/
-%{__rm} -f $RPM_BUILD_ROOT%{sblimprefix}/%_lib/cmpi/*.{a,la}
-%{__rm} -f $RPM_BUILD_ROOT%{sblimprefix}/%_lib/libcmpixen*.{a,la}
+#MOFDIR=$RPM_BUILD_ROOT/%{_datadir}/mof/%{name}
+#install -d $MOFDIR
+#install mof/*.mof $MOFDIR/
+#install mof/*.registration $MOFDIR/
+#install mof/*-peg.reg $MOFDIR/
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/cmpi/*.{a,la}
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libcmpixen*.{a,la}
%clean
%{__rm} -rf $RPM_BUILD_ROOT
%pre
# Conditional definition of schema and registration files
-%define SCHEMA %{_datadir}/%{name}/XEN_VMBuilder.mof
-%define REGISTRATION %{_datadir}/%{name}/XEN_VMBuilder.registration
-%define PROVREG %{_datadir}/sblim-cmpi-base/provider-register.sh
-
-# If upgrading, deregister old version
+%define SCHEMA %{_datadir}/mof/%{name}/XEN_VMBuilder.mof
+%define REGISTRATION %{_datadir}/mof/%{name}/XEN_VMBuilder.reg
+# If upgrading/not new install/not removing, deregister old version
if [ $1 -gt 1 ]
then
- %{PROVREG} -d -r %{REGISTRATION} -m %{SCHEMA} > /dev/null
+# /usr/sbin/provider-register.sh -d -r %{_datadir}/mof/%{name}/*.registration -m %{_datadir}/mof/%{name}/*.mof
+ sfcbunstage -n root/cimv2 -r XEN_VMBuilder.reg XEN_VMBuilder.mof
+ sfcbrepos -f
+ /etc/init.d/sfcb condrestart
fi
%post
-# Any RPM that installs a shared library into any directory
-# listed in /etc/ld.so.conf (or into /usr/lib if it hasn't been
-# fixed yet to install into the correct FHS compliant paths)
-# must run ldconfig in its post install script.
-%run_ldconfig
-# load MOF
-MOFDIR=%{sblimprefix}/share/%{name}
+/sbin/ldconfig
+#/usr/sbin/provider-register.sh -r %{_datadir}/mof/%{name}/*.registration -m %{_datadir}/mof/%{name}/*.mof
+sfcbstage -n root/cimv2 -r %{REGISTRATION} %{SCHEMA}
+sfcbrepos -f
+/etc/init.d/sfcb condrestart
-%{PROVREG} -r %{REGISTRATION} -m %{SCHEMA}
-
%preun
-%{PROVREG} -r %{REGISTRATION} -m %{SCHEMA}
+# If removing (not upgrading) then de-register, before the files are gone
+if [ "x$1" = "x0" ]; then
+# /usr/sbin/provider-register.sh -d -r %{_datadir}/mof/%{name}/*.registration -m %{_datadir}/mof/%{name}/*.mof
+ sfcbunstage -n root/cimv2 -r XEN_VMBuilder.reg XEN_VMBuilder.mof
+ sfcbrepos -f
+ /etc/init.d/sfcb condrestart
+fi
-# if -e operation, not -U
-#if remove/not an upgrade, then deregister
-if [ "x$1" = "x0" ]; then
-%{PROVREG} -d -r %{_datadir}/%{name}/*.registration -m %{_datadir}/%{name}/*.mof
-fi
-
-%postun
-%run_ldconfig
-
%files
%defattr(-,root,root)
-%{sblimprefix}/%_lib/cmpi/*.so*
-%{sblimprefix}/%_lib/libcmpixen*.so*
+/%{_libdir}/cmpi/*.so*
+/%{_libdir}/libcmpixen*.so*
+%dir %{_datadir}/mof/%{name}
+%{_datadir}/mof/%{name}/*
-%dir %{sblimprefix}/share/%{name}
-%{sblimprefix}/share/%{name}/*
-
-%changelog -n sblim-cmpi-xenvm-builder
-
+%changelog
+* Mon Jul 07 2008 - jc...@no...
+- Initial Revision
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
