[ice] upstream 3.4.2 and spec cleanup
Haïkel Guémar
hguemar at fedoraproject.org
Sat Aug 6 17:38:23 UTC 2011
commit e5676ed541682c168a8f5dc7b178fbe9dc69c0fa
Author: Haikel Guemar <hguemar at fedoraproject.org>
Date: Sat Aug 6 19:37:56 2011 +0200
upstream 3.4.2 and spec cleanup
.gitignore | 2 +
ice-3.4.1-gcc46.patch | 2371 ----------------------------------------------
ice-3.4.1-jgoodies.patch | 12 -
ice-3.4.2-gcc46.patch | 100 ++
ice-3.4.2-jgoodies.patch | 44 +
ice.spec | 231 +++--
sources | 4 +-
7 files changed, 276 insertions(+), 2488 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f4ea40a..bc7f88f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ Ice-rpmbuild-3.4.0.tar.gz
Ice-3.3.0-man-pages.tbz
/Ice-3.4.1.tar.gz
/ice-3.4.1-man-pages.tar.gz
+/ice-3.4.2-man-pages.tar.gz
+/Ice-3.4.2.tar.gz
diff --git a/glacier2router.init b/glacier2router.init
old mode 100755
new mode 100644
diff --git a/ice-3.4.2-gcc46.patch b/ice-3.4.2-gcc46.patch
new file mode 100644
index 0000000..9a2e639
--- /dev/null
+++ b/ice-3.4.2-gcc46.patch
@@ -0,0 +1,100 @@
+diff --git a/cpp/include/Freeze/Map.h b/cpp/include/Freeze/Map.h
+index 2ec759d..d8ef692 100644
+--- a/cpp/include/Freeze/Map.h
++++ b/cpp/include/Freeze/Map.h
+@@ -15,7 +15,7 @@
+ #include <Freeze/DB.h>
+ #include <Freeze/Exception.h>
+ #include <Freeze/Connection.h>
+-
++#include <cstddef>
+ //
+ // Berkeley DB's DbEnv
+ //
+diff --git a/cpp/include/Ice/Buffer.h b/cpp/include/Ice/Buffer.h
+index 6f7ebab..9501f08 100644
+--- a/cpp/include/Ice/Buffer.h
++++ b/cpp/include/Ice/Buffer.h
+@@ -12,6 +12,8 @@
+
+ #include <Ice/Config.h>
+
++#include <cstddef>
++
+ namespace IceInternal
+ {
+
+diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
+index ee201fd..c5cfae1 100644
+--- a/cpp/src/Ice/ConnectionFactory.cpp
++++ b/cpp/src/Ice/ConnectionFactory.cpp
+@@ -26,6 +26,7 @@
+ #include <Ice/Functional.h>
+ #include <IceUtil/Random.h>
+ #include <iterator>
++#include <cstddef>
+
+ using namespace std;
+ using namespace Ice;
+diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
+index 2d942ca..a864509 100644
+--- a/cpp/src/Ice/ConnectionI.cpp
++++ b/cpp/src/Ice/ConnectionI.cpp
+@@ -26,6 +26,7 @@
+ #include <Ice/ReferenceFactory.h> // For createProxy().
+ #include <Ice/ProxyFactory.h> // For createProxy().
+ #include <bzlib.h>
++#include <cstddef>
+
+ using namespace std;
+ using namespace Ice;
+diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
+index 875b64e..6f84069 100644
+--- a/cpp/src/Ice/Reference.cpp
++++ b/cpp/src/Ice/Reference.cpp
+@@ -28,7 +28,7 @@
+ #include <IceUtil/StringUtil.h>
+ #include <IceUtil/Random.h>
+ #include <IceUtil/MutexPtrLock.h>
+-
++#include <cstddef>
+ #include <functional>
+
+ using namespace std;
+diff --git a/cpp/src/IceGrid/Util.h b/cpp/src/IceGrid/Util.h
+index 72ffded..0047e57 100644
+--- a/cpp/src/IceGrid/Util.h
++++ b/cpp/src/IceGrid/Util.h
+@@ -16,6 +16,7 @@
+ #include <IceUtil/Random.h>
+ #include <functional>
+ #include <iterator>
++#include <cstddef>
+
+ namespace IceGrid
+ {
+diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp
+index 7e2afb2..af68a7d 100644
+--- a/cpp/src/slice2freeze/Main.cpp
++++ b/cpp/src/slice2freeze/Main.cpp
+@@ -19,6 +19,7 @@
+ #include <IceUtil/OutputUtil.h>
+ #include <IceUtil/StringUtil.h>
+ #include <cstring>
++#include <cstddef>
+
+ using namespace std;
+ using namespace IceUtil;
+diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp
+index f4da896..912aed1 100644
+--- a/cpp/test/Ice/binding/AllTests.cpp
++++ b/cpp/test/Ice/binding/AllTests.cpp
+@@ -12,7 +12,7 @@
+ #include <TestCommon.h>
+ #include <Test.h>
+ #include <set>
+-
++#include <cstddef>
+ #include <functional>
+
+ using namespace std;
diff --git a/ice-3.4.2-jgoodies.patch b/ice-3.4.2-jgoodies.patch
new file mode 100644
index 0000000..ac2c299
--- /dev/null
+++ b/ice-3.4.2-jgoodies.patch
@@ -0,0 +1,44 @@
+diff --git a/java/config/build.properties b/java/config/build.properties
+index 6d53b7b..224b16b 100644
+--- a/java/config/build.properties
++++ b/java/config/build.properties
+@@ -31,9 +31,9 @@ lint = unchecked,deprecation
+ # These properties only need to be set if you want to build the
+ # standalone jar for the IceGrid GUI.
+ #
+-jgoodies.common = /usr/share/java/jgoodies-common-1.2.0.jar
+-jgoodies.forms = /usr/share/java/jgoodies-forms-1.4.1.jar
+-jgoodies.looks = /usr/share/java/jgoodies-looks-2.4.1.jar
++jgoodies.common = /usr/share/java/jgoodies-common.jar
++jgoodies.forms = /usr/share/java/jgoodies-forms.jar
++jgoodies.looks = /usr/share/java/jgoodies-looks.jar
+ #jgoodies.common = C:/Program\ Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/jgoodies-common-1.2.0.jar
+ #jgoodies.forms = C:/Program\ Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/jgoodies-forms-1.4.1.jar
+ #jgoodies.looks = C:/Program\ Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/jgoodies-looks-2.4.1.jar
+diff --git a/java/src/IceGridGUI/ApplicationPane.java b/java/src/IceGridGUI/ApplicationPane.java
+index d35baae..b98766a 100644
+--- a/java/src/IceGridGUI/ApplicationPane.java
++++ b/java/src/IceGridGUI/ApplicationPane.java
+@@ -29,7 +29,6 @@ import javax.swing.tree.TreeSelectionModel;
+
+ import com.jgoodies.looks.Options;
+ import com.jgoodies.looks.plastic.PlasticLookAndFeel;
+-import com.jgoodies.looks.windows.WindowsLookAndFeel;
+ import com.jgoodies.forms.factories.Borders;
+
+ import IceGrid.*;
+diff --git a/java/src/IceGridGUI/SimpleInternalFrame.java b/java/src/IceGridGUI/SimpleInternalFrame.java
+index 8f3b017..a60689a 100644
+--- a/java/src/IceGridGUI/SimpleInternalFrame.java
++++ b/java/src/IceGridGUI/SimpleInternalFrame.java
+@@ -373,8 +373,8 @@ public class SimpleInternalFrame extends JPanel {
+ UIManager.getColor("SimpleInternalFrame.activeTitleBackground");
+ if (c != null)
+ return c;
+- if (SystemUtils.IS_LAF_WINDOWS_XP_ENABLED)
+- c = UIManager.getColor("InternalFrame.activeTitleGradient");
++ /*if (SystemUtils.IS_LAF_WINDOWS_XP_ENABLED)
++ c = UIManager.getColor("InternalFrame.activeTitleGradient");*/
+ return c != null
+ ? c
+ : UIManager.getColor("InternalFrame.activeTitleBackground");
diff --git a/ice.spec b/ice.spec
index 0264c1f..7ef6b49 100644
--- a/ice.spec
+++ b/ice.spec
@@ -5,38 +5,38 @@
%global php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-Name: ice
-Version: 3.4.1
-Release: 2%{?dist}
-Summary: The Ice base runtime and services
-
-Group: System Environment/Libraries
-License: GPLv2 with exceptions
-URL: http://www.zeroc.com/
+Name: ice
+Version: 3.4.2
+Release: 1%{?dist}
+Summary: ZeroC Object-Oriented middleware
+
+Group: System Environment/Libraries
+License: GPLv2 with exceptions
+URL: http://www.zeroc.com/
Source0: http://zeroc.com/download/Ice/3.4/Ice-%{version}.tar.gz
# Man pages courtesy of Francisco Moya's Debian packages
-Source1: ice-3.4.1-man-pages.tar.gz
+Source1: ice-3.4.2-man-pages.tar.gz
Source2: icegridgui
Source3: IceGridAdmin.desktop
-Source4: Ice-README.Fedora
-Source5: glacier2router.conf
-Source6: glacier2router.init
-Source7: icegridnode.conf
-Source8: icegridnode.init
-Source9: icegridregistry.conf
-Source10: icegridregistry.init
-Source11: ice.ini
-Source12: ice.pth
+Source4: Ice-README.Fedora
+Source5: glacier2router.conf
+Source6: glacier2router.init
+Source7: icegridnode.conf
+Source8: icegridnode.init
+Source9: icegridregistry.conf
+Source10: icegridregistry.init
+Source11: ice.ini
+Source12: ice.pth
# Remove reference to Windows L&F
-Patch0: ice-3.4.1-jgoodies.patch
+Patch0: ice-3.4.2-jgoodies.patch
# fix gcc46 issue
-Patch1: ice-3.4.1-gcc46.patch
+Patch1: ice-3.4.2-gcc46.patch
# Add support for the s390/s390x architecture
Patch2: Ice-3.4.0-s390.patch
# don't build demo/test
# TODO: should we keep it or not ?
# significantly reduce compile time but shipping demos could be useful
-Patch3: Ice-3.3-dont-build-demo-test.patch
+Patch3: Ice-3.3-dont-build-demo-test.patch
# disable the CSharp interface
Patch4: ice-3.4.1-no-mono.patch
@@ -63,10 +63,10 @@ BuildRequires: mono-core, mono-devel
%endif
BuildRequires: libmcpp-devel >= 2.7.2
BuildRequires: dos2unix
-BuildRequires: java-1.6.0-openjdk-devel
-BuildRequires: jgoodies-forms, jgoodies-looks
-BuildRequires: /usr/bin/convert
-BuildRequires: desktop-file-utils
+BuildRequires: java-1.6.0-openjdk-devel
+BuildRequires: jgoodies-forms jgoodies-looks jgoodies-common
+BuildRequires: /usr/bin/convert
+BuildRequires: desktop-file-utils
%description
Ice is a modern alternative to object middleware such as CORBA or
@@ -81,47 +81,47 @@ firewall solution, and much more.
# All of the other Ice packages also get built by this SRPM.
%package servers
-Summary: Ice services to run through /etc/rc.d/init.d
+Summary: ICE SysV style services
Group: Development/Tools
-Requires: ice = %{version}-%{release}
+Requires: ice%{?_isa} = %{version}-%{release}
# Requirements for the users
-Requires(pre): shadow-utils
+Requires(pre): shadow-utils%{?isa}
# Requirements for the init.d services
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
+Requires(post): /sbin/chkconfig%{?isa}
+Requires(preun): /sbin/chkconfig%{?isa}
+Requires(preun): /sbin/service%{?isa}
%description servers
Ice services to run through /etc/rc.d/init.d
%package devel
-Summary: Tools for developing Ice applications in C++
+Summary: C++ tools for developing Ice applications
Group: Development/Tools
Provides: ice-c++-devel = %{version}-%{release}
Obsoletes: ice-c++-devel < %{version}-%{release}
-Requires: ice = %{version}-%{release}
+Requires: ice%{?isa} = %{version}-%{release}
%description devel
Tools for developing Ice applications in C++.
%package java
-Summary: The Ice runtime for Java
+Summary: Java runtime for Ice applications
Group: System Environment/Libraries
-Requires: java >= 1.5.0
-Requires: ice = %{version}-%{release}, db4-java
+Requires: java%{?_isa} >= 1.5.0
+Requires: ice%{?_isa} = %{version}-%{release}
+Requires: db4-java%{?_isa}
%description java
The Ice runtime for Java
%package java-devel
-Summary: Tools for developing Ice applications in Java
+Summary: Java tools for developing Ice Applications
Group: Development/Tools
-Requires: ice-java = %{version}-%{release}
+Requires: ice-java%{?_isa} = %{version}-%{release}
%description java-devel
Tools for developing Ice applications in Java.
%package -n icegrid-gui
Summary: IceGrid Admin Tool
Group: Development/Tools
-Requires: java
-Requires: ice-java = %{version}-%{release}, ice = %{version}-%{release}
+Requires: ice-java%{?_isa} = %{version}-%{release}
Requires: jgoodies-forms, jgoodies-looks
Requires: jpackage-utils
%description -n icegrid-gui
@@ -129,74 +129,75 @@ Graphical administration tool for IceGrid
%if 0%{?with_mono}
%package csharp
-Summary: The Ice runtime for C#
+Summary: C# runtime for Ice applications
Group: System Environment/Libraries
Provides: ice-dotnet = %{version}-%{release}
Obsoletes: ice-dotnet < %{version}-%{release}
-Requires: ice = %{version}-%{release}, mono-core >= 1.2.2
+Requires: ice%{?_isa} = %{version}-%{release}
+Requires: mono-core%{?_isa} >= 1.2.2
%description csharp
The Ice runtime for C#
%package csharp-devel
-Summary: Tools for developing Ice applications in C#
+Summary: C# tools for developping Ice applications
Group: Development/Tools
-Requires: ice-csharp = %{version}-%{release}, pkgconfig
+Requires: ice-csharp%{?_isa} = %{version}-%{release}
%description csharp-devel
Tools for developing Ice applications in C#.
%endif
%package ruby
-Summary: The Ice runtime for Ruby applications
+Summary: Ruby runtime for Ice applications
Group: Development/Tools
-Requires: ice = %{version}-%{release}, ruby(abi) = 1.8
+Requires: ice%{?_isa} = %{version}-%{release}
+Requires: ruby(abi) = 1.8
%description ruby
The Ice runtime for Ruby applications.
%package ruby-devel
-Summary: Tools for developing Ice applications in Ruby
+Summary: Ruby tools for developping Ice applications
Group: Development/Tools
-Requires: ice-ruby = %{version}-%{release}
+Requires: ice-ruby%{?_isa} = %{version}-%{release}
%description ruby-devel
Tools for developing Ice applications in Ruby.
%package python
-Summary: The Ice runtime for Python applications
+Summary: Python runtime for Ice applications
Group: Development/Tools
-Requires: ice = %{version}-%{release}, python >= 2.3.4
+Requires: ice%{?_isa} = %{version}-%{release}
+Requires: python >= 2.3.4
%description python
The Ice runtime for Python applications.
%package python-devel
-Summary: Tools for developing Ice applications in Python
+Summary: Python tools for developping Ice applications
Group: Development/Tools
-Requires: ice-python = %{version}-%{release}
+Requires: ice-python%{?_isa} = %{version}-%{release}
%description python-devel
Tools for developing Ice applications in Python.
%package php
-Summary: The Ice runtime for PHP applications
+Summary: PHP runtime for developping Ice applications
Group: System Environment/Libraries
-Requires: ice = %{version}-%{release}
+Requires: ice%{?_isa} = %{version}-%{release}
%if %{?php_zend_api:1}%{!?php_zend_api:0}
-Requires: php(zend-abi) = %{php_zend_api}
-Requires: php(api) = %{php_core_api}
+Requires: php(zend-abi) = %{php_zend_api}
+Requires: php(api) = %{php_core_api}
%else
-Requires: php-api = %{php_apiver}
+Requires: php-api = %{php_apiver}
%endif
-
%description php
The Ice runtime for PHP applications.
%package php-devel
-Summary: Tools for developing Ice applications in PHP
+Summary: PHP tools for developping Ice applications
Group: Development/Tools
-Requires: ice-php = %{version}-%{release}
-
+Requires: ice-php%{?_isa} = %{version}-%{release}
%description php-devel
Tools for developing Ice applications in PHP.
%prep
-%setup -q -n Ice-%{version}
+%setup -q -n Ice-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -204,7 +205,7 @@ Tools for developing Ice applications in PHP.
%if ! 0%{?with_mono}
%patch4 -p1
%endif
-%setup -q -n ice-3.4.1-man-pages -T -b 1
+%setup -q -n ice-3.4.2-man-pages -T -b 1
rm -f slice2docbook.1
%build
@@ -236,7 +237,7 @@ mkdir -p $RPM_BUILD_ROOT
cd $RPM_BUILD_DIR/Ice-%{version}
make prefix=$RPM_BUILD_ROOT GACINSTALL=yes GAC_ROOT=$RPM_BUILD_ROOT%{_libdir} embedded_runpath_prefix="" install
-# Move Java stuff where it should be
+## install java bindings in the right place
mkdir -p ${RPM_BUILD_ROOT}%{_javadir}
mv ${RPM_BUILD_ROOT}/lib/ant-ice.jar $RPM_BUILD_ROOT%{_javadir}/ant-ice-%{version}.jar
ln -s ant-ice-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant-ice.jar
@@ -245,8 +246,7 @@ 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
ln -s Freeze-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/Freeze.jar
-
-# Install the IceGrid GUI
+## install IceGrid GUI in the right place
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version}
mv ${RPM_BUILD_ROOT}/lib/IceGridGUI.jar $RPM_BUILD_ROOT%{_datadir}/Ice-%{version}
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/
@@ -259,7 +259,7 @@ sed -i -e "s#DIR#%{_datadir}/Ice-%{version}#" $RPM_BUILD_ROOT%{_bindir}/icegridg
%if 0%{?rhel}
desktop-file-install \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
- --vendor = zeroc \
+ --vendor = zeroc \
%{SOURCE3}
%else
desktop-file-install \
@@ -271,60 +271,72 @@ desktop-file-install \
mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/Ice-%{version}
cp -p %{SOURCE4} $RPM_BUILD_ROOT/%{_defaultdocdir}/Ice-%{version}/README.Fedora
-# Install the servers
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-mkdir -p $RPM_BUILD_ROOT%{_initddir}
+## install SysV services configuration
## glacier2router
-cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/
-cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_initddir}/glacier2router
+install -Dp -m0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/glacier2router.conf
+install -Dp -m0755 %{SOURCE6} $RPM_BUILD_ROOT%{_initddir}/glacier2router
## icegridnode
-cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/
-cp -p %{SOURCE8} $RPM_BUILD_ROOT%{_initddir}/icegridnode
+install -Dp -m0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/icegridnode.conf
+install -Dp -m0755 %{SOURCE8} $RPM_BUILD_ROOT%{_initddir}/icegridnode
## icegridregistry
-cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/
-cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_initddir}/icegridregistry
+install -Dp -m0644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/icegridregistry.conf
+install -Dp -m0755 %{SOURCE10} $RPM_BUILD_ROOT%{_initddir}/icegridregistry
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/icegrid
# "make install" assumes it's going into a directory under /opt.
# Move things to where they should be in an RPM setting (adapted from
# the original ZeroC srpm).
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mv $RPM_BUILD_ROOT/bin/* $RPM_BUILD_ROOT%{_bindir}
+install -p -m0755 -t $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT/bin/*
+rm -rf $RPM_BUILD_ROOT/bin
mkdir -p $RPM_BUILD_ROOT%{_includedir}
mv $RPM_BUILD_ROOT/include/* ${RPM_BUILD_ROOT}%{_includedir}
mkdir -p $RPM_BUILD_ROOT%{_libdir}
-# There are a couple of files that end up installed in /lib, not %{_libdir},
+# 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} || true
-mv $RPM_BUILD_ROOT/lib/* $RPM_BUILD_ROOT%{_libdir} || true
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
+install -p -m0644 -t $RPM_BUILD_ROOT%{_libdir}/pkgconfig \
+ $RPM_BUILD_ROOT/lib/pkgconfig/*.pc
+install -p -m0755 -t $RPM_BUILD_ROOT%{_libdir}/ \
+ $RPM_BUILD_ROOT/%{_lib}/*.so*
+# Move the ImportKey.class file
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version}
+mv $RPM_BUILD_ROOT/lib/ImportKey.class ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version}
+rm -rf $RPM_BUILD_ROOT/%{_lib} $RPM_BUILD_ROOT/lib
+
mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/Ice-%{version}
mv $RPM_BUILD_ROOT/help/IceGridAdmin $RPM_BUILD_ROOT%{_defaultdocdir}/Ice-%{version}
# Copy the man pages into the correct directory
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp -p $RPM_BUILD_DIR/ice-3.4.1-man-pages/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p $RPM_BUILD_DIR/ice-3.4.2-man-pages/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
# Fix the encoding and line-endings of all the IceGridAdmin documentation files
-cd $RPM_BUILD_ROOT%{_defaultdocdir}/Ice-%{version}/IceGridAdmin
+pushd $RPM_BUILD_ROOT%{_defaultdocdir}/Ice-%{version}/IceGridAdmin
chmod a-x *
-for f in *.js *.css;
+for f in *.js *.css *.js;
do
dos2unix $f
done
for f in helpman_topicinit.js icegridadmin_navigation.js \
- IceGridAdmin_popup_html.js zoom_pageinfo.js;
+ IceGridAdmin_popup_html.js zoom_pageinfo.js highlight.js;
do
iconv -f ISO88591 -t UTF8 $f -o $f.tmp
mv $f.tmp $f
done
+popd
+## Mono bindings
%if 0%{?with_mono}
# .NET spec files (for csharp-devel) -- convert the paths
for f in IceGrid Glacier2 IceBox Ice IceStorm IcePatch2;
-do
+do
sed -i -e "s#/lib/#%{_libdir}/#" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/$f.pc
- sed -i -e "s#mono_root}/usr#mono_root}#" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/$f.pc
- mv $RPM_BUILD_ROOT%{_bindir}/$f.xml $RPM_BUILD_ROOT%{_libdir}/mono/gac/$f/%{version}.*/
+ sed -i -e "s#mono_root}/usr#mono_root}#" \
+ $RPM_BUILD_ROOT%{_libdir}/pkgconfig/$f.pc
+ mv $RPM_BUILD_ROOT%{_bindir}/$f.xml \
+ $RPM_BUILD_ROOT%{_libdir}/mono/gac/$f/%{version}.*/
+ # fix xml files permissions
+ chmod 0644 $RPM_BUILD_ROOT%{_libdir}/mono/gac/$f/%{version}.*/*.xml
done
%else
# clean some files when building without mono
@@ -333,15 +345,17 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/iceboxnet.exe.1*
rm $RPM_BUILD_ROOT%{_mandir}/man1/slice2cs.1*
%endif
-# Put the PHP stuff into the right place
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/php.d
-mv %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/php.d
-mkdir -p ${RPM_BUILD_ROOT}%{php_extdir}
-mv ${RPM_BUILD_ROOT}/php/IcePHP.so ${RPM_BUILD_ROOT}%{php_extdir}
+## install PHP bindings in the right place
+install -D -p -m0644 %{SOURCE11} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/php.d/%{name}.ini
+install -D -p -m0755 ${RPM_BUILD_ROOT}/php/IcePHP.so \
+ ${RPM_BUILD_ROOT}%{php_extdir}/IcePHP.so
+rm -f ${RPM_BUILD_ROOT}/php/IcePHP.so
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/php
mv ${RPM_BUILD_ROOT}/php/* ${RPM_BUILD_ROOT}%{_datadir}/php
-# Also Ruby and Python -- remove all shebang lines while we're at it
+## install Python and Ruby bindings in the right place
+# remove shebangs from python/ruby modules
for f in $RPM_BUILD_ROOT/python/Ice.py $RPM_BUILD_ROOT/ruby/*.rb;
do
grep -v '/usr/bin/env' $f > $f.tmp
@@ -352,6 +366,9 @@ mv $RPM_BUILD_ROOT/ruby/* ${RPM_BUILD_ROOT}%{ruby_sitearch}
mkdir -p ${RPM_BUILD_ROOT}%{python_sitearch}/Ice
mv ${RPM_BUILD_ROOT}/python/* ${RPM_BUILD_ROOT}%{python_sitearch}/Ice
cp -p %{SOURCE12} $RPM_BUILD_ROOT%{python_sitearch}
+# fix permissions for Python/Ruby C extensions libraries
+chmod 0755 $RPM_BUILD_ROOT%{python_sitearch}/Ice/IcePy.so*
+chmod 0755 $RPM_BUILD_ROOT%{ruby_sitearch}/IceRuby.so*
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version}
mv $RPM_BUILD_ROOT/config/* ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version}
@@ -359,11 +376,8 @@ mv $RPM_BUILD_ROOT/slice ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version}
# Somehow, some files under "slice" end up with executable permissions -- ??
find ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version} -name "*.ice" | xargs chmod a-x
-# Move the ImportKey.class file -- it'll be in %{_libdir} because of the moves earlier
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version}
-mv $RPM_BUILD_ROOT%{_libdir}/ImportKey.class ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version}
-# Move the license files into the documentation directory
+# Move license files into the documentation directory
mkdir -p ${RPM_BUILD_ROOT}%{_defaultdocdir}/Ice-%{version}
mv $RPM_BUILD_ROOT/ICE_LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/Ice-%{version}/ICE_LICENSE
mv $RPM_BUILD_ROOT/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/Ice-%{version}/LICENSE
@@ -383,6 +397,7 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_mandir}/man1/glacier2router.1.gz
%doc %{_mandir}/man1/icebox.1.gz
%doc %{_mandir}/man1/iceboxadmin.1.gz
+%doc %{_mandir}/man1/iceca.1.gz
%doc %{_mandir}/man1/icegridadmin.1.gz
%doc %{_mandir}/man1/icegridnode.1.gz
%doc %{_mandir}/man1/icegridregistry.1.gz
@@ -458,7 +473,7 @@ if [ "$1" -ge "1" ]; then
fi
%files devel
-%defattr(-, root, root, -)
+%defattr(-,root,root,-)
%doc %{_mandir}/man1/slice2cpp.1.gz
%doc %{_mandir}/man1/slice2freeze.1.gz
%{_bindir}/slice2cpp
@@ -530,7 +545,7 @@ fi
%endif
%files python
-%defattr(644,root,root,755)
+%defattr(-,root,root,-)
%{python_sitearch}/Ice/
%{python_sitearch}/%{name}.pth
@@ -540,7 +555,7 @@ fi
%doc %{_mandir}/man1/slice2py.1.gz
%files ruby
-%defattr(644,root,root,755)
+%defattr(-,root,root,-)
%{ruby_sitearch}/*
%files ruby-devel
@@ -557,8 +572,18 @@ fi
%files php-devel
%defattr(-,root,root,-)
%{_bindir}/slice2php
+%{_mandir}/man1/slice2php.1.gz
+
%changelog
+* Fri Aug 05 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 3.4.2-1
+- upstream 3.4.2
+- refresh gcc 4.6/jgoodies patch
+- retrieved updated debian man pages
+- fix permissions
+- use %%{?_isa} for arch-dependent requires
+- spec cleanup
+
* Tue Mar 22 2011 Dan Horák <dan[at]danny.cz> - 3.4.1-2
- conditionalize CSharp/Mono support
@@ -745,7 +770,7 @@ fi
- Fixed typo on ice-csharp group
- Changed license tag to GPLv2
- Removed macros in changelog
-- Set CFLAGS as well as CPPFLAGS for make so that building icecpp gets the
+- Set CFLAGS as well as CPPFLAGS for make so that building icecpp gets the
correct flags too
- Renamed ice-c++-devel to ice-devel
- Added Provides: for ice-c++-devel and ice-dotnet for people moving from the
@@ -782,7 +807,7 @@ fi
system)
- Changed "make" calls to use the correct compiler flags (including -fPIC)
- Changed "cp" to "cp -p" everywhere for timestamps
-- Use more macros instead of hard-coded directory names:
+- Use more macros instead of hard-coded directory names:
%%_prefix, %%_libdir, %%_initrddir, %%_localstatedir, %%_sbindir
- Un-excluded *.pyo files
diff --git a/icegridnode.init b/icegridnode.init
old mode 100755
new mode 100644
diff --git a/icegridregistry.init b/icegridregistry.init
old mode 100755
new mode 100644
diff --git a/sources b/sources
index 3646e64..a3671ff 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-3aae42aa47dec74bb258c1a1b2847a1a Ice-3.4.1.tar.gz
-ca97af2e00687b1b727e068f189b7575 ice-3.4.1-man-pages.tar.gz
+9de1981bdb81c6fc4c5d1c0fef73dd5b ice-3.4.2-man-pages.tar.gz
+e97672eb4a63c6b8dd202d0773e19dc7 Ice-3.4.2.tar.gz
More information about the scm-commits
mailing list