rpms/ice/F-8 IceGridAdmin.desktop,1.1,1.2 ice.spec,1.5,1.6
Mary Ellen Foster (mef)
fedora-extras-commits at redhat.com
Thu Nov 29 11:10:10 UTC 2007
- Previous message (by thread): rpms/ice/F-7 IceGridAdmin.desktop,1.1,1.2 ice.spec,1.6,1.7
- Next message (by thread): rpms/gnome-applet-sensors/devel .cvsignore, 1.7, 1.8 gnome-applet-sensors.spec, 1.16, 1.17 sources, 1.7, 1.8 sensors-applet-1.8.1-get-min-max-from-libsensors.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mef
Update of /cvs/pkgs/rpms/ice/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16821/F-8
Modified Files:
IceGridAdmin.desktop ice.spec
Log Message:
Commit changes to other branches
Index: IceGridAdmin.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/ice/F-8/IceGridAdmin.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IceGridAdmin.desktop 31 Aug 2007 05:02:22 -0000 1.1
+++ IceGridAdmin.desktop 29 Nov 2007 11:09:37 -0000 1.2
@@ -7,5 +7,4 @@
Icon=icegrid.png
Terminal=false
Type=Application
-Categories=Development
-Version=3.2.1
+Categories=Development;
Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/F-8/ice.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ice.spec 30 Oct 2007 18:05:28 -0000 1.5
+++ ice.spec 29 Nov 2007 11:09:37 -0000 1.6
@@ -1,6 +1,6 @@
# Some defines for the Java subpackages
%define java5 1
-%define icegridgui 0
+%define icegridgui 1
# Get Python and Ruby packages into sitelib (see Fedora Wiki)
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
@@ -10,7 +10,7 @@
Name: ice
Version: 3.2.1
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: The Ice base runtime and services
Group: System Environment/Libraries
@@ -41,6 +41,7 @@
Patch11: http://www.zeroc.com/forums/attachments/patches/531d1190619626-patch-3-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch3.txt
Patch12: http://www.zeroc.com/forums/attachments/patches/534d1192152933-patch-4-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch4.txt
Patch13: Ice-3.2.1-template-path.patch
+Patch14: http://www.zeroc.com/forums/attachments/patches/541d1194844106-1-attachment-s-patch-5-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch5.txt
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Ice doesn't officially support this architecture at all
@@ -128,6 +129,7 @@
Requires: java
Requires: ice-java = %{version}-%{release}, ice = %{version}-%{release}
Requires: jgoodies-forms, jgoodies-looks
+Requires: jpackage-utils
%description -n icegrid-gui
Graphical administration tool for IceGrid
%endif
@@ -190,6 +192,7 @@
%patch10 -p2
%patch11 -p2
%patch12 -p2
+%patch14 -p2
# Fix some permission issues/
chmod a-x config/*.py
@@ -364,6 +367,7 @@
mkdir -p ${RPM_BUILD_ROOT}%{ruby_sitearch}
mv $RPM_BUILD_ROOT/ruby/* ${RPM_BUILD_ROOT}%{ruby_sitearch}
mkdir -p ${RPM_BUILD_ROOT}%{python_sitearch}/Ice
+cp -p %{SOURCE7} $RPM_BUILD_ROOT%{python_sitearch}
mv ${RPM_BUILD_ROOT}/python/IcePy.so* ${RPM_BUILD_ROOT}%{python_sitearch}/Ice
mkdir -p ${RPM_BUILD_ROOT}%{python_sitelib}/Ice
cp -p %{SOURCE7} $RPM_BUILD_ROOT%{python_sitelib}
@@ -525,7 +529,7 @@
%defattr(-,root,root,-)
%{_datadir}/Ice-%{version}/IceGridGUI.jar
%attr(755,root,root) %{_bindir}/icegridgui
-%{_datadir}/applications/zeroc-IceGridAdmin.desktop
+%{_datadir}/applications/IceGridAdmin.desktop
%{_datadir}/icons/hicolor/48x48/apps/icegrid.png
%endif
@@ -572,6 +576,7 @@
%defattr(644,root,root,755)
%ifarch x86_64 ppc64
%{python_sitearch}/Ice/
+%{python_sitearch}/%{name}.pth
%endif
%{python_sitelib}/Ice/
%{python_sitelib}/%{name}.pth
@@ -594,6 +599,11 @@
%config(noreplace) %{_sysconfdir}/php.d/ice.ini
%changelog
+* Tue Nov 20 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-13
+- Enable the IceGrid GUI
+- Fix a problem with Python on 64-bit systems (bz #392751)
+- Incorporate one more Mono patch from ZeroC
+
* Tue Oct 30 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-12
- Put the slice2java classes into a .jar file instead of as bare classes
- Incorporate all Ice 3.2.1 patches from ZeroC
- Previous message (by thread): rpms/ice/F-7 IceGridAdmin.desktop,1.1,1.2 ice.spec,1.6,1.7
- Next message (by thread): rpms/gnome-applet-sensors/devel .cvsignore, 1.7, 1.8 gnome-applet-sensors.spec, 1.16, 1.17 sources, 1.7, 1.8 sensors-applet-1.8.1-get-min-max-from-libsensors.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list