Hello community, here is the log from the commit of package sblim-cmpi-devel for openSUSE:Factory checked in at Fri Mar 19 08:51:26 CET 2010. -------- --- sblim-cmpi-devel/sblim-cmpi-devel.changes 2009-05-12 19:24:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/sblim-cmpi-devel/sblim-cmpi-devel.changes 2010-01-13 12:32:41.000000000 +0100 @@ -1,0 +2,31 @@ +Wed Jan 13 11:32:25 UTC 2010 - kkaempf@novell.com + +- Fix _docdir for Mandriva + +------------------------------------------------------------------- +Wed Jan 13 10:53:55 UTC 2010 - kkaempf@novell.com + +- Fix _docdir for Fedora/RHEL + +------------------------------------------------------------------- +Thu Nov 19 13:25:23 CET 2009 - kukuk@suse.de + +- Fix filelist (wrong usage of %dir) + +------------------------------------------------------------------- +Wed Nov 18 16:19:17 CET 2009 - ro@suse.de + +- fix filelist (missing defattr) + +------------------------------------------------------------------- +Mon Nov 9 21:58:35 CET 2009 - bwhiteley@suse.de + +- Split c++ wrapper headers and devel lib into separate package. + (fate#306414) + +------------------------------------------------------------------- +Wed Oct 14 15:50:37 CEST 2009 - mhrusecky@suse.cz + +- sending current development version to SLE11 SP1 (fate#307089) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- sblim-cmpi-devel.diff-mandriva ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sblim-cmpi-devel.spec ++++++ --- /var/tmp/diff_new_pack.WDdMjP/_old 2010-03-19 08:48:37.000000000 +0100 +++ /var/tmp/diff_new_pack.WDdMjP/_new 2010-03-19 08:48:37.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package sblim-cmpi-devel (Version 2.0.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,17 +21,20 @@ Name: sblim-cmpi-devel Version: 2.0.1 -Release: 5 +Release: 6 Group: Development/Libraries/C and C++ Url: http://sblim.sf.net/ -License: Eclipse Public License 1.0 +License: Other uncritical OpenSource License ; "EPL 1.0 ..." ; EPL 1.0 BuildRequires: doxygen gcc-c++ Provides: cmpi-devel Conflicts: tog-pegasus -Requires: libcmpiCppImpl0 Source0: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: Doxyfile +%if 0%{?mandriva_version} +Patch: %{name}.diff-mandriva +%else Patch: %{name}.diff +%endif Patch1: %{name}-1.0.4-fix-string.dif # PATCH-FIX-UPSTREAM sblim-cmpi-devel-2.0.1-typo.patch [upstream tracker 2688794 ] mhrusecky@suse.cz -- Fixed typo in cmpi/cmpidt.h # https://sourceforge.net/tracker/index.php?func=detail&aid=2688794&group_id=128809&atid=712784 @@ -45,8 +48,23 @@ +%package -n sblim-cmpi-c++-devel +License: "Eclipse Public License 1.0 ..." ; Eclipse Public License 1.0 +Summary: SBLIM CMPI Provider Development Support +Group: Development/Libraries/C and C++ +Requires: libcmpiCppImpl0 %{name} +Conflicts: tog-pegasus + +%description -n sblim-cmpi-c++-devel +This packages provides the C and C++ CMPI header files needed by +provider developers and can be used standalone. If used for C++ +provider development it is also necessary to have tog-pegasus-devel +installed. + + + %package -n libcmpiCppImpl0 -License: Eclipse Public License 1.0 +License: Other uncritical OpenSource License ; "EPL 1.0 ..." ; EPL 1.0 Summary: SBLIM CMPI Provider Development Support Group: Development/Libraries/C and C++ Conflicts: tog-pegasus @@ -58,17 +76,27 @@ installed. +%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} +%define cmpi_docdir %_docdir/%{name}-%{version} +%else +%define cmpi_docdir %_docdir/%{name} +%endif %prep %setup -T -b 0 -n %{name}-%{version} +%if 0%{?suse_version} || 0%{?mandriva_version} +# adapt docdir %patch +%endif %patch1 %patch2 cp %{_sourcedir}/Doxyfile %{_builddir}/%{name}-%{version}/ mkdir %{_builddir}/%{name}-%{version}/autodocs %build +%if 0%{?suse_version} %{suse_update_config -f} +%endif autoreconf --verbose --force --install %configure make %{?_smp_mflags} @@ -78,17 +106,23 @@ make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT/%{_libdir}/libcmpiCppImpl.a rm -f $RPM_BUILD_ROOT/%{_libdir}/libcmpiCppImpl.la -mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}-%{version} -cp -r autodocs/ $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} +mkdir -p $RPM_BUILD_ROOT/%{cmpi_docdir} +cp -r autodocs/ $RPM_BUILD_ROOT/%{cmpi_docdir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc %{_defaultdocdir}/%{name} -%{_includedir}/cmpi +%doc %{cmpi_docdir} +%dir %{_includedir}/cmpi +%{_includedir}/cmpi/[a-z]* + +%files -n sblim-cmpi-c++-devel +%defattr(-,root,root) %{_libdir}/libcmpiCppImpl.so +%dir %{_includedir}/cmpi +%{_includedir}/cmpi/[A-Z]* %files -n libcmpiCppImpl0 %defattr(-,root,root) ++++++ sblim-cmpi-devel.diff-mandriva ++++++ Index: Makefile.am =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/Makefile.am,v retrieving revision 1.7 diff -u -w -r1.7 Makefile.am --- Makefile.am 28 Feb 2009 04:23:31 -0000 1.7 +++ Makefile.am 6 Mar 2009 11:05:28 -0000 @@ -5,7 +5,7 @@ AM_CPPFLAGS=-I$(srcdir)/cmpi \ @SBLIM_CMPI_PLATFORM@ -docdir=$(datadir)/doc/$(PACKAGE)-$(VERSION) +docdir=$(datadir)/doc/$(PACKAGE) if INSTALL_LIBRARY lib_LTLIBRARIES=libcmpiCppImpl.la ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org