diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-08-06 22:18:43 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-08-06 22:19:43 -0400 |
| commit | 6af6a8b3a2ee698b868c48fe4f6fe939a11e53b5 (patch) | |
| tree | ca42107ad5b3babd6785741048d7fb2c736f682a /cpp | |
| parent | Fixed build failure (diff) | |
| download | ice-6af6a8b3a2ee698b868c48fe4f6fe939a11e53b5.tar.bz2 ice-6af6a8b3a2ee698b868c48fe4f6fe939a11e53b5.tar.xz ice-6af6a8b3a2ee698b868c48fe4f6fe939a11e53b5.zip | |
RC2 fixes
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/install/rpm/ice.spec | 39 |
1 files changed, 32 insertions, 7 deletions
diff --git a/cpp/install/rpm/ice.spec b/cpp/install/rpm/ice.spec index 3c0accc87a6..d6a8d1b9899 100644 --- a/cpp/install/rpm/ice.spec +++ b/cpp/install/rpm/ice.spec @@ -1,4 +1,4 @@ -%if "%{_target_cpu}" != "noarch" && "%{dist}" == ".rhel4" +%if "%{_target_cpu}" != "noarch" && "%{dist}" != ".sles10" %define ruby_included 1 %else %define ruby_included 0 @@ -59,6 +59,14 @@ BuildRequires: ruby-devel >= 1.8.1 BuildRequires: php >= 5.1.4 BuildRequires: php-devel >= 5.1.4 %endif +%if "%{dist}" == ".rhel5" +BuildRequires: bzip2-devel >= 1.0.3 +BuildRequires: expat-devel >= 1.95.8 +BuildRequires: ruby >= 1.8.5 +BuildRequires: ruby-devel >= 1.8.5 +BuildRequires: php >= 5.1.6 +BuildRequires: php-devel >= 5.1.6 +%endif %if "%{dist}" == ".sles10" BuildRequires: php5 >= 5.1.2 BuildRequires: php5-devel >= 5.1.2 @@ -242,7 +250,7 @@ fi # Move ice.ini and IcePHP.so to distribution-dependent directories # -%if "%{dist}" == ".rhel4" +%if "%{dist}" == ".rhel4" || "%{dist}" == ".rhel5" mkdir -p $RPM_BUILD_ROOT/etc/php.d mv $RPM_BUILD_ROOT/ice.ini $RPM_BUILD_ROOT/etc/php.d mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/php/modules @@ -264,7 +272,7 @@ mkdir -p $RPM_BUILD_ROOT/usr mv $RPM_BUILD_ROOT/include ${RPM_BUILD_ROOT}%{_includedir} mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/Ice-%{version} -mv $RPM_BUILD_ROOT/python ${RPM_BUILD_ROOT}%{_libdir}/Ice-%{version} +mv $RPM_BUILD_ROOT/python ${RPM_BUILD_ROOT}%{_libdir}/Ice-%{version}/python mkdir -p ${RPM_BUILD_ROOT}%{_defaultdocdir} mv $RPM_BUILD_ROOT/help ${RPM_BUILD_ROOT}%{_defaultdocdir}/Ice-%{version} @@ -276,13 +284,13 @@ mv $RPM_BUILD_ROOT/THIRD_PARTY_LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/Ice-%{ mv $RPM_BUILD_ROOT/SOURCES ${RPM_BUILD_ROOT}%{_defaultdocdir}/Ice-%{version} mkdir -p $RPM_BUILD_ROOT/usr/lib/Ice-%{version} -mv $RPM_BUILD_ROOT/ant $RPM_BUILD_ROOT/usr/lib/Ice-%{version} -mv $RPM_BUILD_ROOT/usr/lib/IceGridGUI.jar $RPM_BUILD_ROOT/usr/lib/Ice-%{version} +mv $RPM_BUILD_ROOT/ant $RPM_BUILD_ROOT/usr/lib/Ice-%{version}/ant +mv $RPM_BUILD_ROOT/usr/lib/IceGridGUI.jar $RPM_BUILD_ROOT/usr/lib/Ice-%{version}/IceGridGUI.jar %endif %if %{ruby_included} mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/Ice-%{version} -mv $RPM_BUILD_ROOT/ruby ${RPM_BUILD_ROOT}%{_libdir}/Ice-%{version} +mv $RPM_BUILD_ROOT/ruby ${RPM_BUILD_ROOT}%{_libdir}/Ice-%{version}/ruby %endif %ifarch noarch @@ -322,6 +330,12 @@ mv $RPM_BUILD_ROOT/bin $RPM_BUILD_ROOT/usr/bin rm -rf ${RPM_BUILD_ROOT} %changelog +* Fri Jul 27 2007 Bernard Normier +- Updated for Ice 3.2.1 release + +* Wed Jun 13 2007 Bernard Normier +- Added patch with new IceGrid.Node.AllowRunningServersAsRoot property. + * Fri Dec 6 2006 ZeroC Staff - See source distributions or the ZeroC website for more information about the changes in this release @@ -474,6 +488,9 @@ Group: System Environment/Libraries %if "%{dist}" == ".rhel4" Requires: ice = %{version}, php >= 5.1.4 %endif +%if "%{dist}" == ".rhel5" +Requires: ice = %{version}, php >= 5.1.6 +%endif %if "%{dist}" == ".sles10" Requires: ice-%{_target_cpu}, php5 >= 5.1.2 %endif @@ -583,6 +600,14 @@ firewall solution, and much more. %attr(755, root, root) %{_datadir}/Ice-%{version}/convertssl.py %attr(755, root, root) %{_datadir}/Ice-%{version}/upgradeicegrid.py %attr(755, root, root) %{_datadir}/Ice-%{version}/upgradeicestorm.py +%if "%{dist}" == ".rhel5" +%attr(755, root, root) %{_datadir}/Ice-%{version}/convertssl.pyc +%attr(755, root, root) %{_datadir}/Ice-%{version}/upgradeicegrid.pyc +%attr(755, root, root) %{_datadir}/Ice-%{version}/upgradeicestorm.pyc +%attr(755, root, root) %{_datadir}/Ice-%{version}/convertssl.pyo +%attr(755, root, root) %{_datadir}/Ice-%{version}/upgradeicegrid.pyo +%attr(755, root, root) %{_datadir}/Ice-%{version}/upgradeicestorm.pyo +%endif %{_datadir}/Ice-%{version}/icegrid-slice.3.1.ice.gz %attr(755, root, root) /etc/init.d/icegridregistry %attr(755, root, root) /etc/init.d/icegridnode @@ -739,7 +764,7 @@ pklibdir="lib64" %files php %defattr(644, root, root, 755) -%if "%{dist}" == ".rhel4" +%if "%{dist}" == ".rhel4" || "%{dist}" == ".rhel5" %attr(755, root, root) %{_libdir}/php/modules /etc/php.d/ice.ini %endif |