--- a/ChangeLog Mon Sep 18 20:39:51 2006 +0000
+++ b/ChangeLog Mon Sep 18 23:09:23 2006 +0000
@@ -1,8 +1,36 @@
+2006-09-18 Laszlo (Laca) Peter <[email protected]>
+
+ Python 64-bit changes, mostly from John.Levon.
+
+ * patches/Python-01-solaris-lib-dirs.diff: (update) merge for 2.4.3
+ and fix ssl libdir part so that it uses a 64-bit libdir when built
+ in 64-bit mode
+ * patches/Python-02-pycc.diff: (update) reset IFS correctly;
+ use = not ==; add some hacks at the bottom to use the right
+ gcc options, so 64-bit can build
+ * patches/Python-03-distutils-pycc.diff: force using pycc/pyCC
+ so that CC/CXX/FLAGS/LDFLAGS are picked up from the environment
+ * patches/Python-04-distutils-log.diff: fix log.info commands so
+ that they work when the '%' char appears in a compiler flags
+ * patches/Python-05-isalibs.diff: (new) make .so's be generated as
+ foo.so, 64/foo.so; some really nasty fixes to pyconfig.h: we
+ cannot use the compile-time version of SIZEOF, so we hack them
+ in using _LP64. We use PY_CHECK_SIZEOF to avoid autoconf
+ automatically adding them to pyconfig.h; in the Makefile, make
+ python obey libdir for libpython, but still put the generic stuff
+ in /usr/lib/python2.4 (not /usr/lib/amd64/python2.4...)
+
+2006-09-18 Laszlo (Laca) Peter <[email protected]>
+
+ * pygtk2.spec: re-enable optimisation as the compiler bug that
+ prevented it has been fixed
+
2006-09-18 Matt Keenan <[email protected]>
- * yelp.spec : Add patch to fix bug 6471853 / 318996, NULL check on variable
- before doing a strcmp.
- * patches/yelp-01-null-frag-id.diff : New Patch, Patch attached upstream aswell.
+ * yelp.spec : Add patch to fix bug 6471853 / 318996, NULL check on
+ variable before doing a strcmp.
+ * patches/yelp-01-null-frag-id.diff : New Patch, Patch attached
+ upstream aswell.
2006-09-16 Laszlo (Laca) Peter <[email protected]>
@@ -38,7 +66,8 @@
Add flag to Output Track to say it's the MASTER track (since it's the
only output track it must be).
* control-center.spec:
- Removed the volume-control patch since we have made fix to GStreamer to
+ Removed the volume-control patch since we have made fix to
+ GStreamer to
flag the MASTER track, which is used for controling the volume.
Fix for Bug#6442357
* patches/control-center-09-volume-control.diff:
@@ -80,8 +109,8 @@
* nautilus.spec : Bug: 6470306 : Remove nautilus-19-metadata-check.diff
* patches/nautilus-19-metadata-check.diff : Remove.
- * patches/nautilus-11-frame-buffer.diff : Update, passing an int screen_num
- into nautilus_file_get_metadata() instead of a char !!
+ * patches/nautilus-11-frame-buffer.diff : Update, passing an int
+ screen_num into nautilus_file_get_metadata() instead of a char !!
2006-09-15 Lin Ma <[email protected]>
@@ -90,9 +119,10 @@
2006-09-15 Brian Cameron <[email protected]>
- * gnome-applets.spec, patches/gnome-applets-04-disable-keyboard-layout.diff:
- Fix patch so it can go upstream. Add --disable-gswitchit option rather
- than just hacking the configure script to disable it.
+ * gnome-applets.spec,
+ patches/gnome-applets-04-disable-keyboard-layout.diff:
+ Fix patch so it can go upstream. Add --disable-gswitchit option
+ rather than just hacking the configure script to disable it.
2006-09-15 Glynn Foster <[email protected]>
@@ -106,8 +136,9 @@
2006-09-14 Matt Keenan <[email protected]>
* vte.spec : Remove patch vte-08-pre-edit-crash-on-close.diff
- Fixes two bugs : 6463098 & 6465619
- * patches/vte-08-pre-edit-crash-on-close.diff : Remove not needed anymore
+ Fixes two bugs : 6463098 & 6465619
+ * patches/vte-08-pre-edit-crash-on-close.diff : Remove not needed
+ anymore
2006-09-14 Alvaro Lopez Ortega <[email protected]>
@@ -124,9 +155,9 @@
2006-09-14 Harry Lu <[email protected]>
* libgnomeui.spec: add libgnomeui-02-crash-no-bugbuddy.diff to
- fix bug 6463604.
+ fix bug 6463604.
* patches/libgnomeui-02-crash-no-bugbuddy.diff: new patch to change
- the string.
+ the string.
2006-09-14 Wang Xin <[email protected]>
* evolution-jescs.spec: bump to 2.7.1.
@@ -195,12 +226,12 @@
2006-09-06 Rick Ju <[email protected]>
* gaim.spec: Bump to 2.0.0beta3.1. Add patch 07-msn-crash. Remove
- deprecated patches; renumber remaining patches.
+ deprecated patches; renumber remaining patches.
* patches/gaim-07-msn-crash.diff: Added to fix a MSN crash bug.
* patches/gaim-01-g11n-menu-entry.diff, patches/gaim-04-uint_max.diff,
- patches/gaim-05-po-mkinstalldirs.diff, patches/gaim-06-gettext.diff,
- patches/gaim-07-void-return.diff, patches/gaim-09-add-help.diff: Removed
- deprecated patches.
+ patches/gaim-05-po-mkinstalldirs.diff, patches/gaim-06-gettext.diff,
+ patches/gaim-07-void-return.diff, patches/gaim-09-add-help.diff:
+ Removed deprecated patches.
2006-09-06 Damien Carbery <[email protected]>
@@ -244,7 +275,7 @@
2006-09-05 Damien Carbery <[email protected]>
* patches/pygobject-01-uninstalled.pc.diff: Add line to the
- uninstalled.pc file to sync with the provided file.
+ uninstalled.pc file to sync with the provided file.
* patches/pygtk2-01-uninstalled.pc.diff: Redo for new tarball.
2006-09-05 Damien Carbery <[email protected]>
--- a/Solaris/.pkgtoolrc Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/.pkgtoolrc Mon Sep 18 23:09:23 2006 +0000
@@ -1,5 +1,5 @@
# tarballdirs [string]: colon (:) separated list of directories where source tarballs are searched for
-tarballdirs: /sgnome/tarballs/gnome2.14:/sgnome/tarballs/gnome2.15:/sgnome/tarballs/moz-evo:/jds/packages/SOURCES
+tarballdirs: /sgnome/tarballs/gnome2.14:/sgnome/tarballs/gnome2.15:/sgnome/tarballs/moz-evo:/jds/packages/SOURCES:${tarballdirs}
# logdir [string]: the directory for saving log files
# logdir: /tmp
--- a/Solaris/ChangeLog Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/ChangeLog Mon Sep 18 23:09:23 2006 +0000
@@ -1,3 +1,50 @@
+2006-09-18 Laszlo (Laca) Peter <[email protected]>
+
+ Python 64-bit changes
+
+ * SUNWPython.spec: added patched 3,4,5 (see ../ChangeLog for
+ defails); build 32-bit and 64-bit versions of python 2.4.3;
+ upgraded to 2.4.3; moved smtpd.py to /usr/demo/python
+ * Solaris.inc: define cxx_optflags64 -- 64-bit c++ compiler
+ flags
+
+2006-09-18 Laszlo (Laca) Peter <[email protected]>
+
+ * .pkgtoolrc: add ${tarballdirs} to the tarball dir search path
+ so that you can specify additional directories in ~/.pkgtoolrc
+ * SUNWbrltty.spec: delete some unnecessary env variables
+ * SUNWdbus.spec: revert to normal optimisation flags, the build
+ problems were caused by ld(1) bug 6467925
+ * SUNWevolution-data-server.spec: delete some unnecessary env variables
+ * SUNWevolution-exchange.spec: delete some unnecessary env variables
+ * SUNWevolution-jescs.spec: delete some unnecessary env variables
+ * SUNWevolution-libs.spec: delete some unnecessary env variables
+ * SUNWevolution-webcal.spec: delete some unnecessary env variables
+ * SUNWevolution.spec: delete some unnecessary env variables
+ * SUNWfsexam.spec: delete some unnecessary env variables
+ * SUNWgnome-a11y-gok.spec: delete some unnecessary env variables
+ * SUNWgnome-a11y-libs.spec: delete some unnecessary env variables
+ * SUNWgnome-a11y-reader.spec: delete some unnecessary env variables
+ * SUNWgnome-applets.spec: delete some unnecessary env variables
+ * SUNWgnome-archive-mgr.spec: delete some unnecessary env variables
+ * SUNWgnome-calculator.spec: delete some unnecessary env variables
+ * SUNWgnome-camera.spec: delete some unnecessary env variables
+ * SUNWgnome-cd-burner.spec: delete some unnecessary env variables
+ * SUNWgnome-character-map.spec: delete some unnecessary env variables
+ * SUNWgnome-component.spec: set PERL to /usr/perl5/bin/perl as per
+ CR6454456
+ * SUNWgnome-config-editor.spec: delete some unnecessary env variables
+ * SUNWgnome-desktop-prefs.spec: delete some unnecessary env variables
+ * SUNWgnome-dialog.spec: delete some unnecessary env variables
+ * SUNWgnome-doc-utils.spec: delete some unnecessary env variables
+ * SUNWgnome-file-mgr.spec: delete some unnecessary env variables
+ * SUNWgnome-games.spec: delete some unnecessary env variables
+ * SUNWgnome-help-viewer.spec: delete some unnecessary env variables
+ * SUNWgnome-img-editor.spec: delete some unnecessary env variables
+ * SUNWgnome-img-viewer.spec: delete some unnecessary env variables
+ * SUNWgnome-keyring-manager.spec: delete some unnecessary env variables
+ * SUNWgnome-libs.spec: delete some unnecessary env variables
+
2006-09-18 Brian Cameron <[email protected]>
* SUNWevolution.spec, SUNWgnome-cd-burner.spec,
--- a/Solaris/SUNWPython.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWPython.spec Mon Sep 18 23:09:23 2006 +0000
@@ -28,6 +28,9 @@
Source1: http://www.python.org/ftp/python/%{p23_version}/Python-%{p23_version}.tar.bz2
Patch1: Python-01-solaris-lib-dirs.diff
Patch2: Python-02-pycc.diff
+Patch3: Python-03-distutils-pycc.diff
+Patch4: Python-04-distutils-log.diff
+Patch5: Python-05-isalibs.diff
Patch31: Python233-01-solaris-lib-dirs.diff
%include default-depend.inc
@@ -58,8 +61,16 @@
%setup -q -D -T -b 1 -c -n %name-%version
cd Python-%{version}
%patch1 -p1 -b .patch1
-%patch2 -p1 -b .patch2
+%patch2 -p1
+%patch3 -p1 -b .patch3
+%patch4 -p1 -b .patch4
+%patch5 -p1 -b .patch5
cd ..
+
+%ifarch sparcv9 amd64
+cp -pr Python-%{version} Python-%{version}-64
+%endif
+
cd Python-%{p23_version}
%patch31 -p1 -b .patch31
@@ -70,12 +81,6 @@
CPUS=1
fi
export CXXFLAGS="%cxx_optflags"
-%if %cc_is_gcc
-export CFLAGS="%optflags"
-%else
-# -xregs=no%%frameptr breaks the build of Python 2.4.1
-export CFLAGS=`echo '%optflags' | sed -e 's/-xregs=no%%frameptr//'`
-%endif
export OPT=$CFLAGS
export BASECFLAGS=
export LD_RUN_PATH="/usr/sfw/lib"
@@ -93,6 +98,8 @@
unset LD_RUN_PATH
cd ../Python-%{version}
+autoheader
+autoconf
./configure --prefix=%{_prefix} \
--libdir=%{_libdir} \
--mandir=%{_mandir} \
@@ -108,14 +115,56 @@
perl -pi -e 's/^(#define _XOPEN_SOURCE_EXTENDED.*)/\/* $1 *\//' pyconfig.h
make -j$CPUS
+cd ..
+
+%ifarch sparcv9 amd64
+cd Python-%{version}-64
+
+export CXXFLAGS="%cxx_optflags64"
+export CFLAGS="%optflags64"
+export CC=${CC64:-$CC}
+export CC="$CC %optflags64"
+export CXX=${CXX64:-$CXX}
+export CXX="$CXX %cxx_optflags64"
+
+autoheader
+autoconf
+./configure --prefix=%{_prefix} \
+ --libdir=%{_libdir}/%{_arch64} \
+ --mandir=%{_mandir} \
+ --datadir=%{_datadir} \
+ --infodir=%{_datadir}/info \
+ --enable-shared \
+ --disable-static
+
+# These #define's break the build with gcc and cause problems when
+# building c99 compliant python modules
+perl -pi -e 's/^(#define _POSIX_C_SOURCE.*)/\/* $1 *\//' pyconfig.h
+perl -pi -e 's/^(#define _XOPEN_SOURCE.*)/\/* $1 *\//' pyconfig.h
+perl -pi -e 's/^(#define _XOPEN_SOURCE_EXTENDED.*)/\/* $1 *\//' pyconfig.h
+
+make -j$CPUS
+%endif
%install
[ "$RPM_BUILD_ROOT" != "" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT
+%ifarch sparcv9 amd64
+cd Python-%{version}-64
+make install DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir}/%{_arch64}
+rm -f $RPM_BUILD_ROOT%{_bindir}/%{_arch64}/idle
+rm -f $RPM_BUILD_ROOT%{_bindir}/%{_arch64}/pydoc
+rm -f $RPM_BUILD_ROOT%{_bindir}/%{_arch64}/smtpd.py
+cd ..
+%endif
+
cd Python-%{p23_version}
make install DESTDIR=$RPM_BUILD_ROOT
+cd ..
-cd ../Python-%{version}
+cd Python-%{version}
make install DESTDIR=$RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/demo/python
+mv $RPM_BUILD_ROOT%{_bindir}/smtpd.py $RPM_BUILD_ROOT%{_prefix}/demo/python/
# the pycc script is a C/C++ compiler wrapper to be used in
# the distutils Makefile
@@ -160,6 +209,7 @@
rm -rf $RPM_BUILD_ROOT%{p23_libdir}/python2.3/bsddb
rm -f $RPM_BUILD_ROOT%{_libdir}/python?.?/lib-dynload/_curses*failed.so
rm -f $RPM_BUILD_ROOT%{p23_libdir}/python2.3/lib-dynload/_curses*failed.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/python?.?/lib-dynload/64/_curses*failed.so
echo deleting pyo files
find $RPM_BUILD_ROOT -name '*.pyo' -exec rm {} \;
@@ -200,7 +250,11 @@
%dir %attr (0755, root, bin) %{p23_bindir}
%{p23_bindir}/*
%dir %attr (0755, root, bin) %{_bindir}
-%{_bindir}/*
+%{_bindir}/idle
+%{_bindir}/pydoc
+%{_bindir}/python
+%{_bindir}/python2.4
+%{_prefix}/demo/python/smtpd.py
%dir %attr (0755, root, bin) %{_libdir}
%{_libdir}/python?.?/LICENSE.txt
%{_libdir}/python?.?/*.py*
@@ -219,6 +273,12 @@
%{_libdir}/python?.?/vendor-packages
%{_libdir}/python?.?/xml
%{_libdir}/lib*.so*
+%ifarch sparcv9 amd64
+%dir %attr(0755, root, bin) %{_libdir}/%{_arch64}
+%{_libdir}/%{_arch64}/lib*.so*
+%dir %attr(0755, root, bin) %{_bindir}/%{_arch64}
+%{_bindir}/%{_arch64}/*
+%endif
%dir %attr (0755, root, bin) %{p23_libdir}
%{p23_libdir}/*
%dir %attr(0755, root, sys) %{_datadir}
--- a/Solaris/SUNWbrltty.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWbrltty.spec Mon Sep 18 23:09:23 2006 +0000
@@ -40,12 +40,9 @@
%build
export PKG_CONFIG_PATH=%{_pkg_config_path}
-export MSGFMT="/usr/bin/msgfmt"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
export CFLAGS="%optflags -I%{_includedir}"
+export RPM_OPT_FLAGS="$CFLAGS"
export LDFLAGS="%_ldflags"
-export RPM_OPT_FLAGS="$CFLAGS"
%brltty.build -d %name-%version
@@ -88,6 +85,8 @@
%changelog
+* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
* Thu May 04 2006 - [email protected]
- merge -share pkg(s) into the base pkg(s)
* Tue Apr 04 2006 - [email protected]
--- a/Solaris/SUNWdbus.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWdbus.spec Mon Sep 18 23:09:23 2006 +0000
@@ -48,18 +48,6 @@
%dbus.prep -d %name-%version
%build
-%if %debug_build
-# Use '-xO2' optimization (not -xO4) as the latter causes seg faults in build.
-%else
-%ifarch sparc
-%if %cc_is_gcc
-%else
-%define optflags -i -x02 -xspace -xstrconst -xarch=v8a -mr
-%define optflags64 -i -x02 -xspace -xstrconst -xarch=v9 -xcode=pic32 -mr
-%endif
-%endif
-%endif
-
%if %cc_is_gcc
%else
export CFLAGS="-xc99 %optflags -I/usr/sfw/include -D__EXTENSIONS__"
@@ -165,7 +153,8 @@
%dir %attr (0755, root, sys) %dir %{_sysconfdir}
%config %{_sysconfdir}/dbus-1
%dir %attr (0755, root, sys) %{_localstatedir}
-%attr (0755, root, sys) %{_localstatedir}/run
+%dir %attr (0755, root, sys) %{_localstatedir}/run
+%attr (0755, root, root) %{_localstatedir}/run/dbus
%dir %attr (0755, root, sys) /var/svc
%dir %attr (0755, root, sys) /var/svc/manifest
%dir %attr (0755, root, sys) /var/svc/manifest/system
@@ -186,6 +175,9 @@
%changelog
+* Mon Sep 18 2006 - [email protected]
+- revert to normal optimisation flags, the build problems were caused by
+ ld(1) bug 6467925
* Mon Aug 28 2006 - [email protected]
- Use '-xO2' optimization (not -xO4) as the latter causes seg faults in build.
* Fri Aug 25 2006 - [email protected]
--- a/Solaris/SUNWevolution-data-server.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWevolution-data-server.spec Mon Sep 18 23:09:23 2006 +0000
@@ -91,10 +91,8 @@
export LD=/usr/ccs/bin/ld
export LDFLAGS="-Wl,-z,ignore -L%{_libdir} -R%{_libdir}"
export CFLAGS="-I%{_includedir} %optflags"
-export MSGFMT="/usr/bin/msgfmt"
+export RPM_OPT_FLAGS="$CFLAGS"
export PKG_CONFIG_PATH="%{_pkg_config_path}"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
%if %with_bdb_devel
%define bdb_option --with-libdb=%{_basedir}
@@ -150,6 +148,8 @@
%endif
%changelog
+* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
* Thu Jul 27 2006 - [email protected]
- Correct with_bdb_devel depend on SUNWbdb, not SUNWevolution-bdb-devel
* Wed Jul 26 2006 - [email protected]
--- a/Solaris/SUNWevolution-exchange.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWevolution-exchange.spec Mon Sep 18 23:09:23 2006 +0000
@@ -78,10 +78,8 @@
export LD=/usr/ccs/bin/ld
export LDFLAGS="-z ignore -L%{_libdir} -R%{_libdir} -L%{evo_prefix}/%{tarball_version} -R%{evo_prefix}/%{tarball_version}"
export CFLAGS="%optflags"
-export MSGFMT="/usr/bin/msgfmt"
-export PKG_CONFIG_PATH="%{_libdir}/pkgconfig:/usr/lib/pkgconfig"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
+export RPM_OPT_FLAGS="$CFLAGS"
+export PKG_CONFIG_PATH="%_pkg_config_path"
%evoexchange.build -d %name-%version
%install
@@ -130,14 +128,13 @@
%changelog
* Fri Sep 01 2006 - [email protected]
- Add new man page tarball
-
+* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
* Tue Jul 25 2006 - [email protected]
- Reorder patches.
-
* Mon Jun 24 2006 - [email protected]
- Bump to trunk 2.7.4
Remove patch evolution-exchange-01-ldap.diff.
-
- Updated patch evolution-exchange-01-ldap.diff.
* Sun Jun 22 2006 - [email protected]
- Updated patch evolution-exchange-01-ldap.diff.
--- a/Solaris/SUNWevolution-jescs.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWevolution-jescs.spec Mon Sep 18 23:09:23 2006 +0000
@@ -56,10 +56,8 @@
export LD=/usr/ccs/bin/ld
export LDFLAGS="-z ignore -L%{_libdir} -R%{_libdir} -L%{evo_prefix}/%{evo_major_version} -R%{evo_prefix}/%{evo_major_version}"
export CFLAGS="%optflags"
-export MSGFMT="/usr/bin/msgfmt"
-export PKG_CONFIG_PATH="%{_libdir}/pkgconfig"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
+export RPM_OPT_FLAGS="$CFLAGS"
+export PKG_CONFIG_PATH="%_pkg_config_path"
%evojescs.build -d %name-%version
%install
@@ -94,6 +92,8 @@
%endif
%changelog
+* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
* Sun Jun 24 2006 - [email protected]
- change evo_major_version to 2.8.
* Sun Jun 11 2006 - [email protected]
--- a/Solaris/SUNWevolution-libs.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWevolution-libs.spec Mon Sep 18 23:09:23 2006 +0000
@@ -75,9 +75,8 @@
%endif
export LDFLAGS="%_ldflags -L%{_libdir} -R%{_libdir}"
export CFLAGS="%optflags"
-export MSGFMT="/usr/bin/msgfmt"
+export RPM_OPT_FLAGS="$CFLAGS"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
export PKG_CONFIG_PATH=%{_pkg_config_path}
%libsoup.build -d %name-%version
%gtkhtml.build -d %name-%version
@@ -130,6 +129,8 @@
- Only change compiler options for non-debug builds.
* Tue Aug 22 2006 - [email protected]
- remove optimization compiler options to fix 6461613.
+* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
* Sun Jun 11 2006 - [email protected]
- change group from other to bin/sys
* Thu May 11 2006 - [email protected]
--- a/Solaris/SUNWevolution-webcal.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWevolution-webcal.spec Mon Sep 18 23:09:23 2006 +0000
@@ -57,10 +57,8 @@
%build
export LDFLAGS="%_ldflags -L%{_libdir} -R%{_libdir}"
export CFLAGS="%optflags"
-export MSGFMT="/usr/bin/msgfmt"
-export PKG_CONFIG_PATH="%{_libdir}/pkgconfig:/usr/lib/pkgconfig"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
+export RPM_OPT_FLAGS="$CFLAGS"
+export PKG_CONFIG_PATH="%_pkg_config_path"
%webcal.build -d %name-%version
%install
@@ -123,6 +121,8 @@
%endif
%changelog
+* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
* Fri Jul 14 2006 - [email protected]
- update %post/%postun/etc scripts to support diskless client setup,
part of 6448317
--- a/Solaris/SUNWevolution.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWevolution.spec Mon Sep 18 23:09:23 2006 +0000
@@ -123,9 +123,7 @@
# should be re-enabled once these issues are fixed
export LD=/usr/ccs/bin/ld export LDFLAGS="-Wl,-z,ignore -L%{_libdir} -R%{_libdir} -L%{evolution.plink_prefix}/lib -R%{evolution.plink_prefix}/lib"
export CFLAGS="-I%{_includedir} %optflags -I%{evolution.plink_prefix}/include"
-export MSGFMT="/usr/bin/msgfmt"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
+export RPM_OPT_FLAGS="$CFLAGS"
export PKG_CONFIG_PATH=%{_pkg_config_path}:%{_builddir}/%name-%version/evolution-%{evolution.version}
%evolution.build -d %name-%version
@@ -263,17 +261,15 @@
* Fri Sep 01 2006 - [email protected]
- New Manpage tarball
-
* Mon Aug 14 2006 - [email protected]
- Add Build/Requires SUNWhal after check-deps.pl run.
-
+* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
* Tue Aug 07 2006 - [email protected]
- add patch evolution-03-mail-rlimit.diff to resolve stoping updating review
page.
-
* Tue Jul 25 2006 - [email protected]
- Reorder patches
-
* Fri Jul 21 2006 - [email protected]
- Bump to 2.7.4
Remove patch evolution-01-solaris-ldap.diff.
--- a/Solaris/SUNWfsexam.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWfsexam.spec Mon Sep 18 23:09:23 2006 +0000
@@ -63,9 +63,7 @@
%build
export LDFLAGS="%_ldflags -L%{_libdir} -R%{_libdir}"
export CFLAGS="-I%{_includedir} %optflags"
-export MSGFMT="/usr/bin/msgfmt"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
+export RPM_OPT_FLAGS="$CFLAGS"
export PKG_CONFIG_PATH=%{_pkg_config_path}
@@ -171,6 +169,8 @@
%changelog
+* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
* Fri Jul 14 2006 - [email protected]
- update %post/%postun/etc scripts to support diskless client setup,
part of 6448317
--- a/Solaris/SUNWgnome-a11y-gok.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWgnome-a11y-gok.spec Mon Sep 18 23:09:23 2006 +0000
@@ -65,9 +65,6 @@
%build
export PKG_CONFIG_PATH=%{_pkg_config_path}
-export MSGFMT="/usr/bin/msgfmt"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
export LDFLAGS="%_ldflags"
%ifarch sparc
export CFLAGS="%optflags -I%{_includedir}"
@@ -190,6 +187,8 @@
%changelog
* Fri Sep 01 2006 - [email protected]
- New man page tarball
+* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
* Fri Jul 14 2006 - [email protected]
- update %post/%postun/etc scripts to support diskless client setup,
part of 6448317
--- a/Solaris/SUNWgnome-a11y-libs.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWgnome-a11y-libs.spec Mon Sep 18 23:09:23 2006 +0000
@@ -76,10 +76,7 @@
%build
PKG_CONFIG_DISABLE_UNINSTALLED=
unset PKG_CONFIG_DISABLE_UNINSTALLED
-export PKG_CONFIG_PATH=../at-spi-%{at_spi.version}:%{_pkg_config_path}
-export MSGFMT="/usr/bin/msgfmt"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
+export PKG_CONFIG_PATH="../at-spi-%{at_spi.version}:%{_pkg_config_path}"
export CFLAGS="%optflags -I%{_includedir}"
export RPM_OPT_FLAGS="$CFLAGS"
export LDFLAGS="%_ldflags $LDFLAGS -L%{_builddir}/%name-%version/at-spi-%{at_spi.version}/login-helper"
@@ -505,32 +502,25 @@
%changelog
* Fri Sep 01 2006 - [email protected]
- New Manpage tarball
-
+* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
* Fri Jul 14 2006 - [email protected]
- Remove .la files before packaging.
-
* Thu Jun 22 2006 - [email protected]
- Change 'return 0' to 'exit 0' in main function in %post share. Fixes 6437617.
-
* Tue Jun 13 2006 - [email protected]
- Add dependencies on SUNWzoner/u and SUNWpkgcmdsu for zonename and pkgcond
binaries that are used in the postinstall script. As suggested in 6377106.
-
* Sun Jun 11 2006 - [email protected]
- change group from other to bin/sys
-
* Tue May 30 2006 - [email protected]
- Merge postinstall script from JDS3.1 branch. Include fix for 6431039.
-
* Tue May 09 2006 - [email protected]
- merge -share pkg(s) into the base pkg(s)
-
* Fri May 05 2006 - [email protected]
- Copy postinstall script from JDS3.1 branch. Incorporate dynamic code.
-
* Tue Mar 14 2006 - [email protected]
- Add doc dir to share package.
-
* Mon Feb 20 2006 - [email protected]
- Complete update of Build/Requires after running check-deps.pl script.
* Thu Feb 16 2006 - [email protected]
--- a/Solaris/SUNWgnome-a11y-reader.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWgnome-a11y-reader.spec Mon Sep 18 23:09:23 2006 +0000
@@ -64,12 +64,7 @@
gzcat %SOURCE0 | tar xf -
%build
-PKG_CONFIG_DISABLE_UNINSTALLED=
-unset PKG_CONFIG_DISABLE_UNINSTALLED
-export MSGFMT="/usr/bin/msgfmt"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
-export CFLAGS="%optflags -I%{_includedir}"
+export CFLAGS="%optflags"
export RPM_OPT_FLAGS="$CFLAGS"
export LDFLAGS="%_ldflags"
export X_LIBS="-L%{_prefix}/openwin/lib -lX11"
@@ -192,6 +187,8 @@
* Fri Sep 01 2006 - [email protected]
- New Manpage tarball
* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
+* Sat Aug 12 2006 - [email protected]
- change datadir/icons permissions back to root:other since it's a stable
interface and wasn't supposed to be changed
* Fri Jul 28 2006 - [email protected]
--- a/Solaris/SUNWgnome-applets.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWgnome-applets.spec Mon Sep 18 23:09:23 2006 +0000
@@ -195,10 +195,7 @@
%build
PKG_CONFIG_DISABLE_UNINSTALLED=
unset PKG_CONFIG_DISABLE_UNINSTALLED
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export CPPFLAGS="-I/usr/sfw/include"
-export MSGFMT="/usr/bin/msgfmt"
export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP"
export RPM_OPT_FLAGS="$CFLAGS"
export LDFLAGS="%_ldflags -L/usr/sfw/lib -R/usr/sfw/lib -L/usr/X11/lib -R/usr/X11/lib -lX11"
@@ -691,6 +688,8 @@
* Wed Aug 16 2006 - [email protected]
- Add invest-applet to internet-applets package.
* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
+* Sat Aug 12 2006 - [email protected]
- change datadir/icons permissions back to root:other since it's a stable
interface and wasn't supposed to be changed
* Thu Aug 03 2006 - [email protected]
--- a/Solaris/SUNWgnome-archive-mgr.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWgnome-archive-mgr.spec Mon Sep 18 23:09:23 2006 +0000
@@ -57,13 +57,10 @@
gzcat %SOURCE0 | tar xf -
%build
-#export CFLAGS="%optflags -I/usr/sfw/include -I/usr/sfw/include/freetype2 -DANSICPP"
+export CFLAGS="%optflags"
export RPM_OPT_FLAGS="$CFLAGS"
export PKG_CONFIG_PATH=%{_pkg_config_path}
-export MSGFMT="/usr/bin/msgfmt"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export LDFLAGS="%_ldflags"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
%froller.build -d %name-%version
@@ -172,6 +169,8 @@
* Mon Aug 21 2006 - [email protected]
- Fix l10n package - C locale omf file was in base and l10n package.
* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
+* Sat Aug 12 2006 - [email protected]
- change datadir/icons permissions back to root:other since it's a stable
interface and wasn't supposed to be changed
* Fri Jul 14 2006 - [email protected]
--- a/Solaris/SUNWgnome-calculator.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWgnome-calculator.spec Mon Sep 18 23:09:23 2006 +0000
@@ -52,9 +52,6 @@
%build
export PKG_CONFIG_PATH=%{_pkg_config_path}
-export MSGFMT="/usr/bin/msgfmt"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
export CFLAGS="%optflags -I%{_includedir}"
export RPM_OPT_FLAGS="$CFLAGS"
export LDFLAGS="%_ldflags"
@@ -159,6 +156,8 @@
%changelog
* Fri Sep 01 2006 - [email protected]
- New Manpage tarball
+* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
* Fri Jul 14 2006 - [email protected]
- update %post/%postun/etc scripts to support diskless client setup,
part of 6448317
--- a/Solaris/SUNWgnome-camera.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWgnome-camera.spec Mon Sep 18 23:09:23 2006 +0000
@@ -68,12 +68,9 @@
%build
export PKG_CONFIG_PATH=../libgphoto2-%{libgphoto2.version}/libgphoto2:%{_pkg_config_path}
-export MSGFMT="/usr/bin/msgfmt"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
export CFLAGS="%optflags -I%{_includedir}"
+export RPM_OPT_FLAGS="$CFLAGS"
export LDFLAGS="%_ldflags -R/usr/sfw/lib"
-export RPM_OPT_FLAGS="$CFLAGS"
%libgphoto2.build -d %name-%version
%gphoto2.build -d %name-%version
@@ -173,6 +170,8 @@
%{_libdir}/pkgconfig/*
%changelog
+* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
* Tue Jul 25 2006 - [email protected]
- Fix 'rm .omf' line to not delete the C locale file.
* Fri Jul 14 2006 - [email protected]
--- a/Solaris/SUNWgnome-cd-burner.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWgnome-cd-burner.spec Mon Sep 18 23:09:23 2006 +0000
@@ -62,9 +62,6 @@
%build
export PKG_CONFIG_PATH=%{_pkg_config_path}
-export MSGFMT="/usr/bin/msgfmt"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
export CFLAGS="%optflags -I%{_includedir}"
export RPM_OPT_FLAGS="$CFLAGS"
%if %cc_is_gcc
@@ -158,6 +155,8 @@
* Wed Aug 16 2006 - [email protected]
- Change 'icons' line in %files to pick up files.
* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
+* Sat Aug 12 2006 - [email protected]
- change datadir/icons permissions back to root:other since it's a stable
interface and wasn't supposed to be changed
* Fri Aug 11 2006 - [email protected]
--- a/Solaris/SUNWgnome-character-map.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWgnome-character-map.spec Mon Sep 18 23:09:23 2006 +0000
@@ -52,9 +52,6 @@
%build
export PKG_CONFIG_PATH=%{_pkg_config_path}
-export MSGFMT="/usr/bin/msgfmt"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
export CFLAGS="%optflags -I%{_includedir}"
export RPM_OPT_FLAGS="$CFLAGS"
export LDFLAGS="%_ldflags"
@@ -142,6 +139,8 @@
* Fri Aug 25 2006 - [email protected]
- Add new charmap.1 manpage.
* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
+* Sat Aug 12 2006 - [email protected]
- change datadir/icons permissions back to root:other since it's a stable
interface and wasn't supposed to be changed
* Fri Jul 14 2006 - [email protected]
--- a/Solaris/SUNWgnome-component.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWgnome-component.spec Mon Sep 18 23:09:23 2006 +0000
@@ -80,9 +80,7 @@
export PKG_CONFIG_PATH64=../ORBit2-%{orbit.version}-64:../libIDL-%{idl.version}-64:../libbonobo-%{bonobo.version}-64:%{_pkg_config_path64}
-export PERL_PATH=/usr/perl5/5.8.4/bin/perl
-export PERL=/usr/perl5/5.8.4/bin/perl
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
+export PERL=/usr/perl5/bin/perl
export CPP=/usr/lib/cpp
export CFLAGS="%optflags -I%{_includedir}"
export CFLAGS32="$CFLAGS"
@@ -90,7 +88,6 @@
export RPM_OPT_FLAGS="$CFLAGS"
-export MSGFMT="/usr/bin/msgfmt"
%idl.build -d %name-%version
%orbit.build -d %name-%version
@@ -214,6 +211,8 @@
- Remove "rm" of _mandir during %install
* Fri Sep 01 2006 - [email protected]
- New Manpage tarball
+* Sat Aug 12 2006 - [email protected]
+- set PERL to /usr/perl5/bin/perl as per CR6454456
* Sun Jun 11 2006 - [email protected]
- change group from other to bin/sys
* Wed May 10 2006 - [email protected]
--- a/Solaris/SUNWgnome-config-editor.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWgnome-config-editor.spec Mon Sep 18 23:09:23 2006 +0000
@@ -57,10 +57,9 @@
%build
export PKG_CONFIG_PATH=%{_pkg_config_path}
-export MSGFMT="/usr/bin/msgfmt"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
export LDFLAGS="%_ldflags"
+export CFLAGS="%optflags"
+export RPM_OPT_FLAGS="$CFLAGS"
%gceditor.build -d %name-%version
@@ -169,6 +168,8 @@
- Remove scrollkeeper files under /var. Remove missing help files from l10n
pkg.
* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables; set CFLAGS
+* Sat Aug 12 2006 - [email protected]
- change datadir/icons permissions back to root:other since it's a stable
interface and wasn't supposed to be changed
* Fri Jul 14 2006 - [email protected]
--- a/Solaris/SUNWgnome-desktop-prefs.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWgnome-desktop-prefs.spec Mon Sep 18 23:09:23 2006 +0000
@@ -109,9 +109,6 @@
export PKG_CONFIG_PATH=%{_pkg_config_path}
#FIXME: This stuff should be fixed in the component or the configure script
export LDFLAGS="%_ldflags -L/usr/X11/lib -R/usr/X11/lib -L/usr/sfw/lib -R/usr/sfw/lib -lfreetype"
-export MSGFMT="/usr/bin/msgfmt"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
%dfu.build -d %name-%version
%cc.build -d %name-%version
@@ -257,6 +254,8 @@
* Fri Sep 01 2006 - [email protected]
- New Manpage tarball
* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
+* Sat Aug 12 2006 - [email protected]
- change datadir/icons permissions back to root:other since it's a stable
interface and wasn't supposed to be changed
* Fri Jul 14 2006 - [email protected]
--- a/Solaris/SUNWgnome-dialog.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWgnome-dialog.spec Mon Sep 18 23:09:23 2006 +0000
@@ -46,9 +46,7 @@
%build
export PKG_CONFIG_PATH=%{_pkg_config_path}
-export MSGFMT="/usr/bin/msgfmt"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
+export PERL=/usr/perl5/bin/perl
export CFLAGS="%optflags -I%{_includedir}"
export RPM_OPT_FLAGS="$CFLAGS"
export LDFLAGS="%_ldflags -lX11"
@@ -111,6 +109,8 @@
%changelog
* Fri Sep 01 2006 - [email protected]
- New Manpage tarball
+* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
* Fri Jul 14 2006 - [email protected]
- update %post/%postun/etc scripts to support diskless client setup,
part of 6448317
--- a/Solaris/SUNWgnome-doc-utils.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWgnome-doc-utils.spec Mon Sep 18 23:09:23 2006 +0000
@@ -37,9 +37,6 @@
%build
export PKG_CONFIG_PATH=%{_pkg_config_path}
-export MSGFMT="/usr/bin/msgfmt"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
export CFLAGS="%optflags -I%{_includedir}"
export RPM_OPT_FLAGS="$CFLAGS"
export LDFLAGS="%_ldflags"
@@ -93,6 +90,8 @@
%changelog
* Fri Sep 08 2006 - [email protected]
- Remove "rm" of _mandir during %install, deliver xml2po.1 community man page
+* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
* Fri Aug 11 2006 - [email protected]
- Remove %{_libdir}/locale files because I don't want to create a l10n pkg.
* Fri Jul 14 2006 - [email protected]
--- a/Solaris/SUNWgnome-file-mgr.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWgnome-file-mgr.spec Mon Sep 18 23:09:23 2006 +0000
@@ -109,11 +109,8 @@
export PKG_CONFIG_PATH=../eel-%{eel.version}:../nautilus-%{nautilus.version}/libnautilus-extension:%{_pkg_config_path}
export CFLAGS="%optflags -I%{_includedir}"
+export RPM_OPT_FLAGS="$CFLAGS"
export LDFLAGS="%_ldflags"
-export RPM_OPT_FLAGS="$CFLAGS"
-export MSGFMT="/usr/bin/msgfmt"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
%eel.build -d %name-%version
%nautilus.build -d %name-%version
@@ -263,6 +260,8 @@
- New Manpage tarball
* Mon Aug 14 2006 - [email protected]
- Add Build/Requires SUNWhal after check-deps.pl run.
+* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
* Thu Jul 25 2006 - [email protected]
- Add gnome-volume-manager and gnome-mount for HAL integration.
* Fri Jul 14 2006 - [email protected]
--- a/Solaris/SUNWgnome-games.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWgnome-games.spec Mon Sep 18 23:09:23 2006 +0000
@@ -56,9 +56,6 @@
%build
export PKG_CONFIG_PATH=%{_pkg_config_path}
-export MSGFMT="/usr/bin/msgfmt"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
export CFLAGS="%optflags -I%{_includedir}"
export RPM_OPT_FLAGS="$CFLAGS"
export LDFLAGS="%_ldflags"
@@ -198,6 +195,8 @@
* Thu Aug 17 2006 - [email protected]
- Change 'icons' line in %files to pick up files.
* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
+* Sat Aug 12 2006 - [email protected]
- change datadir/icons permissions back to root:other since it's a stable
interface and wasn't supposed to be changed
* Fri Jul 14 2006 - [email protected]
--- a/Solaris/SUNWgnome-help-viewer.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWgnome-help-viewer.spec Mon Sep 18 23:09:23 2006 +0000
@@ -66,13 +66,12 @@
%build
export CFLAGS="%optflags -I/usr/sfw/include -I/usr/sfw/include/freetype2 -I%{_includedir}/mps -DANSICPP"
-export CXXFLAGS="$CXXFLAGS -I%{_includedir}/mps"
export RPM_OPT_FLAGS="$CFLAGS"
+export CXXFLAGS="%cxx_optflags -I%{_includedir}/mps"
export PKG_CONFIG_PATH=%{_pkg_config_path}:/usr/sfw/lib/pkgconfig
-export MSGFMT="/usr/bin/msgfmt"
-export ACLOCAL_FLAGS="-I ./m4 -I %{_datadir}/aclocal -I /usr/sfw/share/aclocal"
+#FIXME: freetype2.m4?
+export ACLOCAL_FLAGS="-I ./m4 -I /usr/sfw/share/aclocal"
export LDFLAGS="-z ignore -z combreloc -Bdirect -norunpath"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
%yelp.build -d %name-%version
@@ -131,6 +130,8 @@
* Mon Sep 04 2006 - [email protected]
- New Manpage tarball
* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
+* Sat Aug 12 2006 - [email protected]
- change datadir/icons permissions back to root:other since it's a stable
interface and wasn't supposed to be changed
* Wed Jul 26 2006 - [email protected]
--- a/Solaris/SUNWgnome-img-editor.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWgnome-img-editor.spec Mon Sep 18 23:09:23 2006 +0000
@@ -75,9 +75,6 @@
%build
export PKG_CONFIG_PATH=/jds/packages/BUILD/%{name}-%{version}/gimp-%{gimp.subver}.%{gimp.microver}:%{_pkg_config_path}
-export MSGFMT="/usr/bin/msgfmt"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
export CFLAGS="%optflags -I%{_includedir} -KPIC"
export RPM_OPT_FLAGS="$CFLAGS"
export CPPFLAGS="-I/usr/sfw/include"
@@ -165,6 +162,8 @@
%changelog
* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
+* Sat Aug 12 2006 - [email protected]
- change datadir/icons permissions back to root:other since it's a stable
interface and wasn't supposed to be changed
* Fri Jul 14 2006 - [email protected]
--- a/Solaris/SUNWgnome-img-viewer.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWgnome-img-viewer.spec Mon Sep 18 23:09:23 2006 +0000
@@ -86,9 +86,6 @@
%build
export PKG_CONFIG_PATH="%{_pkg_config_path}:/usr/sfw/lib/pkgconfig"
-export MSGFMT="/usr/bin/msgfmt"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
export CFLAGS="%optflags -I%{_includedir}"
export RPM_OPT_FLAGS="$CFLAGS"
export CPPFLAGS="-I/usr/sfw/include"
@@ -206,6 +203,8 @@
%changelog
* Mon Sep 04 2006 - [email protected]
- New Manpage tarball
+* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
* Fri Jul 28 2006 - [email protected]
- Remove scrollkeeper files before packaging. Update l10n package as some
files are no longer installed.
--- a/Solaris/SUNWgnome-keyring-manager.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWgnome-keyring-manager.spec Mon Sep 18 23:09:23 2006 +0000
@@ -48,9 +48,6 @@
%build
export PKG_CONFIG_PATH=%{_pkg_config_path}
-export MSGFMT="/usr/bin/msgfmt"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
export CFLAGS="%optflags -I%{_includedir}"
export RPM_OPT_FLAGS="$CFLAGS"
export LDFLAGS="%_ldflags"
@@ -148,8 +145,9 @@
%changelog
* Fri Sep 08 2006 - [email protected]
- Remove "rm" of _mandir during %install, Package gnome-keyring-manager.1 from community
+* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
* Thu Jul 27 2006 - [email protected]
- Fix packaging of omf files.
-
* Fri Jul 14 2006 - [email protected]
- Initial spec
--- a/Solaris/SUNWgnome-libs.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/SUNWgnome-libs.spec Mon Sep 18 23:09:23 2006 +0000
@@ -106,9 +106,6 @@
export RPM_OPT_FLAGS="$CFLAGS"
export CPPFLAGS="-I/usr/sfw/include"
export LDFLAGS="%_ldflags -L/usr/sfw/lib -R/usr/sfw/lib"
-export MSGFMT="/usr/bin/msgfmt"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
%scrollkeeper.build -d %name-%version
%startupnotification.build -d %name-%version
%libgtkhtml.build -d %name-%version
@@ -292,6 +289,8 @@
%changelog
* Mon Sep 04 2006 - [email protected]
- New Manpage tarball
+* Sat Aug 12 2006 - [email protected]
+- delete some unnecessary env variables
* Fri Jul 14 2006 - [email protected]
- update %post/%postun/etc scripts to support diskless client setup,
part of 6448317
--- a/Solaris/Solaris.inc Mon Sep 18 20:39:51 2006 +0000
+++ b/Solaris/Solaris.inc Mon Sep 18 23:09:23 2006 +0000
@@ -70,12 +70,14 @@
%define optflags %_cc_opt_level -mv8plus -Xlinker -i %picflags
%define cxx_optflags %_cxx_opt_level -mv8plus -Xlinker -i %picflags
%define optflags64 %_cc_opt_level -mcpu=ultrasparc -m64 -Xlinker -i %picflags
+%define cxx_optflags64 %optflags64
%endif
%ifarch i386
%define optflags %_cc_opt_level -march=i586 -Xlinker -i -fno-omit-frame-pointers %picflags
%define cxx_optflags %_cc_opt_level -march=i586 -Xlinker -i -fno-omit-frame-pointers %picflags
%define optflags64 %_cc64_opt_level -march=opteron -m64 -Xlinker -i -fno-omit-frame-pointers %picflags
+%define cxx_optflags64 %optflags64
%endif
%else
@@ -85,14 +87,16 @@
%ifarch sparc
%define optflags -i %_cc_opt_level -xstrconst -xarch=v8a -mr
-%define cxx_optflags -i %_cxx_opt_level -xarch=v8a -mr -norunpath
%define optflags64 -i %_cc_opt_level -xstrconst -xarch=v9 -xcode=pic32 -mr
+%define cxx_optflags -i %_cxx_opt_level -xstrconst -xarch=v8a -mr -norunpath
+%define cxx_optflags64 -i %_cxx_opt_level -xstrconst -xarch=v9 -xcode=pic32 -mr -norunpath
%endif
%ifarch i386
%define optflags -i %_cc_opt_level -xstrconst -xpentium -mr -xregs=no%%frameptr
+%define optflags64 -i -xarch=generic64 -Kpic -xregs=no%%frameptr
%define cxx_optflags -i %_cxx_opt_level -pentium -mr -norunpath -xregs=no%%frameptr
-%define optflags64 -i -xarch=generic64 -Kpic -xregs=no%%frameptr
+%define cxx_optflags64 -i %_cxx_opt_level -xarch=generic64 -Kpic -pentium -mr -norunpath -xregs=no%%frameptr
%endif
%endif
@@ -108,6 +112,8 @@
# ChangeLog:
#
+# 2006-09-18 Laszlo Peter <[email protected]>
+# - define cxx_optflags64
# 2006-08-23 Laszlo Peter <[email protected]>
# - define _localstatedir
# 2006-06-02 Laszlo Peter <[email protected]>
--- a/patches/Python-01-solaris-lib-dirs.diff Mon Sep 18 20:39:51 2006 +0000
+++ b/patches/Python-01-solaris-lib-dirs.diff Mon Sep 18 23:09:23 2006 +0000
@@ -1,6 +1,6 @@
---- Python-2.4.2/setup.py.patch1 2005-03-09 17:27:24.000000000 -0500
-+++ Python-2.4.2/setup.py 2006-06-08 22:30:14.918419000 -0400
-@@ -238,9 +238,10 @@
+--- Python-2.4.3/setup.py.patch1 2006-03-23 14:07:46.000000000 -0500
++++ Python-2.4.3/setup.py 2006-09-14 22:12:55.808430000 -0400
+@@ -239,9 +239,10 @@
return sys.platform
def detect_modules(self):
@@ -14,7 +14,7 @@
# Add paths to popular package managers on OS X/darwin
if sys.platform == "darwin":
-@@ -267,7 +268,7 @@
+@@ -268,7 +269,7 @@
# be assumed that no additional -I,-L directives are needed.
lib_dirs = self.compiler.library_dirs + [
'/lib64', '/usr/lib64',
@@ -23,7 +23,7 @@
]
inc_dirs = self.compiler.include_dirs + ['/usr/include']
exts = []
-@@ -448,11 +449,23 @@
+@@ -452,11 +453,23 @@
exts.append( Extension('_csv', ['_csv.c']) )
# socket(2)
@@ -49,17 +49,22 @@
'/usr/contrib/ssl/include/'
]
)
-@@ -462,7 +475,8 @@
+@@ -465,8 +478,13 @@
+ ['/usr/kerberos/include'])
if krb5_h:
ssl_incs += krb5_h
++ if sys.maxint == 2147483647L:
++ sfw_libdir = '/usr/sfw/lib';
++ else:
++ sfw_libdir = '/usr/sfw/lib/64';
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
- ['/usr/local/ssl/lib',
-+ ['/usr/sfw/lib',
++ [sfw_libdir,
+ '/usr/local/ssl/lib',
'/usr/contrib/ssl/lib/'
] )
-@@ -471,6 +485,7 @@
+@@ -475,6 +493,7 @@
exts.append( Extension('_ssl', ['_ssl.c'],
include_dirs = ssl_incs,
library_dirs = ssl_libs,
@@ -67,7 +72,7 @@
libraries = ['ssl', 'crypto'],
depends = ['socketmodule.h']), )
-@@ -974,15 +989,25 @@
+@@ -985,15 +1004,25 @@
# Assume we haven't found any of the libraries or include files
# The versions with dots are used on Unix, and the versions without
@@ -96,7 +101,7 @@
# Now check for the header files
if tklib and tcllib:
-@@ -998,6 +1023,7 @@
+@@ -1009,6 +1038,7 @@
for dir in inc_dirs:
tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
tk_include_sub += [dir + os.sep + "tk" + dotversion]
@@ -104,7 +109,7 @@
tk_include_sub += tcl_include_sub
tcl_includes = find_file('tcl.h', inc_dirs, tcl_include_sub)
tk_includes = find_file('tk.h', inc_dirs, tk_include_sub)
-@@ -1009,7 +1035,7 @@
+@@ -1020,7 +1050,7 @@
# OK... everything seems to be present for Tcl/Tk.
@@ -113,7 +118,7 @@
for dir in tcl_includes + tk_includes:
if dir not in include_dirs:
include_dirs.append(dir)
-@@ -1062,6 +1088,7 @@
+@@ -1073,6 +1103,7 @@
include_dirs = include_dirs,
libraries = libs,
library_dirs = added_lib_dirs,
--- a/patches/Python-02-pycc.diff Mon Sep 18 20:39:51 2006 +0000
+++ b/patches/Python-02-pycc.diff Mon Sep 18 23:09:23 2006 +0000
@@ -1,6 +1,6 @@
---- /dev/null 2005-11-02 20:00:47.000000000 -0500
-+++ python/pycc 2005-11-02 19:21:08.963427000 -0500
-@@ -0,0 +1,128 @@
+--- /dev/null 2006-08-24 06:34:26.000000000 -0700
++++ Python-2.4.2-new/pycc 2006-08-24 06:37:41.077704000 -0700
+@@ -0,0 +1,156 @@
+#!/bin/ksh
+#
+# Script for running the C/C++ compiler when building python modules
@@ -49,6 +49,9 @@
+ CVAR='CXX'
+fi
+
++SAVED_IFS="$IFS"
++IFS=:
++
+# check if the CC env variable is set
+if [ "x$CC" != x ]; then
+ case "$CC" in
@@ -68,7 +71,6 @@
+ ;;
+ * )
+ # try to find $CC in the PATH
-+ IFS=:
+ NEW_CC=
+ for dir in $PATH; do
+ if [ -x "$dir/$CC" ]; then
@@ -86,9 +88,8 @@
+ esac
+fi
+
-+if [ "x$CC" == x ]; then
++if [ "x$CC" = x ]; then
+ # Look for the Sun Studio compiler in the PATH
-+ IFS=:
+ for dir in $PATH; do
+ if [ -x "$dir/$CCEXE" ]; then
+ CC="$dir/$CCEXE"
@@ -97,9 +98,8 @@
+ done
+fi
+
-+if [ "x$CC" == x ]; then
++if [ "x$CC" = x ]; then
+ # Look for gcc in the PATH
-+ IFS=:
+ for dir in $PATH; do
+ if [ -x "$dir/$GCCEXE" ]; then
+ CC="$dir/$GCCEXE"
@@ -108,24 +108,52 @@
+ done
+fi
+
-+if [ "x$CC" == x ]; then
++if [ "x$CC" = x ]; then
+ # Check for Sun Studio in /opt/SUNWspro (default install location)
+ if [ -x /opt/SUNWspro/bin/$CCEXE ]; then
+ CC=/opt/SUNWspro/bin/$CCEXE
+ fi
+fi
+
-+if [ "x$CC" == x ]; then
++if [ "x$CC" = x ]; then
+ # Check for the GNU compiler in /usr/sfw/bin
+ if [ -x /usr/sfw/bin/$GCCEXE ]; then
+ CC=/usr/sfw/bin/$GCCEXE
+ fi
+fi
+
-+if [ "x$CC" == x ]; then
++if [ "x$CC" = x ]; then
+ # Cannot continue without a C compiler
+ echo "ERROR: no $CLANG compiler not found; update your PATH or set the $CVAR env variable" 1>&2
+ exit 1
+fi
+
-+exec "$CC" "${@}"
++IFS="$SAVED_IFS"
++
++# We need to make some modifications to adapt correctly to compiler options
++# that differ between GCC and Studio.
++
++extra_flags=
++
++is_gcc=no
++
++$CC --version >/dev/null 2>&1 && is_gcc=yes
++
++if [ "$is_gcc" = yes ]; then
++ for flag in "${@}"; do
++ # need -shared to link shared objects properly
++ if [ "$flag" = "-G" ]; then
++ extra_flags="$extra_flags -shared"
++ fi
++ # workaround for 6223255
++ if [ "$flag" = "-m64" ]; then
++ extra_flags="$extra_flags -R/usr/sfw/lib/amd64"
++ fi
++ done
++ # force PIC compilation
++ extra_flags="$extra_flags -fPIC -DPIC"
++else
++ extra_flags="$extra_flags -KPIC"
++fi
++
++exec "$CC" $extra_flags "${@}"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/Python-03-distutils-pycc.diff Mon Sep 18 23:09:23 2006 +0000
@@ -0,0 +1,23 @@
+--- Python-2.4.2/Lib/distutils/sysconfig.py 2005-01-06 15:16:03.000000000 -0800
++++ Python-2.4.2-new/Lib/distutils/sysconfig.py 2006-08-24 05:33:41.133317000 -0700
+@@ -149,16 +149,10 @@
+ (cc, cxx, opt, basecflags, ccshared, ldshared, so_ext) = \
+ get_config_vars('CC', 'CXX', 'OPT', 'BASECFLAGS', 'CCSHARED', 'LDSHARED', 'SO')
+
+- if os.environ.has_key('CC'):
+- cc = os.environ['CC']
+- if os.environ.has_key('CXX'):
+- cxx = os.environ['CXX']
+- if os.environ.has_key('LDSHARED'):
+- ldshared = os.environ['LDSHARED']
+- if os.environ.has_key('CPP'):
+- cpp = os.environ['CPP']
+- else:
+- cpp = cc + " -E" # not always
++ # On Solaris, we must always use pycc/pyCC, which will then look up
++ # $CC and $CXX
++ cpp = cc + " -E"
++
+ if os.environ.has_key('LDFLAGS'):
+ ldshared = ldshared + ' ' + os.environ['LDFLAGS']
+ if basecflags:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/Python-04-distutils-log.diff Mon Sep 18 23:09:23 2006 +0000
@@ -0,0 +1,29 @@
+--- Python-2.4.2/Lib/distutils/spawn.py 2004-11-10 14:23:14.000000000 -0800
++++ Python-2.4.2-new/Lib/distutils/spawn.py 2006-08-22 08:33:41.430344000 -0700
+@@ -73,7 +73,7 @@
+ if search_path:
+ # either we find one or it stays the same
+ executable = find_executable(executable) or executable
+- log.info(string.join([executable] + cmd[1:], ' '))
++ log.info("%s", string.join([executable] + cmd[1:], ' '))
+ if not dry_run:
+ # spawn for NT requires a full path to the .exe
+ try:
+@@ -98,7 +98,7 @@
+ if search_path:
+ # either we find one or it stays the same
+ executable = find_executable(executable) or executable
+- log.info(string.join([executable] + cmd[1:], ' '))
++ log.info("%s", string.join([executable] + cmd[1:], ' '))
+ if not dry_run:
+ # spawnv for OS/2 EMX requires a full path to the .exe
+ try:
+@@ -119,7 +119,7 @@
+ verbose=0,
+ dry_run=0):
+
+- log.info(string.join(cmd, ' '))
++ log.info("%s", string.join(cmd, ' '))
+ if dry_run:
+ return
+ exec_fn = search_path and os.execvp or os.execv
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/Python-05-isalibs.diff Mon Sep 18 23:09:23 2006 +0000
@@ -0,0 +1,443 @@
+--- Python-2.4.2/Python/import.c Wed Sep 14 11:15:03 2005
++++ Python-2.4.2-new/Python/import.c Tue Aug 29 17:06:36 2006
+@@ -702,8 +702,9 @@
+ }
+ pyc_mtime = PyMarshal_ReadLongFromFile(fp);
+ if (pyc_mtime != mtime) {
+- if (Py_VerboseFlag)
+- PySys_WriteStderr("# %s has bad mtime\n", cpathname);
++ /*if (Py_VerboseFlag) */
++ PySys_WriteStderr("# %s has bad mtime %lu vs %lu\n",
++cpathname, mtime, pyc_mtime);
+ fclose(fp);
+ return NULL;
+ }
+@@ -1058,6 +1059,57 @@
+ static int find_init_module(char *); /* Forward */
+ static struct filedescr importhookdescr = {"", "", IMP_HOOK};
+
++#ifdef HAVE_STAT
++static char *
++insert_64dir(char *buf, size_t buflen)
++{
++ char *base;
++ char *cp;
++ size_t blen;
++
++ if ((blen = strlen(buf)) == 0)
++ return (NULL);
++
++ cp = &buf[blen - 1];
++ while (cp != buf && *cp != SEP)
++ cp--;
++
++ if (cp != buf)
++ cp++;
++
++ if (blen + strlen("64/") + 1 >= buflen)
++ return NULL;
++
++ base = strdup(cp);
++ sprintf(cp, "64%c%s", SEP, base);
++ free(base);
++
++ return buf;
++}
++
++/*
++ * If we're on a 64-bit platform, modify lookups for shared object files.
++ */
++static size_t modify_path(struct filedescr *fdp, char *buf, size_t buflen)
++{
++ struct stat statbuf;
++
++ if (sizeof(void *) != 8)
++ return 0;
++
++ if (stat(buf, &statbuf) == 0 && S_ISDIR(statbuf.st_mode))
++ return 0;
++
++ if (fdp->type != C_EXTENSION)
++ return 0;
++
++ if (insert_64dir(buf, buflen) == NULL)
++ return 0;
++
++ return strlen("64/");
++}
++#endif
++
+ static struct filedescr *
+ find_module(char *fullname, char *subname, PyObject *path, char *buf,
+ size_t buflen, FILE **p_fp, PyObject **p_loader)
+@@ -1075,11 +1127,10 @@
+ static struct filedescr fd_builtin = {"", "", C_BUILTIN};
+ static struct filedescr fd_package = {"", "", PKG_DIRECTORY};
+ char name[MAXPATHLEN+1];
+-#if defined(PYOS_OS2)
+ size_t saved_len;
+ size_t saved_namelen;
+ char *saved_buf = NULL;
+-#endif
++
+ if (p_loader != NULL)
+ *p_loader = NULL;
+
+@@ -1269,7 +1320,7 @@
+ }
+ #endif
+ #endif
+-#if defined(PYOS_OS2)
++
+ /* take a snapshot of the module spec for restoration
+ * after the 8 character DLL hackery
+ */
+@@ -1276,8 +1327,12 @@
+ saved_buf = strdup(buf);
+ saved_len = len;
+ saved_namelen = namelen;
+-#endif /* PYOS_OS2 */
++
+ for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) {
++#ifdef HAVE_STAT
++ len += modify_path(fdp, buf, buflen);
++#endif
++
+ #if defined(PYOS_OS2)
+ /* OS/2 limits DLLs to 8 character names (w/o
+ extension)
+@@ -1318,14 +1373,12 @@
+ fp = NULL;
+ }
+ }
+-#if defined(PYOS_OS2)
++
+ /* restore the saved snapshot */
+ strcpy(buf, saved_buf);
+ len = saved_len;
+ namelen = saved_namelen;
+-#endif
+ }
+-#if defined(PYOS_OS2)
+ /* don't need/want the module name snapshot anymore */
+ if (saved_buf)
+ {
+@@ -1332,7 +1385,6 @@
+ free(saved_buf);
+ saved_buf = NULL;
+ }
+-#endif
+ Py_XDECREF(copy);
+ if (fp != NULL)
+ break;
+--- Python-2.4.2/Lib/distutils/command/build_ext.py Wed Nov 10 14:23:15 2004
++++ Python-2.4.2-new/Lib/distutils/command/build_ext.py Thu Aug 24 18:22:44 2006
+@@ -614,7 +614,13 @@
+ so_ext = get_config_var('SO')
+ if os.name == 'nt' and self.debug:
+ return apply(os.path.join, ext_path) + '_d' + so_ext
+- return apply(os.path.join, ext_path) + so_ext
++ # .so extensions are word-size specific
++ path = apply(os.path.join, ext_path)
++ if sys.maxint == 2147483647L:
++ return path + so_ext
++ dirname = os.path.dirname(path);
++ basename = os.path.basename(path);
++ return os.path.join(dirname, "64", basename + so_ext)
+
+ def get_export_symbols (self, ext):
+ """Return the list of symbols that a shared extension has to
+No differences encountered
+No differences encountered
+No differences encountered
+--- Python-2.4.2/Python/importdl.h Mon Dec 30 14:08:05 2002
++++ Python-2.4.2-new/Python/importdl.h Thu Aug 24 17:43:33 2006
+@@ -31,8 +31,9 @@
+ extern PyObject *_PyImport_LoadDynamicModule(char *name, char *pathname,
+ FILE *);
+
+-/* Max length of module suffix searched for -- accommodates "module.slb" */
+-#define MAXSUFFIXSIZE 12
++/* Max length of module suffix searched for -- accommodates "module.slb"
++ and "64/" */
++#define MAXSUFFIXSIZE 15
+
+ #ifdef MS_WINDOWS
+ #include <windows.h>
+--- Python-2.4.2/configure.in Sun Aug 7 14:08:53 2005
++++ Python-2.4.2-new/configure.in Tue Aug 22 19:06:04 2006
+@@ -14,8 +14,36 @@
+ AH_TOP([
+ #ifndef Py_PYCONFIG_H
+ #define Py_PYCONFIG_H
++
+ ])
+ AH_BOTTOM([
++
++#include <sys/isa_defs.h>
++
++/*
++ * Python originally defined these statically, which prevents a 32-64 python
++ * from working at all.
++ */
++
++#define SIZEOF_SHORT 2
++#define SIZEOF_INT 4
++#define SIZEOF_LONG_LONG 8
++#define SIZEOF_FPOS_T 8
++#define SIZEOF_OFF_T 8
++#define SIZEOF_PTHREAD_T 4
++
++#ifdef _LP64
++#define SIZEOF_LONG 8
++#define SIZEOF_UINTPTR_T 8
++#define SIZEOF_VOID_P 8
++#define SIZEOF_TIME_T 8
++#else
++#define SIZEOF_LONG 4
++#define SIZEOF_UINTPTR_T 4
++#define SIZEOF_VOID_P 4
++#define SIZEOF_TIME_T 4
++#endif
++
+ /* Define the macros needed if on a UnixWare 7.x system. */
+ #if defined(__USLC__) && defined(__SCO_VERSION__)
+ #define STRICT_SYSV_CURSES /* Don't use ncurses extensions */
+@@ -56,6 +84,26 @@
+
+ define_xopen_source=yes
+
++# AC_CHECK_SIZEOF without the AC_DEFINE_UNQUOTED
++AC_DEFUN([PY_CHECK_SIZEOF],
++[AS_LITERAL_IF([$1], [],
++ [AC_FATAL([$0: requires literal arguments])])dnl
++AC_CHECK_TYPE([$1], [], [], [$3])
++AC_CACHE_CHECK([size of $1], AS_TR_SH([ac_cv_sizeof_$1]),
++[if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then
++ # The cast to unsigned long works around a bug in the HP C Compiler
++ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++ # This bug is HP SR number 8606223364.
++ _AC_COMPUTE_INT([(long) (sizeof ($1))],
++ [AS_TR_SH([ac_cv_sizeof_$1])],
++ [AC_INCLUDES_DEFAULT([$3])],
++ [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])])
++else
++ AS_TR_SH([ac_cv_sizeof_$1])=0
++fi])dnl
++])# PY_CHECK_SIZEOF
++
+ # Arguments passed to configure.
+ AC_SUBST(CONFIG_ARGS)
+ CONFIG_ARGS="$ac_configure_args"
+@@ -1064,15 +1112,8 @@
+ AC_TYPE_SIZE_T
+ AC_TYPE_UID_T
+
+-# Sizes of various common basic types
+-# ANSI C requires sizeof(char) == 1, so no need to check it
+-AC_CHECK_SIZEOF(int, 4)
+-AC_CHECK_SIZEOF(long, 4)
+-AC_CHECK_SIZEOF(void *, 4)
+-AC_CHECK_SIZEOF(short, 2)
+-AC_CHECK_SIZEOF(float, 4)
+-AC_CHECK_SIZEOF(double, 8)
+-AC_CHECK_SIZEOF(fpos_t, 4)
++PY_CHECK_SIZEOF(short)
++PY_CHECK_SIZEOF(long)
+
+ AC_MSG_CHECKING(for long long support)
+ have_long_long=no
+@@ -1081,9 +1122,6 @@
+ have_long_long=yes
+ ])
+ AC_MSG_RESULT($have_long_long)
+-if test "$have_long_long" = yes ; then
+-AC_CHECK_SIZEOF(long long, 8)
+-fi
+
+ AC_MSG_CHECKING(for uintptr_t support)
+ have_uintptr_t=no
+@@ -1092,101 +1130,21 @@
+ have_uintptr_t=yes
+ ])
+ AC_MSG_RESULT($have_uintptr_t)
+-if test "$have_uintptr_t" = yes ; then
+-AC_CHECK_SIZEOF(uintptr_t, 4)
+-fi
+
+-# Hmph. AC_CHECK_SIZEOF() doesn't include <sys/types.h>.
+-AC_MSG_CHECKING(size of off_t)
+-AC_CACHE_VAL(ac_cv_sizeof_off_t,
+-[AC_TRY_RUN([#include <stdio.h>
++PY_CHECK_SIZEOF(off_t,4,[
++#include <stdio.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+-main()
+-{
+- FILE *f=fopen("conftestval", "w");
+- if (!f) exit(1);
+- fprintf(f, "%d\n", sizeof(off_t));
+- exit(0);
+-}],
+-ac_cv_sizeof_off_t=`cat conftestval`,
+-ac_cv_sizeof_off_t=0,
+-ac_cv_sizeof_off_t=4)
+ ])
+-AC_MSG_RESULT($ac_cv_sizeof_off_t)
+-AC_DEFINE_UNQUOTED(SIZEOF_OFF_T, $ac_cv_sizeof_off_t,
+-[The number of bytes in an off_t.])
+
+ AC_MSG_CHECKING(whether to enable large file support)
+-if test "$have_long_long" = yes -a \
+- "$ac_cv_sizeof_off_t" -gt "$ac_cv_sizeof_long" -a \
+- "$ac_cv_sizeof_long_long" -ge "$ac_cv_sizeof_off_t"; then
+- AC_DEFINE(HAVE_LARGEFILE_SUPPORT, 1,
+- [Defined to enable large file support when an off_t is bigger than a long
+- and long long is available and at least as big as an off_t. You may need
+- to add some flags for configuration and compilation to enable this mode.
+- (For Solaris and Linux, the necessary defines are already defined.)])
+- AC_MSG_RESULT(yes)
+-else
+- AC_MSG_RESULT(no)
+-fi
++AC_DEFINE(HAVE_LARGEFILE_SUPPORT, 1,
++[Defined to enable large file support when an off_t is bigger than a long
++ and long long is available and at least as big as an off_t. You may need
++ to add some flags for configuration and compilation to enable this mode.
++ (For Solaris and Linux, the necessary defines are already defined.)])
++AC_MSG_RESULT(yes)
+
+-# AC_CHECK_SIZEOF() doesn't include <time.h>.
+-AC_MSG_CHECKING(size of time_t)
+-AC_CACHE_VAL(ac_cv_sizeof_time_t,
+-[AC_TRY_RUN([#include <stdio.h>
+-#include <time.h>
+-main()
+-{
+- FILE *f=fopen("conftestval", "w");
+- if (!f) exit(1);
+- fprintf(f, "%d\n", sizeof(time_t));
+- exit(0);
+-}],
+-ac_cv_sizeof_time_t=`cat conftestval`,
+-ac_cv_sizeof_time_t=0,
+-ac_cv_sizeof_time_t=4)
+-])
+-AC_MSG_RESULT($ac_cv_sizeof_time_t)
+-AC_DEFINE_UNQUOTED(SIZEOF_TIME_T, $ac_cv_sizeof_time_t,
+-[The number of bytes in a time_t.])
+-
+-
+-# if have pthread_t then define SIZEOF_PTHREAD_T
+-ac_save_cc="$CC"
+-if test "$ac_cv_kpthread" = "yes"
+-then CC="$CC -Kpthread"
+-elif test "$ac_cv_kthread" = "yes"
+-then CC="$CC -Kthread"
+-elif test "$ac_cv_pthread" = "yes"
+-then CC="$CC -pthread"
+-fi
+-AC_MSG_CHECKING(for pthread_t)
+-have_pthread_t=no
+-AC_TRY_COMPILE([#include <pthread.h>], [pthread_t x; x = *(pthread_t*)0;], have_pthread_t=yes)
+-AC_MSG_RESULT($have_pthread_t)
+-if test "$have_pthread_t" = yes ; then
+- # AC_CHECK_SIZEOF() doesn't include <pthread.h>.
+- AC_MSG_CHECKING(size of pthread_t)
+- AC_CACHE_VAL(ac_cv_sizeof_pthread_t,
+- [AC_TRY_RUN([#include <stdio.h>
+-#include <pthread.h>
+- main()
+- {
+- FILE *f=fopen("conftestval", "w");
+- if (!f) exit(1);
+- fprintf(f, "%d\n", sizeof(pthread_t));
+- exit(0);
+- }],
+- ac_cv_sizeof_pthread_t=`cat conftestval`,
+- ac_cv_sizeof_pthread_t=0,
+- ac_cv_sizeof_pthread_t=4)
+- ])
+- AC_MSG_RESULT($ac_cv_sizeof_pthread_t)
+- AC_DEFINE_UNQUOTED(SIZEOF_PTHREAD_T, $ac_cv_sizeof_pthread_t,
+- [The number of bytes in a pthread_t.])
+-fi
+-CC="$ac_save_cc"
+-
+ AC_MSG_CHECKING(for --enable-toolbox-glue)
+ AC_ARG_ENABLE(toolbox-glue,
+ AC_HELP_STRING(--enable-toolbox-glue, disable/enable MacOSX glue code for extensions))
+@@ -1408,10 +1366,6 @@
+ if test -z "$CCSHARED"
+ then
+ case $ac_sys_system/$ac_sys_release in
+- SunOS*) if test "$GCC" = yes;
+- then CCSHARED="-fPIC";
+- else CCSHARED="-xcode=pic32";
+- fi;;
+ hp*|HP*) if test "$GCC" = yes;
+ then CCSHARED="-fPIC";
+ else CCSHARED="+z";
+@@ -2705,12 +2663,6 @@
+ wchar_h="no"
+ )
+
+-# determine wchar_t size
+-if test "$wchar_h" = yes
+-then
+- AC_CHECK_SIZEOF(wchar_t, 4, [#include <wchar.h>])
+-fi
+-
+ AC_MSG_CHECKING(for UCS-4 tcl)
+ have_ucs4_tcl=no
+ AC_TRY_COMPILE([
+@@ -2740,6 +2692,11 @@
+ ac_cv_wchar_t_signed=no,
+ ac_cv_wchar_t_signed=yes)])
+ AC_MSG_RESULT($ac_cv_wchar_t_signed)
++
++ PY_CHECK_SIZEOF(wchar_t, 4, [
++ #include <wchar.h>
++ #include <stdlib.h
++ ])
+ fi
+
+ AC_MSG_CHECKING(what type to use for unicode)
+--- Python-2.4.2/Makefile.pre.in Mon Mar 28 15:23:01 2005
++++ Python-2.4.2-new/Makefile.pre.in Tue Aug 22 17:45:05 2006
+@@ -79,7 +79,7 @@
+
+ # Expanded directories
+ BINDIR= $(exec_prefix)/bin
+-LIBDIR= $(exec_prefix)/lib
++LIBDIR= @libdir@
+ MANDIR= @mandir@
+ INCLUDEDIR= @includedir@
+ CONFINCLUDEDIR= $(exec_prefix)/include
+@@ -86,11 +86,11 @@
+ SCRIPTDIR= $(prefix)/lib
+
+ # Detailed destination directories
+-BINLIBDEST= $(LIBDIR)/python$(VERSION)
+-LIBDEST= $(SCRIPTDIR)/python$(VERSION)
+-INCLUDEPY= $(INCLUDEDIR)/python$(VERSION)
+-CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(VERSION)
+-LIBP= $(LIBDIR)/python$(VERSION)
++BINLIBDEST= $(exec_prefix)/lib/python$(VERSION)
++LIBDEST= $(SCRIPTDIR)/python$(VERSION)
++INCLUDEPY= $(INCLUDEDIR)/python$(VERSION)
++CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(VERSION)
++LIBP= $(exec_prefix)/lib/python$(VERSION)
+
+ # Symbols used for using shared libraries
+ SO= @SO@
+@@ -747,6 +747,7 @@
+
+ # Install the include files
+ INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
++
+ inclinstall:
+ @for i in $(INCLDIRSTOMAKE); \
+ do \
--- a/pygtk2.spec Mon Sep 18 20:39:51 2006 +0000
+++ b/pygtk2.spec Mon Sep 18 23:09:23 2006 +0000
@@ -61,14 +61,6 @@
%build
autoconf
-%ifos solaris
-# Disable optimizations on x86 to workaround compiler bug 6382078.
-%ifarch sparc
-CFLAGS="$RPM_OPT_FLAGS" \
-%else
-CFLAGS="$RPM_OPT_FLAGS -xO0" \
-%endif
-%endif
./configure --prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir}
make
@@ -102,52 +94,39 @@
%{_datadir}/pygtk/*
%changelog -n pygtk2
+* Sat Sep 9 2006 - [email protected]
+- re-enable optimisation as the compiler bug that prevented it has been fixed
* Tue Sep 05 2006 - [email protected]
- Bump to 2.10.1.
-
* Mon Aug 28 2006 - [email protected]
- Bump to 2.9.6 really
-
* Tue Aug 08 2006 - [email protected]
- Bump to 2.9.6.
-
* Tue Aug 08 2006 - [email protected]
- Bump to 2.9.5.
-
* Mon Aug 07 2006 - [email protected]
- Bump to 2.9.4.
-
* Fri Jul 21 2006 - [email protected]
- Bump to 2.9.3.
-
* Tue Apr 4 2006 - [email protected]
- Bump to 2.9.0.
-
* Fri Mar 31 2006 - [email protected]
- Bump to 2.8.5.
-
* Wed Feb 15 2006 - [email protected]
- Disable optimizations on x86 to workaround compiler bug 6382078.
-
* Sun Jan 15 2006 - [email protected]
- Bump to 2.8.4
-
* Tue Dec 20 2005 - [email protected]
- Bump to 2.8.2
-
* Thu Oct 27 2005 - [email protected]
- add patch uninstalled.pc.diff so the pygtk can be included in the same
Solaris pkg as gnome-python
- move from site-packages to vendor-packages
-
* Tue Sep 27 2005 - [email protected]
- Bump to 2.7.4.
-
* Thu Aug 25 2005 [email protected]
- Adjusted the defattr lines to have three parameters, not four.
-
* Tue Aug 16 2005 - [email protected]
- Bump to 2.7.3.
-
* Mon Aug 04 2003 - [email protected]
- Initial Sun release