(file) Return to tog-pegasus.spec CVS log (file) (dir) Up to [Pegasus] / pegasus / rpm

Diff for /pegasus/rpm/tog-pegasus.spec between version 1.128.2.2 and 1.128.2.3

version 1.128.2.2, 2012/02/15 17:47:01 version 1.128.2.3, 2013/06/03 22:34:48
Line 41 
Line 41 
  
 %define Flavor  tog %define Flavor  tog
 %define packageVersion 1 %define packageVersion 1
 Version: 2.12.0  Version: 2.13.0
 Release: %{packageVersion}%{?LINUX_VERSION:.%{LINUX_VERSION}} Release: %{packageVersion}%{?LINUX_VERSION:.%{LINUX_VERSION}}
 Epoch:   1 Epoch:   1
  
Line 64 
Line 64 
 # providers for 64 bit CIMOM. # providers for 64 bit CIMOM.
 %{?!PEGASUS_32BIT_PROVIDER_SUPPORT: %define PEGASUS_32BIT_PROVIDER_SUPPORT 0} %{?!PEGASUS_32BIT_PROVIDER_SUPPORT: %define PEGASUS_32BIT_PROVIDER_SUPPORT 0}
  
   # Use "rpmbuild --define 'PEGASUS_BUILD_WITH_CLANG 1'" to build rpm with clang.
   # This shrinks disk usage by around 4%
   %{?!PEGASUS_BUILD_WITH_CLANG: %define PEGASUS_BUILD_WITH_CLANG 0}
   
 Summary:   OpenPegasus WBEM Services for Linux Summary:   OpenPegasus WBEM Services for Linux
 Name:      %{Flavor}-pegasus Name:      %{Flavor}-pegasus
 Group:     Systems Management/Base Group:     Systems Management/Base
Line 80 
Line 84 
 BuildRequires:      bash, sed, grep, coreutils, procps, gcc, gcc-c++ BuildRequires:      bash, sed, grep, coreutils, procps, gcc, gcc-c++
 BuildRequires:      libstdc++, make, pam-devel BuildRequires:      libstdc++, make, pam-devel
 BuildRequires:      openssl-devel >= 0.9.6, e2fsprogs BuildRequires:      openssl-devel >= 0.9.6, e2fsprogs
   
   #Following is commented because, Currently could not find clang shipped
   #Should be changed or uncommented when distros ship clang
   #and expects that system has clang 3 and above installed by other means
   #%if %{PEGASUS_BUILD_WITH_CLANG}
   #BuildRequires:      clang
   #%endif
   
 %if %{JMPI_PROVIDER_REQUESTED} %if %{JMPI_PROVIDER_REQUESTED}
 BuildRequires:      gcc-java, libgcj-devel, libgcj, java-1.4.2-gcj-compat BuildRequires:      gcc-java, libgcj-devel, libgcj, java-1.4.2-gcj-compat
 Requires:           libgcj, java-1.4.2-gcj-compat Requires:           libgcj, java-1.4.2-gcj-compat
 %endif %endif
 %if %{EXTERNAL_SLP_REQUESTED} %if %{EXTERNAL_SLP_REQUESTED}
 BuildRequires:      openslp  BuildRequires:      openslp, openslp_devel
 Requires:           openslp Requires:           openslp
 %endif %endif
  
Line 132 
Line 144 
 %global PEGASUS_HARDWARE_PLATFORM LINUX_IA64_GNU %global PEGASUS_HARDWARE_PLATFORM LINUX_IA64_GNU
 %else %else
 %ifarch x86_64 %ifarch x86_64
   %if %{PEGASUS_BUILD_WITH_CLANG}
   %global PEGASUS_HARDWARE_PLATFORM LINUX_X86_64_CLANG
   %else
 %global PEGASUS_HARDWARE_PLATFORM LINUX_X86_64_GNU %global PEGASUS_HARDWARE_PLATFORM LINUX_X86_64_GNU
   %endif
 %else %else
 %ifarch ppc %ifarch ppc
 %global PEGASUS_HARDWARE_PLATFORM LINUX_PPC_GNU %global PEGASUS_HARDWARE_PLATFORM LINUX_PPC_GNU
Line 146 
Line 162 
 %ifarch s390x zseries %ifarch s390x zseries
 %global PEGASUS_HARDWARE_PLATFORM LINUX_ZSERIES64_GNU %global PEGASUS_HARDWARE_PLATFORM LINUX_ZSERIES64_GNU
 %else %else
   %if %{PEGASUS_BUILD_WITH_CLANG}
   %global PEGASUS_HARDWARE_PLATFORM LINUX_IX86_CLANG
   %else
 %global PEGASUS_HARDWARE_PLATFORM LINUX_IX86_GNU %global PEGASUS_HARDWARE_PLATFORM LINUX_IX86_GNU
 %endif %endif
 %endif %endif
Line 153 
Line 172 
 %endif %endif
 %endif %endif
 %endif %endif
   %endif
 # #
 # End of section pegasus/rpm/tog-specfiles/tog-pegasus-arch.spec # End of section pegasus/rpm/tog-specfiles/tog-pegasus-arch.spec
  
