Author: glen Date: Sun Apr 4 16:50:37 2010 GMT Module: packages Tag: HEAD ---- Log message: - resolve mess with icegrid docs and main pkg docs - add icegrid gui package - preable adapterized manually
---- Files affected: packages/ice: ice.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: packages/ice/ice.spec diff -u packages/ice/ice.spec:1.9 packages/ice/ice.spec:1.10 --- packages/ice/ice.spec:1.9 Sun Apr 4 18:30:26 2010 +++ packages/ice/ice.spec Sun Apr 4 18:50:32 2010 @@ -19,9 +19,10 @@ Summary: The Ice base runtime and services Name: ice Version: 3.4.0 -Release: 0.4 +Release: 0.5 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: 998b10627ade020cb00f5beb73efc0e0 # Extracted from http://zeroc.com/download/Ice/3.4/ice-3.4.0-1.src.rpm @@ -29,19 +30,18 @@ # Source1-md5: 869cc60645e7e2b4115584a5ab17d1e9 Source2: %{name}gridgui Source3: IceGridAdmin.desktop -URL: http://www.zeroc.com/ Patch0: %{name}-build.patch Patch1: dont-build-demo-test.patch Patch2: java-build.patch -%{?with_python:BuildRequires: rpm-pythonprov} -%{?with_ruby:BuildRequires: ruby >= 1:1.8.6} Patch3: jgoodies.patch +%{?with_ruby:BuildRequires: ruby >= 1:1.8.6} BuildRequires: db-cxx-devel %{?with_java:BuildRequires: db-java-devel} %{?with_java:BuildRequires: java-jgoodies-forms} %{?with_java:BuildRequires: java-jgoodies-looks} BuildRequires: mcpp-devel %{?with_php:BuildRequires: php-devel >= 3:5.0.0} +%{?with_python:BuildRequires: rpm-pythonprov} BuildRequires: rpmbuild(macros) >= 1.519 # drop these O/P if not needed Provides: Ice @@ -158,10 +158,13 @@ done cd - +%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 +%endif # update path to our install -sed -i -e 's,/usr/share/Ice-%{version},%{_datadir}/Ice,' cpp/bin/iceca cpp/src/ca/iceca icegridregistry.conf +sed -i -e 's,/usr/share/Ice-%{version},%{_datadir}/Ice,' cpp/src/ca/iceca Ice-rpmbuild-%{version}/icegridregistry.conf %build # Compile the main Ice runtime @@ -222,23 +225,20 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_docdir}/Ice-%{version},%{_datadir}/Ice} +install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_docdir}/Ice-%{version},%{_datadir}/Ice} %{__make} -C cpp install \ prefix=$RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_bindir} mv $RPM_BUILD_ROOT/bin/* $RPM_BUILD_ROOT%{_bindir} install -d $RPM_BUILD_ROOT%{_includedir} mv $RPM_BUILD_ROOT/include/* $RPM_BUILD_ROOT%{_includedir} -install -d $RPM_BUILD_ROOT%{_libdir} +# Move the ImportKey.class file +mv $RPM_BUILD_ROOT/lib/ImportKey.class $RPM_BUILD_ROOT%{_datadir}/Ice # There are a couple of files that end up installed in /lib, not %{_libdir}, # so we try this move too. mv $RPM_BUILD_ROOT/%{_lib}/* $RPM_BUILD_ROOT%{_libdir} -mv $RPM_BUILD_ROOT/lib/* $RPM_BUILD_ROOT%{_libdir} || true - -# Move the ImportKey.class file -mv $RPM_BUILD_ROOT/lib/ImportKey.class $RPM_BUILD_ROOT%{_datadir}/Ice +mv $RPM_BUILD_ROOT/lib/* $RPM_BUILD_ROOT%{_libdir} %if %{with java} %{__make} -C java install \ @@ -256,14 +256,11 @@ %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 -install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps -cp -a java/resources/icons/icegrid.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps -install -d $RPM_BUILD_ROOT%{_bindir} -install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir} -install -d $RPM_BUILD_ROOT%{_desktopdir} +cp -a java/resources/icons/icegrid.png $RPM_BUILD_ROOT%{_pixmapsdir} cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir} +install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir} mv $RPM_BUILD_ROOT/help/IceGridAdmin $RPM_BUILD_ROOT%{_docdir}/Ice-%{version} %endif @@ -274,12 +271,13 @@ GACINSTALL=yes \ GAC_ROOT=$RPM_BUILD_ROOT%{_libdir} \ +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/#%{_libdir}/#" $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/bin/$f.xml $RPM_BUILD_ROOT%{_libdir}/mono/gac/$f/%{version}.*/ + mv $RPM_BUILD_ROOT%{_bindir}/$f.xml $RPM_BUILD_ROOT%{_libdir}/mono/gac/$f/%{version}.*/ done %endif @@ -357,6 +355,7 @@ %files %defattr(644,root,root,755) +%doc %{_docdir}/Ice-%{version} %attr(755,root,root) %{_bindir}/dumpdb %attr(755,root,root) %{_bindir}/glacier2router %attr(755,root,root) %{_bindir}/icebox @@ -404,16 +403,21 @@ %attr(755,root,root) %ghost %{_libdir}/libSlice.so.%{soversion} %{_datadir}/Ice -# XXX gui +# Exclude the stuff that's in IceGrid +%exclude %{_docdir}/Ice-%{version}/IceGridAdmin +%exclude %{_datadir}/Ice/IceGridGUI.jar + %if %{with gui} +%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* %{_desktopdir}/IceGridAdmin.desktop -%{_iconsdir}/hicolor/*/apps/icegrid.png +%{_pixmapsdir}/icegrid.png %endif -# XXX doc -%doc %{_docdir}/Ice-%{version} - %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/slice2cpp @@ -565,6 +569,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.10 2010/04/04 16:50:32 glen +- resolve mess with icegrid docs and main pkg docs +- add icegrid gui package +- preable adapterized manually + Revision 1.9 2010/04/04 16:30:26 glen - fix subpackage bconds so that they can be disabled ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ice/ice.spec?r1=1.9&r2=1.10&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
