Author: glen Date: Sun Apr 4 17:44:31 2010 GMT Module: packages Tag: HEAD ---- Log message: - add man pages - do some magic to be able to use our CXX (as it's value is compared in makefile)
---- Files affected: packages/ice: ice.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: packages/ice/ice.spec diff -u packages/ice/ice.spec:1.11 packages/ice/ice.spec:1.12 --- packages/ice/ice.spec:1.11 Sun Apr 4 19:07:44 2010 +++ packages/ice/ice.spec Sun Apr 4 19:44:25 2010 @@ -1,7 +1,5 @@ # $Revision$, $Date$ # TODO -# - use our CC/CXX -# - man pages tarball # - finish (pldize) -servers package # # Conditional build: @@ -28,13 +26,17 @@ # Extracted from http://zeroc.com/download/Ice/3.4/ice-3.4.0-1.src.rpm Source1: Ice-rpmbuild-%{version}.tar.gz # Source1-md5: 869cc60645e7e2b4115584a5ab17d1e9 -Source2: %{name}gridgui -Source3: IceGridAdmin.desktop +# Man pages courtesy of Francisco Moya's Debian packages +Source2: Ice-3.3.0-man-pages.tbz2 +# Source2-md5: c6c17ee1be2e6b615af5b40edae88b75 +Source3: %{name}gridgui +Source4: IceGridAdmin.desktop Patch0: %{name}-build.patch Patch1: dont-build-demo-test.patch Patch2: java-build.patch Patch3: jgoodies.patch %{?with_gui:BuildRequires: ImageMagick} +%{?with_java:BuildRequires: ant-nodeps} BuildRequires: db-cxx-devel %{?with_java:BuildRequires: db-java-devel} %{?with_java:BuildRequires: java-jgoodies-forms} @@ -138,12 +140,15 @@ The Ice runtime for PHP applications. %prep -%setup -q -n Ice-%{version} -a 1 +%setup -q -n Ice-%{version} -a1 -a2 %patch0 -p0 %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 *.js *.css @@ -161,6 +166,9 @@ # update path to our install sed -i -e 's,/usr/share/Ice-%{version},%{_datadir}/Ice,' cpp/src/ca/iceca Ice-rpmbuild-%{version}/icegridregistry.conf +# 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 + %build # Compile the main Ice runtime # TODO: CC/CXX passing as make param breaks build system @@ -171,6 +179,8 @@ %endif %{__make} -C cpp \ + CC="%{__cc}" \ + CXX="%{__cxx}" \ CFLAGS="%{rpmcflags} -fPIC" \ CXXFLAGS="%{rpmcxxflags} -fPIC" \ embedded_runpath_prefix="" @@ -188,6 +198,8 @@ export CLASSPATH=$(build-classpath db jgoodies-forms jgoodies-looks) %{__make} -C java \ + CC="%{__cc}" \ + CXX="%{__cxx}" \ CFLAGS="%{rpmcflags} -fPIC" \ CXXFLAGS="%{rpmcxxflags} -fPIC" \ embedded_runpath_prefix="" @@ -195,6 +207,8 @@ %if %{with dotnet} %{__make} -C cs \ + CC="%{__cc}" \ + CXX="%{__cxx}" \ CFLAGS="%{rpmcflags} -fPIC" \ CXXFLAGS="%{rpmcxxflags} -fPIC" \ embedded_runpath_prefix="" @@ -202,6 +216,8 @@ %if %{with python} %{__make} -C py \ + CC="%{__cc}" \ + CXX="%{__cxx}" \ CFLAGS="%{rpmcflags} -fPIC" \ CXXFLAGS="%{rpmcxxflags} -fPIC" \ embedded_runpath_prefix="" @@ -209,6 +225,8 @@ %if %{with ruby} %{__make} -C rb \ + CC="%{__cc}" \ + CXX="%{__cxx}" \ CFLAGS="%{rpmcflags} -fPIC" \ CXXFLAGS="%{rpmcxxflags} -fPIC" \ embedded_runpath_prefix="" @@ -216,6 +234,8 @@ %if %{with php} %{__make} -C php \ + CC="%{__cc}" \ + CXX="%{__cxx}" \ PHP_HOME=%{_prefix} \ CFLAGS="%{rpmcflags} -fPIC" \ CXXFLAGS="%{rpmcxxflags} -fPIC" \ @@ -238,6 +258,19 @@ mv $RPM_BUILD_ROOT/%{_lib}/* $RPM_BUILD_ROOT%{_libdir} mv $RPM_BUILD_ROOT/lib/* $RPM_BUILD_ROOT%{_libdir} || : +mv $RPM_BUILD_ROOT/config/* $RPM_BUILD_ROOT%{_datadir}/Ice +mv $RPM_BUILD_ROOT/slice $RPM_BUILD_ROOT%{_datadir}/Ice + +# 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} + +# 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 + %if %{with java} %{__make} -C java install \ prefix=$RPM_BUILD_ROOT @@ -256,8 +289,8 @@ # Install the IceGrid GUI install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} mv $RPM_BUILD_ROOT/lib/IceGridGUI.jar $RPM_BUILD_ROOT%{_datadir}/Ice -cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir} -install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir} +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} %endif @@ -322,19 +355,6 @@ done install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/icegrid -# Copy the man pages into the correct directory -install -d $RPM_BUILD_ROOT%{_mandir}/man1 -#cp -a $RPM_BUILD_DIR/Ice-3.3.0-man-pages/*.1 $RPM_BUILD_ROOT%{_mandir}/man1 - -mv $RPM_BUILD_ROOT/config/* $RPM_BUILD_ROOT%{_datadir}/Ice -mv $RPM_BUILD_ROOT/slice $RPM_BUILD_ROOT%{_datadir}/Ice - -# 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} - %clean rm -rf $RPM_BUILD_ROOT @@ -367,6 +387,19 @@ %attr(755,root,root) %{_bindir}/icestormmigrate %attr(755,root,root) %{_bindir}/slice2html %attr(755,root,root) %{_bindir}/transformdb +%{_mandir}/man1/dumpdb.1* +%{_mandir}/man1/glacier2router.1* +%{_mandir}/man1/icebox.1* +%{_mandir}/man1/iceboxadmin.1* +%{_mandir}/man1/icegridadmin.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/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.*.*.* @@ -409,7 +442,7 @@ %doc %{_docdir}/Ice-%{version}/IceGridAdmin %attr(755,root,root) %{_bindir}/icegridgui %{_datadir}/Ice/IceGridGUI.jar -#%{_mandir}/man1/icegridgui.1* +%{_mandir}/man1/icegridgui.1* %{_desktopdir}/IceGridAdmin.desktop %{_pixmapsdir}/icegrid.png %endif @@ -444,6 +477,8 @@ %{_includedir}/IceUtil %{_includedir}/IceXML %{_includedir}/Slice +%{_mandir}/man1/slice2cpp.1* +%{_mandir}/man1/slice2freeze.1* %if %{with dotnet} %{_pkgconfigdir}/Glacier2.pc @@ -457,15 +492,20 @@ # as we do not have -devel for each binding, these are in main -devel # -csharp %attr(755,root,root) %{_bindir}/slice2cs +%{_mandir}/man1/slice2cs.1* # -java %attr(755,root,root) %{_bindir}/slice2freezej %attr(755,root,root) %{_bindir}/slice2java +%{_mandir}/man1/slice2freezej.1* +%{_mandir}/man1/slice2java.1* # -php %attr(755,root,root) %{_bindir}/slice2php # -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) @@ -480,6 +520,7 @@ %files -n csharp-%{name} %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/iceboxnet.exe +%{_mandir}/man1/iceboxnet.exe.1* %{_libdir}/mono/Glacier2 %{_libdir}/mono/Ice %{_libdir}/mono/IceBox @@ -565,9 +606,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.12 2010/04/04 17:44:25 glen +- add man pages +- do some magic to be able to use our CXX (as it's value is compared in makefile) + Revision 1.11 2010/04/04 17:07:44 glen - minor build fixes (fix deps) -- move icon for gui creation to prep +- move icon for gui creation to build - cleanups Revision 1.10 2010/04/04 16:50:32 glen ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ice/ice.spec?r1=1.11&r2=1.12&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
