packages: ice/ice.spec - minor build fixes (fix deps) - move icon for gui c...

Sun Apr 4 19:07:49 CEST 2010

Author: glen                         Date: Sun Apr  4 17:07:49 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- minor build fixes (fix deps)
- move icon for gui creation to prep
- cleanups

---- Files affected:
packages/ice:
   ice.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: packages/ice/ice.spec
diff -u packages/ice/ice.spec:1.10 packages/ice/ice.spec:1.11

--- packages/ice/ice.spec:1.10	Sun Apr  4 18:50:32 2010
+++ packages/ice/ice.spec	Sun Apr  4 19:07:44 2010
@@ -2,7 +2,7 @@
 # TODO
 # - use our CC/CXX
 # - man pages tarball
-# - ImportKey.class is part of main pkg, thus needs javac
+# - finish (pldize) -servers package
 #
 # Conditional build:
 %bcond_without	java		# Java bindings
@@ -34,7 +34,7 @@
 Patch1:		dont-build-demo-test.patch
 Patch2:		java-build.patch
 Patch3:		jgoodies.patch
-%{?with_ruby:BuildRequires:	ruby >= 1:1.8.6}
+%{?with_gui:BuildRequires: ImageMagick}
 BuildRequires:	db-cxx-devel
 %{?with_java:BuildRequires:	db-java-devel}
 %{?with_java:BuildRequires:	java-jgoodies-forms}
@@ -43,9 +43,7 @@
 %{?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
-Obsoletes:	Ice
+%{?with_ruby:BuildRequires:	ruby >= 1:1.8.6}
 # Ice doesn't officially support ppc64 at all; sparc64 doesnt have mono
 ExcludeArch:	ppc64 sparc64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -67,9 +65,6 @@
 Summary:	Tools for developing Ice applications in C++
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-# drop these O/P if not needed
-Provides:	Ice-devel
-Obsoletes:	Ice-devel
 
 %description devel
 Tools for developing Ice applications in C++.
@@ -169,14 +164,25 @@
 %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} -C cpp \
 	CFLAGS="%{rpmcflags} -fPIC" \
 	CXXFLAGS="%{rpmcxxflags} -fPIC" \
 	embedded_runpath_prefix=""
 
+%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
+%endif
+
 %if %{with java}
-# Rebuild the Java ImportKey class
-javac cpp/src/ca/ImportKey.java
 
 # Set the CLASSPATH correctly for the Java compile
 export CLASSPATH=$(build-classpath db jgoodies-forms jgoodies-looks)
@@ -185,13 +191,6 @@
 	CFLAGS="%{rpmcflags} -fPIC" \
 	CXXFLAGS="%{rpmcxxflags} -fPIC" \
 	embedded_runpath_prefix=""
-
-# Create the IceGrid icon
-cd java/resources/icons
-convert icegrid.ico temp.png
-mv temp-8.png icegrid.png
-rm temp*.png
-cd -
 %endif
 
 %if %{with dotnet}
@@ -225,20 +224,19 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_docdir}/Ice-%{version},%{_datadir}/Ice}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir},%{_docdir}/Ice-%{version},%{_datadir}/Ice}
 
 %{__make} -C cpp install \
 	prefix=$RPM_BUILD_ROOT
 
 mv $RPM_BUILD_ROOT/bin/* $RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT%{_includedir}
 mv $RPM_BUILD_ROOT/include/* $RPM_BUILD_ROOT%{_includedir}
 # 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}
+mv $RPM_BUILD_ROOT/lib/* $RPM_BUILD_ROOT%{_libdir} || :
 
 %if %{with java}
 %{__make} -C java install \
@@ -258,9 +256,9 @@
 # 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 java/resources/icons/icegrid.png $RPM_BUILD_ROOT%{_pixmapsdir}
 cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
 install -p %{SOURCE2} $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
 
@@ -330,14 +328,12 @@
 
 mv $RPM_BUILD_ROOT/config/* $RPM_BUILD_ROOT%{_datadir}/Ice
 mv $RPM_BUILD_ROOT/slice $RPM_BUILD_ROOT%{_datadir}/Ice
-# Somehow, some files under "slice" end up with executable permissions -- ??
-find $RPM_BUILD_ROOT%{_datadir}/Ice -name "*.ice" | xargs chmod a-x
 
 # 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}/
+cp CHANGES RELEASE_NOTES  $RPM_BUILD_ROOT%{_docdir}/Ice-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -369,8 +365,8 @@
 %attr(755,root,root) %{_bindir}/icepatch2server
 %attr(755,root,root) %{_bindir}/icestormadmin
 %attr(755,root,root) %{_bindir}/icestormmigrate
-%attr(755,root,root) %{_bindir}/transformdb
 %attr(755,root,root) %{_bindir}/slice2html
+%attr(755,root,root) %{_bindir}/transformdb
 %attr(755,root,root) %{_libdir}/libFreeze.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libFreeze.so.%{soversion}
 %attr(755,root,root) %{_libdir}/libGlacier2.so.*.*.*
@@ -569,6 +565,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2010/04/04 17:07:44  glen
+- minor build fixes (fix deps)
+- move icon for gui creation to prep
+- cleanups
+
 Revision 1.10  2010/04/04 16:50:32  glen
 - resolve mess with icegrid docs and main pkg docs
 - add icegrid gui package
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ice/ice.spec?r1=1.10&r2=1.11&f=u

