X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ice.spec;h=03e4885e2e337c3b328c86ab25f8458863db6e02;hb=61a9aea8ccc465a4e69e1ce6f47e1f2738dc6bdc;hp=e98c645d8bae10d17aab14376919769610246d01;hpb=68d99d1f6a6284d1ce5ed1377afe06dc49c55131;p=packages%2Fice.git diff --git a/ice.spec b/ice.spec index e98c645..03e4885 100644 --- a/ice.spec +++ b/ice.spec @@ -2,10 +2,11 @@ # - finish (pldize) -servers package # # Conditional build: -%bcond_without gui # IceGrid GUI +%bcond_without gui # IceGrid GUI %bcond_without dotnet # .NET bindings -%bcond_without java # Java bindings -%bcond_without php # PHP bindings +%bcond_with java # Java bindings (build requires X11 DISPLAY) +%bcond_with php # PHP bindings +%bcond_with default_php # build for default PHP %bcond_without python # Python bindings %bcond_without ruby # Ruby bindings @@ -13,34 +14,44 @@ %undefine with_gui %endif +%ifarch x32 +%undefine with_dotnet +%endif + +%if %{without default_php} +%if "%{?php_suffix}" == "" +%define php_suffix 55 +%endif +%endif +%define php_name php%{?php_suffix} + %{?with_java:%include /usr/lib/rpm/macros.java} Summary: The Ice base runtime and services +Summary(pl.UTF-8): Podstawowy pakiet uruchomieniowy oraz usługowy Ice Name: ice -Version: 3.4.2 -Release: 0.1 +Version: 3.6.3 +Release: 3 License: GPL v2 with exceptions (see ICE_LICENSE) Group: Applications -URL: http://www.zeroc.com/ -Source0: http://www.zeroc.com/download/Ice/3.4/Ice-%{version}.tar.gz -# Source0-md5: e97672eb4a63c6b8dd202d0773e19dc7 -# Extracted from http://zeroc.com/download/Ice/3.4/ice-3.4.0-1.src.rpm -Source1: Ice-rpmbuild-3.4.0.tar.gz -# Source1-md5: 869cc60645e7e2b4115584a5ab17d1e9 -# Man pages courtesy of Francisco Moya's Debian packages -Source2: Ice-3.3.0-man-pages.tbz2 -# Source2-md5: c6c17ee1be2e6b615af5b40edae88b75 +#Source0Download: https://github.com/zeroc-ice/ice/releases +Source0: https://github.com/zeroc-ice/ice/archive/v%{version}/%{name}-%{version}.tar.gz +# Source0-md5: 88bf025890cdd8d1193a7155dc539671 +# Extracted from http://zeroc.com/download/Ice/3.6/rpm/el7/SRPMS/ice-3.6.3-1.el7.src.rpm +Source1: Ice-rpmbuild-%{version}.tar.gz +# Source1-md5: 38536c26981a5cdc9b57723bc28aea44 Source3: %{name}gridgui Source4: IceGridAdmin.desktop -Patch0: %{name}-build.patch -Patch1: dont-build-demo-test.patch -Patch2: java-build.patch -Patch3: jgoodies.patch +Patch0: no-arch-opts.patch +Patch1: csharp-build.patch +Patch2: %{name}-db.patch +Patch3: %{name}-php7.patch +URL: http://www.zeroc.com/ BuildRequires: bzip2-devel BuildRequires: db-cxx-devel BuildRequires: expat-devel BuildRequires: mcpp-devel BuildRequires: openssl-devel -BuildRequires: rpmbuild(macros) >= 1.533 +BuildRequires: rpmbuild(macros) >= 1.665 %if %{with gui} BuildRequires: ImageMagick BuildRequires: ImageMagick-coder-png @@ -49,7 +60,7 @@ BuildRequires: ImageMagick-coder-png BuildRequires: mono-csharp %endif %if %{with java} -BuildRequires: ant-nodeps +BuildRequires: ant BuildRequires: db-java-devel BuildRequires: java-jgoodies-common BuildRequires: java-jgoodies-forms @@ -59,22 +70,23 @@ BuildRequires: jpackage-utils BuildRequires: rpm-javaprov %endif %if %{with php} -BuildRequires: php-devel >= 3:5.0.0 +BuildRequires: %{php_name}-devel >= 3:5.0.0 %endif %if %{with python} BuildRequires: python-devel BuildRequires: rpm-pythonprov %endif %if %{with ruby} +BuildRequires: rpm-rubyprov BuildRequires: ruby >= 1:1.8.6 BuildRequires: ruby-devel %endif -# Ice doesn't officially support ppc64 at all; sparc64 doesnt have mono +# Ice doesn't officially support ppc64 at all; sparc64 doesn't have mono ExcludeArch: ppc64 sparc64 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # Some file suffixes we need to grab the right stuff for the file lists -%define soversion 34 +%define soversion 36 %description Ice is a modern alternative to object middleware such as CORBA or @@ -86,26 +98,45 @@ protocol, asynchronous method invocation and dispatch, dynamic transport plug-ins, TCP/IP and UDP/IP support, SSL-based security, a firewall solution, and much more. +%description -l pl.UTF-8 +Ice to współczesna alternatywa dla pośredniej warstwy obiektowej, +takiej jak CORBA lub COM/DCOM/COM+. Jest łatwy do nauczenia, a daje +potężną infrastrukturę sieciową dla wymagających aplikacji +technicznych. Ma zorientowany obiektowo język specyfikacji, łatwe do +nauki odwzorowania w C++, C#, Javie, Pythonie, Rubym, PHP i Visual +Basicu, bardzo wydajny protokół, asynchroniczne wywoływanie i +ekspediowanie metod, dynamiczne wtyczki transportowe, obsługę TCP/IP +oraz UDP/IP, szyfrowanie oparte na SSL, wbudowany firewall. + %package devel Summary: Tools for developing Ice applications in C++ +Summary(pl.UTF-8): Narzędzia do tworzenia aplikacji Ice w C++ Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel Tools for developing Ice applications in C++. +%description devel -l pl.UTF-8 +Narzędzia do tworzenia aplikacji Ice w C++. + %package servers Summary: Ice services to run through /etc/rc.d/init.d +Summary(pl.UTF-8): Usługi Ice do uruchamiania z poziomu /etc/rc.d/init.d Group: Development/Tools Requires(post,preun): /sbin/chkconfig Requires: %{name} = %{version}-%{release} Requires: rc-scripts %description servers -Ice services to run through /etc/rc.d/init.d +Ice services to run through /etc/rc.d/init.d. + +%description servers -l pl.UTF-8 +Usługi Ice do uruchamiania z poziomu /etc/rc.d/init.d. %package -n icegrid-gui Summary: IceGrid Admin Tool +Summary(pl.UTF-8): Narzędzie administracyjne IceGrid Group: Development/Tools Requires: %{name} = %{version}-%{release} Requires: java-%{name} = %{version}-%{release} @@ -114,38 +145,53 @@ Requires: java-jgoodies-looks Requires: jpackage-utils %description -n icegrid-gui -Graphical administration tool for IceGrid +Graphical administration tool for IceGrid. + +%description -n icegrid-gui -l pl.UTF-8 +Graficzne narzędzie administracyjne do IceGrida. %package -n java-%{name} Summary: The Ice runtime for Java +Summary(pl.UTF-8): Pakiet uruchomieniowy Ice dla Javy Group: Libraries/Java Requires: %{name} = %{version}-%{release} Requires: db-java Requires: jpackage-utils %description -n java-%{name} -The Ice runtime for Java +The Ice runtime for Java. + +%description -n java-%{name} -l pl.UTF-8 +Pakiet uruchomieniowy Ice dla Javy. %package -n csharp-%{name} Summary: The Ice runtime for C# +Summary(pl.UTF-8): Pakiet uruchomieniowy Ice dla C# Group: Libraries Requires: %{name} = %{version}-%{release} Requires: mono >= 1.2.2 %description -n csharp-%{name} -The Ice runtime for C# +The Ice runtime for C#. + +%description -n csharp-%{name} -l pl.UTF-8 +Pakiet uruchomieniowy Ice dla C#. %package -n ruby-%{name} Summary: The Ice runtime for Ruby applications +Summary(pl.UTF-8): Pakiet uruchomieniowy Ice dla aplikacji w języku Ruby Group: Development/Languages Requires: %{name} = %{version}-%{release} -%{?ruby_mod_ver_requires_eq} %description -n ruby-%{name} The Ice runtime for Ruby applications. +%description -n ruby-%{name} -l pl.UTF-8 +Pakiet uruchomieniowy Ice dla aplikacji w języku Ruby. + %package -n python-%{name} Summary: The Ice runtime for Python applications +Summary(pl.UTF-8): Pakiet uruchomieniowy Ice dla aplikacji w Pythonie Group: Development/Languages/Python Requires: %{name} = %{version}-%{release} Requires: python >= 1:2.3.4 @@ -153,155 +199,158 @@ Requires: python >= 1:2.3.4 %description -n python-%{name} The Ice runtime for Python applications. -%package -n php-%{name} +%description -n python-%{name} -l pl.UTF-8 +Pakiet uruchomieniowy Ice dla aplikacji w Pythonie. + +%package -n %{php_name}-%{name} Summary: The Ice runtime for PHP applications +Summary(pl.UTF-8): Pakiet uruchomieniowy Ice dla aplikacji w PHP Group: Development/Languages/PHP Requires: %{name} = %{version}-%{release} %{?requires_php_extension} -%description -n php-%{name} +%description -n %{php_name}-%{name} The Ice runtime for PHP applications. +%description -n %{php_name}-%{name} -l pl.UTF-8 +Pakiet uruchomieniowy Ice dla aplikacji w PHP. + %prep -%setup -q -n Ice-%{version} -a1 -a2 -%patch0 -p0 +%setup -q -a1 +%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 -# no longer included in 3.4 -rm -f *man-pages/slice2docbook.1 - -# Fix the encoding and line-endings of all the IceGridAdmin documentation files -cd java/resources/IceGridAdmin -%undos -f js,css - -for f in helpman_topicinit.js icegridadmin_navigation.js IceGridAdmin_popup_html.js zoom_pageinfo.js; do - iconv -f ISO88591 -t UTF8 $f -o $f.tmp - mv $f.tmp $f -done -cd - - -%{__sed} -i -e '1s,/usr/bin/env python,%{__python},' cpp/src/ca/iceca - %if %{with java} # we nuke it only when we build new class later, as ice build system expects the file being around -rm cpp/src/ca/ImportKey.class +%{__rm} cpp/src/ca/ImportKey.class %endif # update path to our install -sed -i -e 's,/usr/share/Ice-%{version},%{_datadir}/Ice,' cpp/src/ca/iceca Ice-rpmbuild-*/icegridregistry.conf +%{__sed} -i -e 's,/usr/share/Ice-[0-9.]\+,%{_datadir}/Ice,' Ice-rpmbuild-*/icegridregistry.conf +%{__sed} -i -e 's,ln -s Ice-\$(VERSION)/slice,ln -s Ice/slice,' config/Make.common.rules +%{__sed} -i -e 's,ln -s \.\./Ice-\$(VERSION)/slice,ln -s ../Ice/slice,' config/Make.common.rules -# force our CC/CXX as build system compares for exactly "c++" to setup other rules -sed -i -e 's,c++,%{__cxx},g' cpp/config/Make.rules.Linux +%{__sed} -i -e '1s,/usr/bin/env python,%{__python},' cpp/config/upgradeicegrid36.py %build -# Compile the main Ice runtime -# TODO: CC/CXX passing as make param breaks build system - %if %{with java} # Rebuild the Java ImportKey class - need it early for main cpp build javac cpp/src/ca/ImportKey.java %endif -%{__make} -j1 -C cpp \ +%{__make} -C cpp \ CC="%{__cc}" \ CXX="%{__cxx}" \ CFLAGS="%{rpmcflags} -fPIC" \ - CXXFLAGS="%{rpmcxxflags} -fPIC" \ - embedded_runpath_prefix="" + CXXFLAGS="%{rpmcxxflags} -fPIC -pthread" \ + GCC_COMPILER=yes \ +%ifarch x32 + lp64suffix=x32 \ +%endif + embedded_runpath=no %if %{with gui} # Create the IceGrid icon convert java/resources/icons/icegrid.ico temp.png -mv temp-8.png java/resources/icons/icegrid.png -rm temp*.png +%{__mv} temp-8.png java/resources/icons/icegrid.png +%{__rm} temp*.png %endif %if %{with java} - # Set the CLASSPATH correctly for the Java compile export CLASSPATH=$(build-classpath db jgoodies-forms jgoodies-looks) -%{__make} -j1 -C java \ +%{__make} -C java \ CC="%{__cc}" \ CXX="%{__cxx}" \ CFLAGS="%{rpmcflags} -fPIC" \ - CXXFLAGS="%{rpmcxxflags} -fPIC" \ - embedded_runpath_prefix="" + CXXFLAGS="%{rpmcxxflags} -fPIC -pthread" \ +%ifarch x32 + lp64suffix=x32 \ +%endif + embedded_runpath=no %endif %if %{with dotnet} -%{__make} -j1 -C cs \ - CC="%{__cc}" \ - CXX="%{__cxx}" \ - CFLAGS="%{rpmcflags} -fPIC" \ - CXXFLAGS="%{rpmcxxflags} -fPIC" \ - embedded_runpath_prefix="" +%{__make} -C csharp \ + MCS=dmcs \ +%ifarch x32 + lp64suffix=x32 \ +%endif + embedded_runpath=no %endif %if %{with python} -%{__make} -j1 -C py \ +%{__make} -C python \ CC="%{__cc}" \ CXX="%{__cxx}" \ CFLAGS="%{rpmcflags} -fPIC" \ - CXXFLAGS="%{rpmcxxflags} -fPIC" \ - embedded_runpath_prefix="" + CXXFLAGS="%{rpmcxxflags} -fPIC -pthread" \ +%ifarch x32 + lp64suffix=x32 \ +%endif + embedded_runpath=no %endif %if %{with ruby} -%{__make} -j1 -C rb \ +%{__make} -C ruby \ CC="%{__cc}" \ CXX="%{__cxx}" \ CFLAGS="%{rpmcflags} -fPIC" \ - CXXFLAGS="%{rpmcxxflags} -fPIC" \ - embedded_runpath_prefix="" + CXXFLAGS="%{rpmcxxflags} -fPIC -pthread" \ +%ifarch x32 + lp64suffix=x32 \ +%endif + embedded_runpath=no %endif %if %{with php} -%{__make} -j1 -C php \ - CC="%{__cc}" \ - CXX="%{__cxx}" \ +%{__make} -C php \ PHP_HOME=%{_prefix} \ CFLAGS="%{rpmcflags} -fPIC" \ - CXXFLAGS="%{rpmcxxflags} -fPIC" \ - embedded_runpath_prefix="" + CXXFLAGS="%{rpmcxxflags} -fPIC -pthread" \ +%ifarch x32 + lp64suffix=x32 \ +%endif + embedded_runpath=no %endif %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir},%{_docdir}/Ice-%{version},%{_datadir}/Ice} %{__make} -C cpp install \ - prefix=$RPM_BUILD_ROOT - -# Move the ImportKey.class file -mv $RPM_BUILD_ROOT/lib/ImportKey.class $RPM_BUILD_ROOT%{_datadir}/Ice - -mv $RPM_BUILD_ROOT/bin/* $RPM_BUILD_ROOT%{_bindir} -mv $RPM_BUILD_ROOT/include/* $RPM_BUILD_ROOT%{_includedir} -mv $RPM_BUILD_ROOT/%{_lib}/* $RPM_BUILD_ROOT%{_libdir} - -mv $RPM_BUILD_ROOT/config/* $RPM_BUILD_ROOT%{_datadir}/Ice - -# Copy the man pages into the correct directory -install -d $RPM_BUILD_ROOT%{_mandir}/man1 -cp -a *man-pages/*.1 $RPM_BUILD_ROOT%{_mandir}/man1 +%ifarch x32 + lp64suffix=x32 \ +%endif + SLICE_DIR_SYMLINK=yes \ + DESTDIR=$RPM_BUILD_ROOT \ + prefix=%{_prefix} \ + install_configdir=%{_datadir}/Ice \ + install_docdir=%{_datadir}/Ice \ + install_slicedir=%{_datadir}/Ice/slice %if %{with java} %{__make} -C java install \ - prefix=$RPM_BUILD_ROOT +%ifarch x32 + lp64suffix=x32 \ +%endif + DESTDIR=$RPM_BUILD_ROOT \ + prefix=%{_prefix} \ + install_docdir=%{_datadir}/Ice \ + install_slicedir=%{_datadir}/Ice/slice # Move Java stuff where it should be install -d $RPM_BUILD_ROOT%{_javadir} -mv $RPM_BUILD_ROOT/lib/Ice.jar $RPM_BUILD_ROOT%{_javadir}/Ice-%{version}.jar +%{__mv} $RPM_BUILD_ROOT%{_prefix}/lib/Ice.jar $RPM_BUILD_ROOT%{_javadir}/Ice-%{version}.jar ln -s Ice-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/Ice.jar -mv $RPM_BUILD_ROOT/lib/Freeze.jar $RPM_BUILD_ROOT%{_javadir}/Freeze-%{version}.jar +%{__mv} $RPM_BUILD_ROOT%{_prefix}/lib/Freeze.jar $RPM_BUILD_ROOT%{_javadir}/Freeze-%{version}.jar ln -s Freeze-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/Freeze.jar # Register ant target install -d $RPM_BUILD_ROOT{%{_sysconfdir}/ant.d,%{_javadir}/ant} -mv $RPM_BUILD_ROOT/lib/ant-ice.jar $RPM_BUILD_ROOT%{_javadir}/ant/ant-ice-%{version}.jar +%{__mv} $RPM_BUILD_ROOT%{_prefix}/lib/ant-ice.jar $RPM_BUILD_ROOT%{_javadir}/ant/ant-ice-%{version}.jar ln -s ant-ice-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant/ant-ice.jar echo 'ice ant/ant-ice' > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/ice %endif @@ -309,79 +358,85 @@ echo 'ice ant/ant-ice' > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/ice %if %{with gui} # Install the IceGrid GUI install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} -mv $RPM_BUILD_ROOT/lib/IceGridGUI.jar $RPM_BUILD_ROOT%{_datadir}/Ice +%{__mv} $RPM_BUILD_ROOT%{_prefix}/lib/IceGridGUI.jar $RPM_BUILD_ROOT%{_datadir}/Ice cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir} install -p %{SOURCE3} $RPM_BUILD_ROOT%{_bindir} cp -a java/resources/icons/icegrid.png $RPM_BUILD_ROOT%{_pixmapsdir} -mv $RPM_BUILD_ROOT/help/IceGridAdmin $RPM_BUILD_ROOT%{_docdir}/Ice-%{version} +%{__mv} $RPM_BUILD_ROOT%{_prefix}/help/IceGridAdmin $RPM_BUILD_ROOT%{_docdir}/Ice-%{version} %endif %if %{with dotnet} install -d $RPM_BUILD_ROOT%{_pkgconfigdir} -%{__make} -C cs install \ - prefix=$RPM_BUILD_ROOT \ +%{__make} -C csharp install \ +%ifarch x32 + lp64suffix=x32 \ +%endif GACINSTALL=yes \ - GAC_ROOT=$RPM_BUILD_ROOT%{_prefix}/lib \ - -mv $RPM_BUILD_ROOT/bin/* $RPM_BUILD_ROOT%{_bindir} -# .NET spec files (for csharp-devel) -- convert the paths -for f in IceGrid Glacier2 IceBox Ice IceStorm IcePatch2; do - sed -i -e "s#/lib/#%{_prefix}/lib/#" $RPM_BUILD_ROOT/lib/pkgconfig/$f.pc - sed -i -e "s#mono_root}/usr#mono_root}#" $RPM_BUILD_ROOT/lib/pkgconfig/$f.pc - mv $RPM_BUILD_ROOT/lib/pkgconfig/$f.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/$f.pc - mv $RPM_BUILD_ROOT%{_bindir}/$f.xml $RPM_BUILD_ROOT%{_prefix}/lib/mono/gac/$f/%{version}.*/ -done + DESTDIR=$RPM_BUILD_ROOT \ + prefix=%{_prefix} \ + install_pkgconfigdir=%{_pkgconfigdir} \ + install_docdir=%{_datadir}/Ice \ + install_slicedir=%{_datadir}/Ice/slice %endif %if %{with python} -%{__make} -C py install \ - prefix=$RPM_BUILD_ROOT -%{__sed} -i -e '1s,/usr/bin/env python,%{__python},' $RPM_BUILD_ROOT/python/Ice.py -install -d $RPM_BUILD_ROOT%{py_sitedir}/Ice -mv $RPM_BUILD_ROOT/python/IcePy.so.*.*.* $RPM_BUILD_ROOT%{py_sitedir}/Ice/IcePy.so -rm -f $RPM_BUILD_ROOT/python/IcePy.so* -mv $RPM_BUILD_ROOT/python/* $RPM_BUILD_ROOT%{py_sitedir}/Ice -cp -a Ice-rpmbuild-*/ice.pth $RPM_BUILD_ROOT%{py_sitedir} +%{__make} -C python install \ +%ifarch x32 + lp64suffix=x32 \ +%endif + DESTDIR=$RPM_BUILD_ROOT \ + prefix=%{_prefix} \ + install_pythondir=%{py_sitedir} \ + install_docdir=%{_datadir}/Ice \ + install_slicedir=%{_datadir}/Ice/slice + +%{__mv} $RPM_BUILD_ROOT%{py_sitedir}/IcePy.so{.%{version},} +%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/IcePy.so.* + %py_ocomp $RPM_BUILD_ROOT%{py_sitedir} %py_comp $RPM_BUILD_ROOT%{py_sitedir} %py_postclean %endif %if %{with ruby} -%{__make} -C rb install \ - prefix=$RPM_BUILD_ROOT -%{__sed} -i -e '1s,/usr/bin/env ruby,%{__ruby},' $RPM_BUILD_ROOT/ruby/*.rb -install -d $RPM_BUILD_ROOT%{ruby_sitearchdir} -mv $RPM_BUILD_ROOT/ruby/IceRuby.so.*.*.* $RPM_BUILD_ROOT%{ruby_sitearchdir}/IceRuby.so -rm -f $RPM_BUILD_ROOT/ruby/IceRuby.so* -mv $RPM_BUILD_ROOT/ruby/* $RPM_BUILD_ROOT%{ruby_sitearchdir} +%{__make} -C ruby install \ +%ifarch x32 + lp64suffix=x32 \ +%endif + DESTDIR=$RPM_BUILD_ROOT \ + prefix=%{_prefix} \ + install_rubydir=%{ruby_vendorlibdir} \ + install_libdir=%{ruby_vendorarchdir} \ + install_docdir=%{_datadir}/Ice \ + install_slicedir=%{_datadir}/Ice/slice + +%{__mv} $RPM_BUILD_ROOT%{ruby_vendorarchdir}/IceRuby.so{.%{version},} +%{__rm} $RPM_BUILD_ROOT%{ruby_vendorarchdir}/IceRuby.so.* %endif %if %{with php} %{__make} -C php install \ - prefix=$RPM_BUILD_ROOT -# Put the PHP stuff into the right place -install -d $RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir},%{php_data_dir}} -cp -a Ice-rpmbuild-*/ice.ini $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d -mv $RPM_BUILD_ROOT/php/IcePHP.so $RPM_BUILD_ROOT%{php_extensiondir} -mv $RPM_BUILD_ROOT/php/* $RPM_BUILD_ROOT%{php_data_dir} +%ifarch x32 + lp64suffix=x32 \ %endif + DESTDIR=$RPM_BUILD_ROOT \ + prefix=%{_prefix} \ + install_docdir=%{_datadir}/Ice \ + install_slicedir=%{_datadir}/Ice/slice -# move as last, bindings reinstall these if missing -mv $RPM_BUILD_ROOT/slice $RPM_BUILD_ROOT%{_datadir}/Ice +install -d $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d +cp -a Ice-rpmbuild-*/ice.ini $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d +%endif -# Move the license files into the documentation directory -mv $RPM_BUILD_ROOT/ICE_LICENSE $RPM_BUILD_ROOT%{_docdir}/Ice-%{version}/ICE_LICENSE -mv $RPM_BUILD_ROOT/LICENSE $RPM_BUILD_ROOT%{_docdir}/Ice-%{version}/LICENSE -# Copy in the other files too -cp CHANGES RELEASE_NOTES $RPM_BUILD_ROOT%{_docdir}/Ice-%{version} +# packaged as %doc +%{__rm} $RPM_BUILD_ROOT%{_datadir}/Ice/{ICE_LICENSE,LICENSE} # Install the servers install -d $RPM_BUILD_ROOT%{_sysconfdir} cp -a Ice-rpmbuild-*/*.conf $RPM_BUILD_ROOT%{_sysconfdir} -install -d $RPM_BUILD_ROOT%{_initrddir} +install -d $RPM_BUILD_ROOT/etc/rc.d/init.d for i in icegridregistry icegridnode glacier2router; do - cp -a Ice-rpmbuild-*/$i.redhat $RPM_BUILD_ROOT%{_initrddir}/$i + cp -a Ice-rpmbuild-*/$i.redhat $RPM_BUILD_ROOT/etc/rc.d/init.d/$i done install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/icegrid @@ -391,29 +446,30 @@ rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%post -n php-%{name} +%post -n %{php_name}-%{name} %php_webserver_restart -%postun -n php-%{name} +%postun -n %{php_name}-%{name} if [ "$1" = 0 ]; then %php_webserver_restart fi %files %defattr(644,root,root,755) -%doc %{_docdir}/Ice-%{version} +%doc ICE_LICENSE CHANGELOG*.md README.md %attr(755,root,root) %{_bindir}/dumpdb %attr(755,root,root) %{_bindir}/glacier2router %attr(755,root,root) %{_bindir}/icebox %attr(755,root,root) %{_bindir}/iceboxadmin -%attr(755,root,root) %{_bindir}/iceca %attr(755,root,root) %{_bindir}/icegridadmin +%attr(755,root,root) %{_bindir}/icegriddb %attr(755,root,root) %{_bindir}/icegridnode %attr(755,root,root) %{_bindir}/icegridregistry %attr(755,root,root) %{_bindir}/icepatch2calc %attr(755,root,root) %{_bindir}/icepatch2client %attr(755,root,root) %{_bindir}/icepatch2server %attr(755,root,root) %{_bindir}/icestormadmin +%attr(755,root,root) %{_bindir}/icestormdb %attr(755,root,root) %{_bindir}/icestormmigrate %attr(755,root,root) %{_bindir}/slice2html %attr(755,root,root) %{_bindir}/transformdb @@ -422,36 +478,39 @@ fi %{_mandir}/man1/icebox.1* %{_mandir}/man1/iceboxadmin.1* %{_mandir}/man1/icegridadmin.1* +%{_mandir}/man1/icegriddb.1* %{_mandir}/man1/icegridnode.1* %{_mandir}/man1/icegridregistry.1* %{_mandir}/man1/icepatch2calc.1* %{_mandir}/man1/icepatch2client.1* %{_mandir}/man1/icepatch2server.1* %{_mandir}/man1/icestormadmin.1* +%{_mandir}/man1/icestormdb.1* +%{_mandir}/man1/icestormmigrate.1* %{_mandir}/man1/slice2html.1* %{_mandir}/man1/transformdb.1* %attr(755,root,root) %{_libdir}/libFreeze.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libFreeze.so.%{soversion} %attr(755,root,root) %{_libdir}/libGlacier2.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libGlacier2.so.%{soversion} +%attr(755,root,root) %{_libdir}/libGlacier2CryptPermissionsVerifier.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libGlacier2CryptPermissionsVerifier.so.%{soversion} %attr(755,root,root) %{_libdir}/libIce.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libIce.so.%{soversion} %attr(755,root,root) %{_libdir}/libIceBox.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libIceBox.so.%{soversion} -%attr(755,root,root) %{_libdir}/libIceDB.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libIceDB.so.%{soversion} +%attr(755,root,root) %{_libdir}/libIceDiscovery.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libIceDiscovery.so.%{soversion} %attr(755,root,root) %{_libdir}/libIceGrid.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libIceGrid.so.%{soversion} -%attr(755,root,root) %{_libdir}/libIceGridFreezeDB.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libIceGridFreezeDB.so.%{soversion} +%attr(755,root,root) %{_libdir}/libIceLocatorDiscovery.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libIceLocatorDiscovery.so.%{soversion} %attr(755,root,root) %{_libdir}/libIcePatch2.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libIcePatch2.so.%{soversion} %attr(755,root,root) %{_libdir}/libIceSSL.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libIceSSL.so.%{soversion} %attr(755,root,root) %{_libdir}/libIceStorm.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libIceStorm.so.%{soversion} -%attr(755,root,root) %{_libdir}/libIceStormFreezeDB.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libIceStormFreezeDB.so.%{soversion} %attr(755,root,root) %{_libdir}/libIceStormService.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libIceStormService.so.%{soversion} %attr(755,root,root) %{_libdir}/libIceUtil.so.*.*.* @@ -460,16 +519,16 @@ fi %attr(755,root,root) %ghost %{_libdir}/libIceXML.so.%{soversion} %attr(755,root,root) %{_libdir}/libSlice.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libSlice.so.%{soversion} -%{_datadir}/Ice +%dir %{_datadir}/Ice +%{_datadir}/Ice/slice +%{_datadir}/Ice/icegrid-slice.*.ice.gz +%{_datadir}/Ice/templates.xml +%attr(755,root,root) %{_datadir}/Ice/upgradeicegrid36.py +%{_datadir}/slice %if %{with gui} -# Exclude the stuff that's in IceGrid -%exclude %{_docdir}/Ice-%{version}/IceGridAdmin -%exclude %{_datadir}/Ice/IceGridGUI.jar - %files -n icegrid-gui %defattr(644,root,root,755) -%doc %{_docdir}/Ice-%{version}/IceGridAdmin %attr(755,root,root) %{_bindir}/icegridgui %{_datadir}/Ice/IceGridGUI.jar %{_mandir}/man1/icegridgui.1* @@ -482,17 +541,17 @@ fi %attr(755,root,root) %{_bindir}/slice2cpp %attr(755,root,root) %{_bindir}/slice2freeze %attr(755,root,root) %{_libdir}/libFreeze.so +%attr(755,root,root) %{_libdir}/libGlacier2CryptPermissionsVerifier.so %attr(755,root,root) %{_libdir}/libGlacier2.so -%attr(755,root,root) %{_libdir}/libIce.so %attr(755,root,root) %{_libdir}/libIceBox.so -%attr(755,root,root) %{_libdir}/libIceDB.so +%attr(755,root,root) %{_libdir}/libIceDiscovery.so %attr(755,root,root) %{_libdir}/libIceGrid.so -%attr(755,root,root) %{_libdir}/libIceGridFreezeDB.so +%attr(755,root,root) %{_libdir}/libIceLocatorDiscovery.so %attr(755,root,root) %{_libdir}/libIcePatch2.so +%attr(755,root,root) %{_libdir}/libIce.so %attr(755,root,root) %{_libdir}/libIceSSL.so -%attr(755,root,root) %{_libdir}/libIceStorm.so -%attr(755,root,root) %{_libdir}/libIceStormFreezeDB.so %attr(755,root,root) %{_libdir}/libIceStormService.so +%attr(755,root,root) %{_libdir}/libIceStorm.so %attr(755,root,root) %{_libdir}/libIceUtil.so %attr(755,root,root) %{_libdir}/libIceXML.so %attr(755,root,root) %{_libdir}/libSlice.so @@ -505,7 +564,6 @@ fi %{_includedir}/IceSSL %{_includedir}/IceStorm %{_includedir}/IceUtil -%{_includedir}/IceXML %{_includedir}/Slice %{_mandir}/man1/slice2cpp.1* %{_mandir}/man1/slice2freeze.1* @@ -519,8 +577,11 @@ fi %{_pkgconfigdir}/Glacier2.pc %{_pkgconfigdir}/Ice.pc %{_pkgconfigdir}/IceBox.pc +%{_pkgconfigdir}/IceDiscovery.pc %{_pkgconfigdir}/IceGrid.pc +%{_pkgconfigdir}/IceLocatorDiscovery.pc %{_pkgconfigdir}/IcePatch2.pc +%{_pkgconfigdir}/IceSSL.pc %{_pkgconfigdir}/IceStorm.pc %endif @@ -533,14 +594,15 @@ fi %attr(755,root,root) %{_bindir}/slice2java %{_mandir}/man1/slice2freezej.1* %{_mandir}/man1/slice2java.1* +# -js +%attr(755,root,root) %{_bindir}/slice2js +%{_mandir}/man1/slice2js.1* # -php %attr(755,root,root) %{_bindir}/slice2php +%{_mandir}/man1/slice2php.1* # -python %attr(755,root,root) %{_bindir}/slice2py %{_mandir}/man1/slice2py.1* -# -ruby -%attr(755,root,root) %{_bindir}/slice2rb -%{_mandir}/man1/slice2rb.1* %files servers %defattr(644,root,root,755) @@ -555,63 +617,74 @@ fi %files -n csharp-%{name} %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/iceboxnet.exe -%{_mandir}/man1/iceboxnet.exe.1* +%{_mandir}/man1/iceboxnet.1* %{_prefix}/lib/mono/Glacier2 %{_prefix}/lib/mono/Ice %{_prefix}/lib/mono/IceBox +%{_prefix}/lib/mono/IceDiscovery %{_prefix}/lib/mono/IceGrid +%{_prefix}/lib/mono/IceLocatorDiscovery %{_prefix}/lib/mono/IcePatch2 +%{_prefix}/lib/mono/IceSSL %{_prefix}/lib/mono/IceStorm %{_prefix}/lib/mono/gac/Glacier2 %{_prefix}/lib/mono/gac/Ice %{_prefix}/lib/mono/gac/IceBox +%{_prefix}/lib/mono/gac/IceDiscovery %{_prefix}/lib/mono/gac/IceGrid +%{_prefix}/lib/mono/gac/IceLocatorDiscovery %{_prefix}/lib/mono/gac/IcePatch2 +%{_prefix}/lib/mono/gac/IceSSL %{_prefix}/lib/mono/gac/IceStorm -%{_prefix}/lib/mono/gac/policy.3.4.Glacier2 -%{_prefix}/lib/mono/gac/policy.3.4.Ice -%{_prefix}/lib/mono/gac/policy.3.4.IceBox -%{_prefix}/lib/mono/gac/policy.3.4.IceGrid -%{_prefix}/lib/mono/gac/policy.3.4.IcePatch2 -%{_prefix}/lib/mono/gac/policy.3.4.IceStorm +%{_prefix}/lib/mono/gac/policy.3.6.Glacier2 +%{_prefix}/lib/mono/gac/policy.3.6.Ice +%{_prefix}/lib/mono/gac/policy.3.6.IceBox +%{_prefix}/lib/mono/gac/policy.3.6.IceDiscovery +%{_prefix}/lib/mono/gac/policy.3.6.IceGrid +%{_prefix}/lib/mono/gac/policy.3.6.IceLocatorDiscovery +%{_prefix}/lib/mono/gac/policy.3.6.IcePatch2 +%{_prefix}/lib/mono/gac/policy.3.6.IceSSL +%{_prefix}/lib/mono/gac/policy.3.6.IceStorm %endif %if %{with python} %files -n python-%{name} %defattr(644,root,root,755) -%{py_sitedir}/ice.pth -%dir %{py_sitedir}/Ice -%dir %{py_sitedir}/Ice/IceBox -%dir %{py_sitedir}/Ice/IceGrid -%dir %{py_sitedir}/Ice/IcePatch2 -%dir %{py_sitedir}/Ice/IceStorm -%{py_sitedir}/Ice/*.py[co] -%{py_sitedir}/Ice/IceBox/*.py[co] -%{py_sitedir}/Ice/IceGrid/*.py[co] -%{py_sitedir}/Ice/IcePatch2/*.py[co] -%{py_sitedir}/Ice/IceStorm/*.py[co] -%attr(755,root,root) %{py_sitedir}/Ice/IcePy.so +%attr(755,root,root) %{py_sitedir}/IcePy.so +%{py_sitedir}/IceBox +%{py_sitedir}/IceGrid +%{py_sitedir}/IceMX +%{py_sitedir}/IcePatch2 +%{py_sitedir}/IceStorm +%{py_sitedir}/Glacier2*.py[co] +%{py_sitedir}/Ice.py[co] +%{py_sitedir}/IceBox*.py[co] +%{py_sitedir}/IceGrid*.py[co] +%{py_sitedir}/IcePatch2*.py[co] +%{py_sitedir}/IceStorm*.py[co] +%{py_sitedir}/Ice_*.py[co] %endif %if %{with ruby} %files -n ruby-%{name} %defattr(644,root,root,755) -%{ruby_sitearchdir}/Glacier2.rb -%{ruby_sitearchdir}/Glacier2 -%{ruby_sitearchdir}/Ice.rb -%{ruby_sitearchdir}/Ice -%{ruby_sitearchdir}/IceBox.rb -%{ruby_sitearchdir}/IceBox -%{ruby_sitearchdir}/IceGrid.rb -%{ruby_sitearchdir}/IceGrid -%{ruby_sitearchdir}/IcePatch2.rb -%{ruby_sitearchdir}/IcePatch2 -%{ruby_sitearchdir}/IceStorm.rb -%dir %{ruby_sitearchdir}/IceStorm -%{ruby_sitearchdir}/IceStorm/IceStorm.rb -%attr(755,root,root) %{ruby_sitearchdir}/IceRuby.so +%{ruby_vendorlibdir}/Glacier2.rb +%{ruby_vendorlibdir}/Glacier2 +%{ruby_vendorlibdir}/Ice.rb +%{ruby_vendorlibdir}/Ice +%{ruby_vendorlibdir}/IceBox.rb +%{ruby_vendorlibdir}/IceBox +%{ruby_vendorlibdir}/IceGrid.rb +%{ruby_vendorlibdir}/IceGrid +%{ruby_vendorlibdir}/IcePatch2.rb +%{ruby_vendorlibdir}/IcePatch2 +%{ruby_vendorlibdir}/IceStorm.rb +%dir %{ruby_vendorlibdir}/IceStorm +%{ruby_vendorlibdir}/IceStorm/IceStorm.rb +%{ruby_vendorlibdir}/IceStorm/Metrics.rb +%attr(755,root,root) %{ruby_vendorarchdir}/IceRuby.so %endif %if %{with java} @@ -624,7 +697,7 @@ fi %endif %if %{with php} -%files -n php-%{name} +%files -n %{php_name}-%{name} %defattr(644,root,root,755) %config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/ice.ini %attr(755,root,root) %{php_extensiondir}/IcePHP.so