packages: ice/ice.spec - slice2<binding> to -devel - unversioned filenames ...

[glen]

Author: glen                         Date: Sun Apr  4 14:49:37 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- slice2<binding> to -devel
- unversioned filenames in bindings

---- Files affected:
packages/ice:
   ice.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/ice/ice.spec
diff -u packages/ice/ice.spec:1.5 packages/ice/ice.spec:1.6
--- packages/ice/ice.spec:1.5	Sun Apr  4 16:20:27 2010
+++ packages/ice/ice.spec	Sun Apr  4 16:49:32 2010
@@ -340,6 +340,8 @@
 %if %{with python}
 %{__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-%{version}/ice.pth $RPM_BUILD_ROOT%{py_sitedir}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
@@ -350,6 +352,8 @@
 %if %{with ruby}
 %{__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}
 %endif
 
@@ -404,16 +408,8 @@
 %attr(755,root,root) %{_bindir}/icepatch2server
 %attr(755,root,root) %{_bindir}/icestormadmin
 %attr(755,root,root) %{_bindir}/icestormmigrate
-%attr(755,root,root) %{_bindir}/slice2cpp
-%attr(755,root,root) %{_bindir}/slice2cs
-%attr(755,root,root) %{_bindir}/slice2freeze
-%attr(755,root,root) %{_bindir}/slice2freezej
-%attr(755,root,root) %{_bindir}/slice2html
-%attr(755,root,root) %{_bindir}/slice2java
-%attr(755,root,root) %{_bindir}/slice2php
-%attr(755,root,root) %{_bindir}/slice2py
-%attr(755,root,root) %{_bindir}/slice2rb
 %attr(755,root,root) %{_bindir}/transformdb
+%attr(755,root,root) %{_bindir}/slice2html
 %attr(755,root,root) %{_libdir}/libFreeze.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libFreeze.so.%{soversion}
 %attr(755,root,root) %{_libdir}/libGlacier2.so.*.*.*
@@ -456,6 +452,8 @@
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/slice2cpp
+%attr(755,root,root) %{_bindir}/slice2freeze
 %attr(755,root,root) %{_libdir}/libFreeze.so
 %attr(755,root,root) %{_libdir}/libGlacier2.so
 %attr(755,root,root) %{_libdir}/libIce.so
@@ -482,6 +480,8 @@
 %{_includedir}/IceUtil
 %{_includedir}/IceXML
 %{_includedir}/Slice
+
+# these pkgconfig files are for csharp, but we do not have separate -devel for csharp
 %{_pkgconfigdir}/Glacier2.pc
 %{_pkgconfigdir}/Ice.pc
 %{_pkgconfigdir}/IceBox.pc
@@ -489,6 +489,20 @@
 %{_pkgconfigdir}/IcePatch2.pc
 %{_pkgconfigdir}/IceStorm.pc
 
+
+# as we do not have -devel for each binding, these are in main -devel
+# -csharp
+%attr(755,root,root) %{_bindir}/slice2cs
+# -java
+%attr(755,root,root) %{_bindir}/slice2freezej
+%attr(755,root,root) %{_bindir}/slice2java
+# -php
+%attr(755,root,root) %{_bindir}/slice2php
+# -python
+%attr(755,root,root) %{_bindir}/slice2py
+# -ruby
+%attr(755,root,root) %{_bindir}/slice2rb
+
 %files servers
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/glacier2router.conf
@@ -527,10 +541,7 @@
 %{py_sitedir}/Ice/IceGrid/*.py[co]
 %{py_sitedir}/Ice/IcePatch2/*.py[co]
 %{py_sitedir}/Ice/IceStorm/*.py[co]
-# XXX: mv to use just ".so"-ext?
-%{py_sitedir}/Ice/IcePy.so
-%{py_sitedir}/Ice/IcePy.so.*.*.*
-%attr(755,root,root) %{py_sitedir}/Ice/IcePy.so.%{soversion}
+%attr(755,root,root) %{py_sitedir}/Ice/IcePy.so
 
 %files ruby
 %defattr(644,root,root,755)
@@ -546,11 +557,7 @@
 %{ruby_sitearchdir}/IcePatch2
 %{ruby_sitearchdir}/IceStorm.rb
 %{ruby_sitearchdir}/IceStorm/IceStorm.rb
-
-# XXX: mv to use just ".so"-ext?
-%{ruby_sitearchdir}/IceRuby.so
-%{ruby_sitearchdir}/IceRuby.so.*.*.*
-%attr(755,root,root) %{ruby_sitearchdir}/IceRuby.so.%{soversion}
+%attr(755,root,root) %{ruby_sitearchdir}/IceRuby.so
 
 %files java
 %defattr(644,root,root,755)
@@ -584,6 +591,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2010/04/04 14:49:32  glen
+- slice2<binding> to -devel
+- unversioned filenames in bindings
+
 Revision 1.5  2010/04/04 14:20:27  glen
 - package files for bindings
 
================================================================

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