Attachment 664848 Details for Bug 887851 – Spec-file patch to update to latest version

[patch] Spec-file patch to update to latest version

ice.diff (text/plain), 9.13 KB, created by Mary Ellen Foster on 2012-12-17 13:24:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mary Ellen Foster

Created: 2012-12-17 13:24:48 UTC

Size: 9.13 KB

patch

obsolete

>diff --git a/ice.spec b/ice.spec
>index 4c74aac..05ca6e3 100644
>--- a/ice.spec
>+++ b/ice.spec
>@@ -5,18 +5,21 @@
> %global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
> %global systemddir /lib/systemd/system
> 
>+# Some file suffixes we need to grab the right stuff for the file lists
>+%global soversion 35b
>+%global tar_version 3.5b
>+
> Name:           ice
>-Version:        3.4.2
>-Release:        18%{?dist}
>+Version:        3.5
>+Release:        0.1.b%{?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
>+Source0:        http://zeroc.com/download/Ice/3.5/Ice-%{tar_version}.tar.gz
> # Man pages courtesy of Francisco Moya's Debian packages
> Source1:        ice-3.4.2-man-pages.tar.gz
>-Source2:        icegridgui
> Source3:        IceGridAdmin.desktop
> Source4:        Ice-README.Fedora
> Source5:        glacier2router.conf
>@@ -27,31 +30,20 @@ Source9:        icegridregistry.conf
> Source10:       icegridregistry.service
> Source11:       ice.ini
> Source12:       ice.pth
>-# Remove reference to Windows L&F
>-Patch0:         ice-3.4.2-jgoodies.patch
>-# fix gcc46 issue
>-Patch1:         ice-3.4.2-gcc46.patch
> # Add support for the s390/s390x architecture
>-Patch2:         ice-3.4.2-s390.patch
>+Patch2:         ice-3.5b-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.4.2-dont-build-demo-test.patch
>+Patch3:         ice-3.5b-dont-build-demo-test.patch
> # disable the CSharp interface
> Patch4:         ice-3.4.2-no-mono.patch
>-# fix java 7 compilation
>-Patch5:         ice-3.4.2-java7.patch
>-# fix php 5.4 compilation (from upstream)
>-Patch6:         ice-3.4.2-php54.patch
>-# fixed slice2cpp float literals generation fixed upstream in next release RHBZ #812156
>-# http://www.zeroc.com/forums/bug-reports/5431-default-vaules-slice.html
>-Patch7:         ice-3.4.2-slice2cpp.patch
>-# See: http://www.zeroc.com/forums/patches/5647-patch-compiling-ice-clang-gcc4-7-a.html
>-Patch8:         ice-3.4.2-gcc47.patch
> # ARM
>-Patch9:         ice-3.4.2-arm.patch
>+Patch9:         ice-3.5b-arm.patch
> # libdb4
>-Patch10:        ice-3.4.2-libdb4.patch
>+Patch10:        ice-3.5b-libdb4.patch
>+# javafx
>+Patch11:        ice-3.5b-remove-javafx.patch
> 
> # Ice doesn't officially support ppc64 at all
> ExcludeArch:    ppc64
>@@ -61,9 +53,6 @@ ExcludeArch:    ppc64
> %global with_mono 1
> %endif
> 
>-# Some file suffixes we need to grab the right stuff for the file lists
>-%define soversion 34
>-
> BuildRequires: libdb4-cxx-devel, expat-devel, openssl-devel, bzip2-devel
> BuildRequires: ant, ant-nodeps, jpackage-utils, libdb4-java
> BuildRequires: php, php-devel
>@@ -75,7 +64,9 @@ BuildRequires: mono-core, mono-devel
> BuildRequires: libmcpp-devel >= 2.7.2
> BuildRequires: dos2unix
> BuildRequires: java-devel >= 1:1.6.0
>-BuildRequires: jgoodies-forms jgoodies-looks
>+BuildRequires: jgoodies-forms >= 1.6.0
>+BuildRequires: jgoodies-looks
>+BuildRequires: jgoodies-common
> BuildRequires: /usr/bin/convert
> BuildRequires: desktop-file-utils
> 
>@@ -134,7 +125,9 @@ Tools for developing Ice applications in Java.
> Summary: IceGrid Admin Tool
> Group: Development/Tools
> Requires: ice-java%{?_isa} = %{version}-%{release}
>-Requires: jgoodies-forms, jgoodies-looks
>+Requires: jgoodies-forms >= 1.6.0
>+Requires: jgoodies-looks
>+Requires: jgoodies-common
> Requires: jpackage-utils
> %description -n icegrid-gui
> Graphical administration tool for IceGrid
>@@ -209,28 +202,25 @@ Requires: ice-php%{?_isa} = %{version}-%{release}
> Tools for developing Ice applications in PHP.
> 
> %prep
>-%setup -q -n Ice-%{version}
>-%patch0 -p1 -b .jgoodies
>-%patch1 -p1 -b .gcc46
>+%setup -q -n Ice-%{tar_version}
> %patch2 -p1 -b .s390
> %patch3 -p1 -b .demo
> %if ! 0%{?with_mono}
> %patch4 -p1 -b .no-mono
> %endif
>-%patch5 -p1 -b .java7
>-%patch6 -p1 -b .php54
>-%patch7 -p1 -b .slice2cpp
>-%patch8 -p1 -b .gcc47
> %patch9 -p1 -b .arm
> %patch10 -p1 -b .libdb4
> 
>+# Remove the parts of the GUI that require javafx
>+rm -f java/src/IceGridGUI/LiveDeployment/GraphView.java
>+%patch11 -p1 -b .javafx
>+
> tar xf %{SOURCE1}
> rm -f ice-3.4.2-man-pages/slice2docbook.1
> 
>-
> %build
> # Set the CLASSPATH correctly for the Java compile
>-export CLASSPATH=`build-classpath db jgoodies-forms jgoodies-looks`
>+export CLASSPATH=`build-classpath db jgoodies-forms jgoodies-looks jgoodies-common`
> 
> # Compile the main Ice runtime
> make CXXFLAGS="%{optflags} -fPIC -fpermissive" CFLAGS="%{optflags} -fPIC -fpermissive" embedded_runpath_prefix="" libsubdir=%{_lib}
>@@ -256,23 +246,16 @@ make prefix=%{buildroot} GACINSTALL=yes GAC_ROOT=%{buildroot}%{_prefix}/lib embe
> 
> ## install java bindings in the right place
> mkdir -p %{buildroot}%{_javadir}
>-mv %{buildroot}/lib/ant-ice.jar %{buildroot}%{_javadir}/ant-ice-%{version}.jar
>-ln -s ant-ice-%{version}.jar %{buildroot}%{_javadir}/ant-ice.jar
>-mv %{buildroot}/lib/Ice.jar %{buildroot}%{_javadir}/Ice-%{version}.jar
>-ln -s Ice-%{version}.jar %{buildroot}%{_javadir}/Ice.jar
>-mv %{buildroot}/lib/Freeze.jar %{buildroot}%{_javadir}/Freeze-%{version}.jar
>-ln -s Freeze-%{version}.jar %{buildroot}%{_javadir}/Freeze.jar
>-
>+for file in %{buildroot}/lib/*.jar; do
>+    mv $file %{buildroot}%{_javadir}
>+done
> 
> ## install IceGrid GUI in the right place
> mkdir -p %{buildroot}%{_datadir}/Ice-%{version}
>-mv %{buildroot}/lib/IceGridGUI.jar %{buildroot}%{_datadir}/Ice-%{version}
> mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
> cp -p java/resources/icons/icegrid.png \
>    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
>-mkdir -p %{buildroot}%{_bindir}
>-cp -p %{SOURCE2} ${RPM_BUILD_ROOT}%{_bindir}
>-sed -i -e "s#DIR#%{_datadir}/Ice-%{version}#" $RPM_BUILD_ROOT%{_bindir}/icegridgui
>+%jpackage_script IceGridGUI.Main "" "" IceGridGUI:jgoodies-looks:jgoodies-forms:jgoodies-common icegridgui 0
> 
> %if 0%{?rhel}
> desktop-file-install \
>@@ -311,34 +294,16 @@ mkdir -p %{buildroot}%{_datadir}/Ice-%{version}
> mv %{buildroot}/lib/ImportKey.class %{buildroot}%{_datadir}/Ice-%{version}
> rm -rf %{buildroot}/%{_lib} %{buildroot}/lib
> 
>-mkdir -p %{buildroot}%{_defaultdocdir}/Ice-%{version}
>-mv %{buildroot}/help/IceGridAdmin %{buildroot}%{_defaultdocdir}/Ice-%{version}
>-
> # Copy the man pages into the correct directory
> mkdir -p %{buildroot}%{_mandir}/man1
> cp -p ice-3.4.2-man-pages/*.1 %{buildroot}%{_mandir}/man1
> 
>-# Fix the encoding and line-endings of all the IceGridAdmin documentation files
>-pushd %{buildroot}%{_defaultdocdir}/Ice-%{version}/IceGridAdmin
>-chmod a-x *
>-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 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
>-    mv %{buildroot}%{_bindir}/$f.xml \
>+    mv %{buildroot}/Assemblies/$f.xml \
>        %{buildroot}%{_prefix}/lib/mono/gac/$f/%{version}.*/
>     # fix xml files permissions
>     chmod 0644 %{buildroot}%{_prefix}/lib/mono/gac/$f/%{version}.*/*.xml
>@@ -460,12 +425,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n -d extension_dir=%{buildroot}%{php
> %{_bindir}/icestormmigrate
> %{_bindir}/slice2html
> %{_bindir}/transformdb
>-%{_libdir}/lib*.so.%{version}
>+%{_libdir}/lib*.so.%{tar_version}
> %{_libdir}/lib*.so.%{soversion}
> %{_datadir}/Ice-%{version}
>-# Exclude the stuff that's in IceGrid
>-%exclude %{_defaultdocdir}/Ice-%{version}/IceGridAdmin
>-%exclude %{_datadir}/Ice-%{version}/IceGridGUI.jar
> 
> %files servers
> %defattr(-,root,root,-)
>@@ -499,15 +461,17 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n -d extension_dir=%{buildroot}%{php
> %files java
> %defattr(-,root,root,-)
> %{_javadir}/*.jar
>+# Exclude the stuff that's in IceGrid
>+%exclude %{_javadir}/IceGridGUI.jar
>+%exclude %{_javadir}/ant-ice.jar
> 
> %files -n icegrid-gui
> %defattr(-,root,root,-)
>-%{_datadir}/Ice-%{version}/IceGridGUI.jar
>+%{_javadir}/IceGridGUI.jar
> %attr(755,root,root) %{_bindir}/icegridgui
> %doc %{_mandir}/man1/icegridgui.1.gz
> %{_datadir}/applications/*
> %{_datadir}/icons/hicolor/48x48/apps/icegrid.png
>-%doc %{_defaultdocdir}/Ice-%{version}/IceGridAdmin
> 
> %files java-devel
> %defattr(-,root,root,-)
>@@ -515,7 +479,6 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n -d extension_dir=%{buildroot}%{php
> %doc %{_mandir}/man1/slice2freezej.1.gz
> %{_bindir}/slice2java
> %{_bindir}/slice2freezej
>-%{_javadir}/ant-ice-%{version}.jar
> %{_javadir}/ant-ice.jar
> 
> %if 0%{?with_mono}
>@@ -533,7 +496,6 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n -d extension_dir=%{buildroot}%{php
> %{_prefix}/lib/mono/gac/IceGrid
> %{_prefix}/lib/mono/gac/IcePatch2
> %{_prefix}/lib/mono/gac/IceStorm
>-%{_prefix}/lib/mono/gac/policy*
> %{_bindir}/iceboxnet.exe
> %doc %{_mandir}/man1/iceboxnet.exe.1.gz
> 
>diff --git a/sources b/sources
>index 2fc64e2..1c4a635 100644
>--- a/sources
>+++ b/sources
>@@ -1,2 +1 @@
>-e97672eb4a63c6b8dd202d0773e19dc7  Ice-3.4.2.tar.gz
>-9de1981bdb81c6fc4c5d1c0fef73dd5b  ice-3.4.2-man-pages.tar.gz
>+957a29dcfadbc19443d1441f6f2beaf2  Ice-3.5b.tar.gz

Actions: View | Diff

Attachments on bug 887851: 664848 | 664852 | 664863 | 664864 | 664865 | 664866 | 664878