Line 162 
Line 182 
 %if %{PEGASUS_32BIT_PROVIDER_SUPPORT} %if %{PEGASUS_32BIT_PROVIDER_SUPPORT}
  
 %ifarch x86_64 %ifarch x86_64
   
   %if %{PEGASUS_BUILD_WITH_CLANG}
   %global PEGASUS_HARDWARE_PLATFORM_FOR_32BIT LINUX_IX86_CLANG
   %global PEGASUS_EXTRA_CXX_FLAGS_32BIT  "-O2 -g -pipe -fexceptions -fstack-protector -march=i386 -mtune=generic -fasynchronous-unwind-tables -m32"
   % global PEGASUS_EXTRA_LINK_FLAGS_32BIT "-O2 -g -pipe -fexceptions -fstack-protector -march=i386 -mtune=generic -fasynchronous-unwind-tables -m32"
   %else
 %global PEGASUS_HARDWARE_PLATFORM_FOR_32BIT LINUX_IX86_GNU %global PEGASUS_HARDWARE_PLATFORM_FOR_32BIT LINUX_IX86_GNU
 %global PEGASUS_EXTRA_CXX_FLAGS_32BIT  "-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -march=i386 -mtune=generic -fasynchronous-unwind-tables -Wno-unused -m32" %global PEGASUS_EXTRA_CXX_FLAGS_32BIT  "-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -march=i386 -mtune=generic -fasynchronous-unwind-tables -Wno-unused -m32"
 %global PEGASUS_EXTRA_LINK_FLAGS_32BIT "-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -march=i386 -mtune=generic -fasynchronous-unwind-tables -m32" %global PEGASUS_EXTRA_LINK_FLAGS_32BIT "-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -march=i386 -mtune=generic -fasynchronous-unwind-tables -m32"
   %endif
 %else %else
 %ifarch ppc64 pseries %ifarch ppc64 pseries
 %global PEGASUS_HARDWARE_PLATFORM_FOR_32BIT LINUX_PPC_GNU %global PEGASUS_HARDWARE_PLATFORM_FOR_32BIT LINUX_PPC_GNU
Line 204 
Line 231 
 %global PEGASUS_REPOSITORY_PARENT_DIR /var/lib/Pegasus %global PEGASUS_REPOSITORY_PARENT_DIR /var/lib/Pegasus
 %global PEGASUS_PREV_REPOSITORY_DIR /var/lib/Pegasus/prev_repository %global PEGASUS_PREV_REPOSITORY_DIR /var/lib/Pegasus/prev_repository
 %global PEGASUS_SBIN_DIR /usr/sbin %global PEGASUS_SBIN_DIR /usr/sbin
 %global PEGASUS_DOC_DIR /usr/share/doc/tog-pegasus-2.12  %global PEGASUS_DOC_DIR /usr/share/doc/tog-pegasus-2.13
  
 %global PEGASUS_RPM_ROOT  $RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION %global PEGASUS_RPM_ROOT  $RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION
 %global PEGASUS_RPM_HOME %PEGASUS_RPM_ROOT/build %global PEGASUS_RPM_HOME %PEGASUS_RPM_ROOT/build
Line 216 
Line 243 
 Summary: The OpenPegasus Software Development Kit Summary: The OpenPegasus Software Development Kit
 Group: Systems Management/Base Group: Systems Management/Base
 Requires: %{Flavor}-pegasus >= %{version} Requires: %{Flavor}-pegasus >= %{version}
   Requires(preun): bash, procps, grep, coreutils, make
 Obsoletes: %{Flavor}-pegasus-sdk Obsoletes: %{Flavor}-pegasus-sdk
  
 %description devel %description devel
Line 539 
Line 567 
 /usr/share/Pegasus/mof /usr/share/Pegasus/mof
  
 %defattr(600,root,pegasus,755) %defattr(600,root,pegasus,755)
 %dir /usr/share/doc/tog-pegasus-2.12  %dir /usr/share/doc/tog-pegasus-2.13
 %dir /usr/share/Pegasus %dir /usr/share/Pegasus
 %dir /usr/share/Pegasus/scripts %dir /usr/share/Pegasus/scripts
 %dir /var/lib/Pegasus %dir /var/lib/Pegasus
Line 591 
Line 619 
 %attr(644,root,pegasus) /usr/share/man/man1/* %attr(644,root,pegasus) /usr/share/man/man1/*
 %attr(644,root,pegasus) /usr/share/man/man8/* %attr(644,root,pegasus) /usr/share/man/man8/*
  
 %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.12/Admin_Guide_Release.pdf  %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.13/Admin_Guide_Release.pdf
 %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.12/PegasusSSLGuidelines.htm  %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.13/PegasusSSLGuidelines.htm
 %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.12/license.txt  %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.13/license.txt
 %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.12/OpenPegasusNOTICE.txt  %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.13/OpenPegasusNOTICE.txt
 /usr/%PEGASUS_ARCH_LIB/libpegclient.so /usr/%PEGASUS_ARCH_LIB/libpegclient.so
 /usr/%PEGASUS_ARCH_LIB/libpegcommon.so /usr/%PEGASUS_ARCH_LIB/libpegcommon.so
 /usr/%PEGASUS_ARCH_LIB/libpegprovider.so /usr/%PEGASUS_ARCH_LIB/libpegprovider.so
Line 614 
Line 642 
 %defattr(644,root,pegasus,755) %defattr(644,root,pegasus,755)
 /usr/share/Pegasus/samples /usr/share/Pegasus/samples
 /usr/include/Pegasus /usr/include/Pegasus
 %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.12/SecurityGuidelinesForDevelopers.html  %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.13/SecurityGuidelinesForDevelopers.html
 /usr/share/Pegasus/html /usr/share/Pegasus/html
  
 %if %{PEGASUS_BUILD_TEST_RPM} %if %{PEGASUS_BUILD_TEST_RPM}

Legend:
Removed from v.1.128.2.2  
changed lines
  Added in v.1.128.2.3
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2