r36444 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r36443‎ \| r36444 \| r36445 >
Date:	06:51, 19 June 2008
Author:	river
Status:	old
Tags:
Comment:	spec files for toolserver solaris packages
Modified paths:	/trunk/tools/ts-specs/.pkgtoolrc (added) (history) /trunk/tools/ts-specs/TSbdb.spec (added) (history) /trunk/tools/ts-specs/TScoreutils.spec (added) (history) /trunk/tools/ts-specs/TSgdbm.spec (added) (history) /trunk/tools/ts-specs/TSjoe.spec (added) (history) /trunk/tools/ts-specs/TSmutt.spec (added) (history) /trunk/tools/ts-specs/TSneon.spec (added) (history) /trunk/tools/ts-specs/TSrsync.spec (added) (history) /trunk/tools/ts-specs/TSslang.spec (added) (history) /trunk/tools/ts-specs/TSsubversion.spec (added) (history) /trunk/tools/ts-specs/TSvim.spec (added) (history) /trunk/tools/ts-specs/ext-sources (added) (history) /trunk/tools/ts-specs/ext-sources/default-copyright.txt (added) (history) /trunk/tools/ts-specs/include (added) (history) /trunk/tools/ts-specs/include/CC-wrapper (added) (history) /trunk/tools/ts-specs/include/Solaris.inc (added) (history) /trunk/tools/ts-specs/include/arch64.inc (added) (history) /trunk/tools/ts-specs/include/base.inc (added) (history) /trunk/tools/ts-specs/include/byteswap-compat.h (added) (history) /trunk/tools/ts-specs/include/default-depend.inc (added) (history) /trunk/tools/ts-specs/include/endian-compat.h (added) (history) /trunk/tools/ts-specs/include/gconf-install.script (added) (history) /trunk/tools/ts-specs/include/opt-gnu.inc (added) (history) /trunk/tools/ts-specs/include/options.inc (added) (history) /trunk/tools/ts-specs/include/perl-depend.inc (added) (history) /trunk/tools/ts-specs/include/prod.inc (added) (history) /trunk/tools/ts-specs/include/x86_sse2.inc (added) (history) /trunk/tools/ts-specs/patches (added) (history) /trunk/tools/ts-specs/patches/coreutils-01-configure.diff (added) (history) /trunk/tools/ts-specs/patches/gdbm-01-fixmake.diff (added) (history) /trunk/tools/ts-specs/patches/mutt-01-makefile.diff (added) (history)

Diff [purge]

Index: trunk/tools/ts-specs/TSbdb.spec
—	—	@@ -0,0 +1,67 @@
	2	+#
	3	+# spec file for package TSbdb
	4	+#
	5	+# includes module(s): bdb
	6	+#
	7	+%include Solaris.inc
	8	+
	9	+Name: TSbdb
	10	+Summary: Berkeley DB
	11	+Version: 4.5.20
	12	+Source: http://download-west.oracle.com/berkeley-db/db-%{version}.tar.gz
	13	+URL: http://www.oracle.com/technology/software/products/berkeley-db/index.html
	14	+SUNW_BaseDir: %{_basedir}
	15	+BuildRoot: %{_tmppath}/%{name}-%{version}-build
	16	+%include default-depend.inc
	17	+
	18	+%prep
	19	+%setup -q -n db-%version
	20	+
	21	+%build
	22	+CPUS=`/usr/sbin/psrinfo \| grep on-line \| wc -l \| tr -d ' '`
	23	+if test "x$CPUS" = "x" -o $CPUS = 0; then
	24	+ CPUS=1
	25	+fi
	26	+export CFLAGS="%optflags"
	27	+export LDFLAGS="%{_ldflags}"
	28	+cd build_unix
	29	+../dist/configure \
	30	+ --prefix=%{_prefix} \
	31	+ --libexecdir=%{_libexecdir} \
	32	+ --mandir=%{_mandir} \
	33	+ --datadir=%{_datadir} \
	34	+ --infodir=%{_datadir}/info
	35	+
	36	+gmake -j$CPUS
	37	+
	38	+%install
	39	+rm -rf $RPM_BUILD_ROOT
	40	+cd build_unix
	41	+make install DESTDIR=$RPM_BUILD_ROOT
	42	+#rm $RPM_BUILD_ROOT%{_libdir}/*.la
	43	+#rm $RPM_BUILD_ROOT%{_libdir}/*.a
	44	+mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/doc
	45	+mv $RPM_BUILD_ROOT%{_prefix}/docs $RPM_BUILD_ROOT%{_prefix}/share/doc/bdb
	46	+
	47	+%clean
	48	+rm -rf $RPM_BUILD_ROOT
	49	+
	50	+%files
	51	+%defattr (-, root, bin)
	52	+%dir %attr (0755, root, bin) %{_bindir}
	53	+%{_bindir}/db*
	54	+%dir %attr (0755, root, bin) %{_libdir}
	55	+%{_libdir}/libdb*
	56	+%dir %attr (0755, root, bin) %{_includedir}
	57	+%{_includedir}/*
	58	+%dir %attr (0755, root, sys) %{_datadir}
	59	+%dir %attr (0755, root, other) %{_datadir}/doc
	60	+%{_datadir}/doc/*
	61	+
	62	+%changelog
	63	+* Thu Jun 19 2008 - river@wikimedia.org
	64	+- modified for toolserver
	65	+* Fri Jan 05 2007 - daymobrew@users.sourceforge.net
	66	+- Add URL.
	67	+* Tue Nov 07 2006 - glynn.foster@sun.com
	68	+- Initial spec file
Index: trunk/tools/ts-specs/patches/mutt-01-makefile.diff
—	—	@@ -0,0 +1,11 @@
	2	+--- Makefile.in.old Sat May 17 22:03:43 2008
	3	+@@ -1030,7 +1030,7 @@
	4	+ $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
	5	+ $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/mime.types.dist
	6	+ -if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \
	7	+- $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \
	8	++ $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/mime.types.mutt; \
	9	+ fi
	10	+
	11	+ uninstall-local:
Index: trunk/tools/ts-specs/patches/coreutils-01-configure.diff
—	—	@@ -0,0 +1,20 @@
	2	+--- configure.old Thu Jun 19 06:22:49 2008
	3	+@@ -70407,7 +70407,7 @@
	4	+ v=EXTRA_PROGRAMS
	5	+ for gl_i in `sed -n '/^'$v' =/,/[^\]$/p' $mk \
	6	+ \| sed 's/^ //;/^\$./d;/^'$v' =/d' \
	7	+- \| tr -s '\\015\\012\\\\' ' '`; do
	8	++ \| tr -s '\\015\\012\\\\' ' '`; do
	9	+ {
	10	+ if test -z "$optional_bin_progs"; then
	11	+ optional_bin_progs=$gl_i
	12	+@@ -70546,7 +70546,7 @@
	13	+
	14	+ # Change ginstall.1 to "install.h" in $MAN.
	15	+ MAN=`for m in $MAN; do test $m = ginstall.1 && m=install.1; echo $m; done \
	16	+- \| tr '\015\012' ' '; echo`
	17	++ \| tr '\015\012' ' '; echo`
	18	+
	19	+ # Remove [.1, since writing a portable rule for it in man/Makefile.am
	20	+ # is not practical. The sed LHS below uses the autoconf quadrigraph
Index: trunk/tools/ts-specs/patches/gdbm-01-fixmake.diff
—	—	@@ -0,0 +1,29 @@
	2	+--- gdbm-1.8.3/Makefile.in-orig 2006-03-09 13:45:34.237463000 -0800
	3	+@@ -131,11 +131,11 @@ install: libgdbm.la gdbm.h gdbm.info
	4	+ $(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \
	5	+ $(INSTALL_ROOT)$(infodir)
	6	+ $(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la
	7	+- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \
	8	++ $(INSTALL_DATA) gdbm.h \
	9	+ $(INSTALL_ROOT)$(includedir)/gdbm.h
	10	+- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \
	11	++ $(INSTALL_DATA) $(srcdir)/gdbm.3 \
	12	+ $(INSTALL_ROOT)$(man3dir)/gdbm.3
	13	+- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \
	14	++ $(INSTALL_DATA) $(srcdir)/gdbm.info \
	15	+ $(INSTALL_ROOT)$(infodir)/gdbm.info
	16	+
	17	+ install-compat:
	18	+@@ -143,9 +143,9 @@ install-compat:
	19	+ $(INSTALL_ROOT)$(includedir)
	20	+ $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \
	21	+ $(INSTALL_ROOT)$(libdir)/libgdbm_compat.la
	22	+- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \
	23	++ $(INSTALL_DATA) $(srcdir)/dbm.h \
	24	+ $(INSTALL_ROOT)$(includedir)/dbm.h
	25	+- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \
	26	++ $(INSTALL_DATA) $(srcdir)/ndbm.h \
	27	+ $(INSTALL_ROOT)$(includedir)/ndbm.h
	28	+
	29	+ #libgdbm.a: $(OBJS) gdbm.h
Index: trunk/tools/ts-specs/TScoreutils.spec
—	—	@@ -0,0 +1,137 @@
	2	+#
	3	+# spec file for package TScoreutils
	4	+#
	5	+# includes module(s): GNU coreutils
	6	+#
	7	+
	8	+%include Solaris.inc
	9	+%include opt-gnu.inc
	10	+
	11	+%define _prefix /opt/gnu
	12	+
	13	+Name: TScoreutils
	14	+Summary: GNU coreutils - basic file, shell and text manipulation utilities
	15	+Version: 6.12
	16	+Source: http://ftp.gnu.org/pub/gnu/coreutils/coreutils-%{version}.tar.gz
	17	+Patch1: coreutils-01-configure.diff
	18	+SUNW_BaseDir: %{_basedir}
	19	+BuildRoot: %{_tmppath}/%{name}-%{version}-build
	20	+%include default-depend.inc
	21	+BuildConflicts: SUNWgnu-coreutils
	22	+Requires: SUNWlibms
	23	+Requires: SUNWtexi
	24	+Requires: SUNWpostrun
	25	+Requires: SUNWuiu8
	26	+
	27	+
	28	+%if %build_l10n
	29	+%package l10n
	30	+Summary: %{summary} - l10n files
	31	+SUNW_BaseDir: %{_basedir}
	32	+%include default-depend.inc
	33	+Requires: %{name}
	34	+%endif
	35	+
	36	+%prep
	37	+%setup -q -n coreutils-%version
	38	+%patch1 -p0
	39	+
	40	+%build
	41	+CPUS=`/usr/sbin/psrinfo \| grep on-line \| wc -l \| tr -d ' '`
	42	+if test "x$CPUS" = "x" -o $CPUS = 0; then
	43	+ CPUS=1
	44	+fi
	45	+
	46	+# export PATH=/usr/bin:$PATH
	47	+export CC="cc"
	48	+export CXX="CC"
	49	+export CFLAGS="%optflags"
	50	+export LDFLAGS="%_ldflags"
	51	+export LIBS="-lm"
	52	+
	53	+./configure --prefix=%{_prefix} \
	54	+ --mandir=%{_mandir} \
	55	+ --infodir=%{_infodir}
	56	+
	57	+gmake -j$CPUS
	58	+
	59	+%install
	60	+rm -rf $RPM_BUILD_ROOT
	61	+make install DESTDIR=$RPM_BUILD_ROOT
	62	+
	63	+cd $RPM_BUILD_ROOT%{_prefix}
	64	+ln -s share/man man
	65	+
	66	+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
	67	+
	68	+%if %build_l10n
	69	+%else
	70	+# REMOVE l10n FILES
	71	+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
	72	+%endif
	73	+
	74	+%clean
	75	+rm -rf $RPM_BUILD_ROOT
	76	+
	77	+%post
	78	+( echo 'PATH=/usr/bin:/usr/sfw/bin; export PATH' ;
	79	+ echo 'infos="';
	80	+ echo 'coreutils.info' ;
	81	+ echo '"';
	82	+ echo 'retval=0';
	83	+ echo 'for info in $infos; do';
	84	+ echo ' install-info --info-dir=%{_infodir} %{_infodir}/$info \|\| retval=1';
	85	+ echo 'done';
	86	+ echo 'exit $retval' ) \| $PKG_INSTALL_ROOT/usr/lib/postrun -b -c TS
	87	+
	88	+%preun
	89	+( echo 'PATH=/usr/bin:/usr/sfw/bin; export PATH' ;
	90	+ echo 'infos="';
	91	+ echo 'coreutils.info' ;
	92	+ echo '"';
	93	+ echo 'for info in $infos; do';
	94	+ echo ' install-info --info-dir=%{_infodir} --delete %{_infodir}/$info';
	95	+ echo 'done';
	96	+ echo 'exit 0' ) \| $PKG_INSTALL_ROOT/usr/lib/postrun -b -c TS
	97	+
	98	+%files
	99	+%defattr (-, root, bin)
	100	+%dir %attr (0755, root, bin) %{_prefix}
	101	+%{_prefix}/man
	102	+%dir %attr (0755, root, bin) %{_bindir}
	103	+%{_bindir}/*
	104	+%dir %attr (0755, root, bin) %{_libdir}
	105	+%{_libdir}/*
	106	+%dir %attr(0755, root, sys) %{_datadir}
	107	+%dir %attr(0755, root, bin) %{_mandir}
	108	+%dir %attr(0755, root, bin) %{_mandir}/man1
	109	+%{_mandir}/man1/*
	110	+%dir %attr(0755, root, bin) %{_infodir}
	111	+%{_infodir}/*
	112	+
	113	+%if %build_l10n
	114	+%files l10n
	115	+%defattr (-, root, bin)
	116	+%dir %attr (0755, root, sys) %{_datadir}
	117	+%attr (-, root, other) %{_datadir}/locale
	118	+%endif
	119	+
	120	+%changelog
	121	+* Thu Jun 19 2008 - river@wikimedia.org
	122	+- modified for toolserver
	123	+* Sun Nov 18 2007 - daymobrew@users.sourceforge.net
	124	+- Add BuildConflicts SUNWgnu-coreutils, a package that is available on Indiana
	125	+ systems.
	126	+* Fri Jul 13 2007 - dougs@truemail.co.th
	127	+- Bump to 6.9
	128	+* Sat Apr 21 2007 - dougs@truemail.co.th
	129	+- Use gmake rather than /usr/bin/make
	130	+* Mon Jan 15 2007 - daymobrew@users.sourceforge.net
	131	+- Add SUNWtexi dependency.
	132	+* Sat Jan 6 2007 - laca@sun.com
	133	+- update for latest /usr/gnu proposal
	134	+- add postrun script for updating info dir
	135	+* Fri Jan 05 2007 - daymobrew@users.sourceforge.net
	136	+- Bump to 6.7.
	137	+* Tue Jun 27 2006 - laca@sun.com
	138	+- Initial spec
Index: trunk/tools/ts-specs/TSgdbm.spec
—	—	@@ -0,0 +1,88 @@
	2	+#
	3	+# spec file for package TSgdbm
	4	+#
	5	+# includes module(s): gdbm
	6	+#
	7	+
	8	+%include Solaris.inc
	9	+
	10	+Name: TSgdbm
	11	+Summary: GNU Database Routines
	12	+Group: libraries/database
	13	+Version: 1.8.3
	14	+License: GPL
	15	+Group: Development/Libraries/C and C++
	16	+Release: 1
	17	+BuildRoot: %{_tmppath}/gdbm-%{version}-build
	18	+Source0: http://ftp.gnu.org/gnu/gdbm/gdbm-%{version}.tar.gz
	19	+URL: http://directory.fsf.org/gdbm.html
	20	+Patch1: gdbm-01-fixmake.diff
	21	+SUNW_BaseDir: %{_basedir}
	22	+%include default-depend.inc
	23	+
	24	+%description
	25	+GNU database routines
	26	+
	27	+%package devel
	28	+Summary: %{summary} - development files
	29	+SUNW_BaseDir: %{_basedir}
	30	+%include default-depend.inc
	31	+Requires: %name
	32	+
	33	+%prep
	34	+%setup -q -n gdbm-%version
	35	+%patch1 -p1
	36	+
	37	+%build
	38	+export CC="cc"
	39	+export CXX="CC"
	40	+export CFLAGS="%optflags"
	41	+export LDFLAGS="%_ldflags"
	42	+
	43	+CFLAGS="$CFLAGS $RPM_OPT_FLAGS" \
	44	+ ./configure \
	45	+ --prefix=%{_prefix} \
	46	+ --infodir=%{_datadir}/info \
	47	+ --mandir=%{_mandir} \
	48	+ --libdir=%{_libdir} \
	49	+ --disable-static
	50	+
	51	+%install
	52	+rm -rf $RPM_BUILD_ROOT
	53	+gmake INSTALL_ROOT=$RPM_BUILD_ROOT install
	54	+
	55	+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
	56	+
	57	+%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
	58	+
	59	+%clean
	60	+rm -rf $RPM_BUILD_ROOT
	61	+
	62	+%files
	63	+%defattr (-, root, bin)
	64	+%dir %attr (0755, root, bin) %{_libdir}
	65	+%{_libdir}/lib.so
	66	+%dir %attr (0755, root, sys) %{_datadir}
	67	+%dir %attr (0755, root, bin) %{_datadir}/info
	68	+%{_datadir}/info/*
	69	+
	70	+%files devel
	71	+%defattr (-, root, bin)
	72	+%dir %attr (0755, root, bin) %{_includedir}
	73	+%{_includedir}/*
	74	+%dir %attr (0755, root, sys) %{_datadir}
	75	+%dir %attr(0755, root, bin) %{_mandir}
	76	+%dir %attr(0755, root, bin) %{_mandir}/man3
	77	+%{_mandir}/man3/*
	78	+
	79	+%changelog
	80	+* Thu Jun 19 2008 - river@wikimedia.org
	81	+- modified for toolserver
	82	+* Fri Jun 23 2006 - laca@sun.com
	83	+- rename to SFEgdbm
	84	+- delete -share subpkg
	85	+- update file attributes
	86	+* Fri May 05 2006 - damien.carbery@sun.com
	87	+- Remove unnecessary intltoolize call.
	88	+* Wed Mar 08 2006 - brian.cameron@sun.com
	89	+- Created.
Index: trunk/tools/ts-specs/TSmutt.spec
—	—	@@ -0,0 +1,110 @@
	2	+#
	3	+# Copyright (c) 2006 Sun Microsystems, Inc.
	4	+# This file and all modifications and additions to the pristine
	5	+# package are under the same license as the package itself.
	6	+
	7	+%include Solaris.inc
	8	+
	9	+Name: TSmutt
	10	+Summary: The mutt e-mail client
	11	+Version: 1.5.18
	12	+Source: ftp://ftp.mutt.org/mutt/devel/mutt-%{version}.tar.gz
	13	+Patch1: mutt-01-makefile.diff
	14	+
	15	+SUNW_BaseDir: %{_basedir}
	16	+BuildRoot: %{_tmppath}/%{name}-%{version}-build
	17	+%include default-depend.inc
	18	+
	19	+BuildRequires: TSslang
	20	+BuildRequires: TSgdbm
	21	+BuildRequires: TSgdbm-devel
	22	+Requires: TSslang
	23	+Requires: %{name}-root
	24	+Requires: TSgdbm
	25	+
	26	+%package root
	27	+Summary: %{summary} - / filesystem
	28	+SUNW_BaseDir: /
	29	+%include default-depend.inc
	30	+
	31	+%prep
	32	+%setup -q -n mutt-%version
	33	+%patch1 -p0
	34	+
	35	+%build
	36	+
	37	+CPUS=`/usr/sbin/psrinfo \| grep on-line \| wc -l \| tr -d ' '`
	38	+if test "x$CPUS" = "x" -o $CPUS = 0; then
	39	+ CPUS=1
	40	+fi
	41	+
	42	+export CC="cc"
	43	+export CXX="CC"
	44	+export CFLAGS="%optflags -I/usr/include/idn -I%{_includedir}"
	45	+export LDFLAGS="%{_ldflags} -R/usr/sfw/lib -R%{_libdir} -L%{_libdir}"
	46	+export CPPFLAGS="-I/usr/sfw/include"
	47	+
	48	+./configure --prefix=%{_prefix} \
	49	+ --mandir=%{_mandir} \
	50	+ --sysconfdir=%{_sysconfdir} \
	51	+ --with-docdir=%{_docdir}/mutt \
	52	+ --disable-nls \
	53	+ --with-slang=/usr/lib \
	54	+ --with-ssl=/usr/sfw \
	55	+ --enable-pop \
	56	+ --enable-imap \
	57	+ --enable-hcache \
	58	+ --without-qdbm
	59	+
	60	+gmake -j$CPUS
	61	+
	62	+%install
	63	+rm -rf $RPM_BUILD_ROOT
	64	+
	65	+gmake install DESTDIR=$RPM_BUILD_ROOT
	66	+
	67	+%clean
	68	+rm -rf $RPM_BUILD_ROOT
	69	+
	70	+%files
	71	+%defattr (-, root, bin)
	72	+%dir %attr (0755, root, bin) %{_bindir}
	73	+%{_bindir}/*
	74	+%dir %attr (0755, root, sys) %{_datadir}
	75	+%dir %attr (0755, root, bin) %{_mandir}
	76	+%dir %attr (0755, root, bin) %{_mandir}/man1
	77	+%{_mandir}/man1/*.1
	78	+%dir %attr (0755, root, bin) %{_mandir}/man5
	79	+%{_mandir}/man5/*.5
	80	+%dir %attr (0755, root, other) %{_datadir}/doc
	81	+%{_datadir}/doc/*
	82	+
	83	+%files root
	84	+%defattr (-, root, sys)
	85	+%dir %attr (0755, root, sys) %{_sysconfdir}
	86	+%{_sysconfdir}/*
	87	+
	88	+%changelog
	89	+* Thu Jun 19 2008 - river@wikimedia.org
	90	+- modified for toolserver
	91	+* Sat May 17 2008 - river@wikimedia.org
	92	+- 1.5.18
	93	+* Wed May 14 2008 - river@wikimedia.org
	94	+- Add --enable-hcache to configure
	95	+- Depend on SFEgdbm(-devel)
	96	+* Tue Jan 01 2008 - Thomas Wagner
	97	+- bump to 1.5.17
	98	+* Sun Nov 25 2007 - Thomas Wagner
	99	+- PSARC 2007/167 "IDN" is found (new around build 73/74), add -I/usr/include/idn
	100	+* Sat May 26 2007 - dick@nagual.nl
	101	+- Corrected LDFLAGS setting
	102	+* Wed May 23 2007 - dick@nagual.nl
	103	+- Bump to v1.5.15 (devel)
	104	+* Mon May 21 2007 - dick@nagual.nl
	105	+- Added CPPFLAGS and LDFLAGS (/usr/sfw) to support openssl
	106	+ Without it ssl is not supported by mutt
	107	+- Added a patch for Makefile.in to change mime.types to mutt-mime.types
	108	+ to exclude a clash with a system mime.types in /etc
	109	+- Forced dependency from libcurses to slang
	110	+* Sun May 20 2007 - dick@nagual.nl
	111	+- Initial spec
Index: trunk/tools/ts-specs/TSvim.spec
—	—	@@ -0,0 +1,120 @@
	2	+#
	3	+# spec file for package TSvim.spec
	4	+#
	5	+# includes module(s): vim
	6	+#
	7	+%include Solaris.inc
	8	+
	9	+%define vim_version 71
	10	+
	11	+Name: TSvim
	12	+Summary: Vim - vi improved
	13	+Version: 7.1
	14	+Source: ftp://ftp.vim.org/pub/vim/unix/vim-%{version}.tar.bz2
	15	+Source1: ftp://ftp.vim.org/pub/vim/extra/vim-%{version}-lang.tar.gz
	16	+URL: http://www.vim.org
	17	+SUNW_BaseDir: %{_basedir}
	18	+BuildRoot: %{_tmppath}/%{name}-%{version}-build
	19	+%include default-depend.inc
	20	+Requires: SUNWlibms
	21	+Requires: SUNWmlib
	22	+BuildRequires: SUNWmlibh
	23	+
	24	+%if %build_l10n
	25	+%package l10n
	26	+Summary: %{summary} - l10n files
	27	+SUNW_BaseDir: %{_basedir}
	28	+%include default-depend.inc
	29	+Requires: %{name}
	30	+%endif
	31	+
	32	+%prep
	33	+%setup -q -c -n %name-%version
	34	+%setup -q -D -T -b 1 -c -n %name-%version
	35	+
	36	+%build
	37	+CPUS=`/usr/sbin/psrinfo \| grep on-line \| wc -l \| tr -d ' '`
	38	+if test "x$CPUS" = "x" -o $CPUS = 0; then
	39	+ CPUS=1
	40	+fi
	41	+export CC="cc"
	42	+export CXX="CC"
	43	+export CFLAGS="%optflags"
	44	+export LDFLAGS="%{_ldflags} -R/usr/sfw/lib"
	45	+cd vim%{vim_version}
	46	+./configure --prefix=%{_prefix} --mandir=%{_mandir} \
	47	+ --libdir=%{_libdir} \
	48	+ --libexecdir=%{_libexecdir} \
	49	+ --sysconfdir=%{_sysconfdir} \
	50	+ --enable-multibyte \
	51	+ --disable-hangulinput \
	52	+ --disable-gui \
	53	+ --without-x \
	54	+ --disable-fontset
	55	+
	56	+gmake -j$CPUS
	57	+
	58	+%install
	59	+rm -rf $RPM_BUILD_ROOT
	60	+cd vim%{vim_version}
	61	+make DESTDIR=$RPM_BUILD_ROOT install
	62	+rm $RPM_BUILD_ROOT%{_mandir}/man1/ex.1
	63	+rm $RPM_BUILD_ROOT%{_mandir}/man1/view.1
	64	+
	65	+rm -f $RPM_BUILD_ROOT%{_bindir}/ex
	66	+rm -f $RPM_BUILD_ROOT%{_bindir}/view
	67	+
	68	+find $RPM_BUILD_ROOT%{_mandir} -name view.1 -exec rm -f {} \;
	69	+find $RPM_BUILD_ROOT%{_mandir} -name ex.1 -exec rm -f {} \;
	70	+
	71	+%if %build_l10n
	72	+%else
	73	+# REMOVE l10n FILES
	74	+rm -rf $RPM_BUILD_ROOT%{_datadir}/vim/vim%{vim_version}/lang
	75	+rm -rf $RPM_BUILD_ROOT%{_mandir}/[a-z][a-z]
	76	+rm -rf $RPM_BUILD_ROOT%{_mandir}/[a-z][a-z].*
	77	+%endif
	78	+
	79	+%clean
	80	+rm -rf $RPM_BUILD_ROOT
	81	+
	82	+%files
	83	+%defattr (-, root, bin)
	84	+%dir %attr (0755, root, bin) %{_bindir}
	85	+%{_bindir}/*
	86	+%dir %attr (0755, root, sys) %{_datadir}
	87	+%{_datadir}/vim
	88	+%dir %attr(0755, root, bin) %{_mandir}
	89	+%dir %attr(0755, root, bin) %{_mandir}/*
	90	+%{_mandir}/man1/*
	91	+
	92	+%if %build_l10n
	93	+%files l10n
	94	+%defattr (-, root, bin)
	95	+%dir %attr (0755, root, sys) %{_datadir}
	96	+%{_datadir}/vim/vim%{vim_version}/lang
	97	+%{_mandir}/[a-z][a-z]
	98	+%{_mandir}/[a-z][a-z].*
	99	+%endif
	100	+
	101	+%changelog
	102	+* Thu Jun 19 2008 - river@wikimedia.org
	103	+- modified for toolserver
	104	+* Tue Jul 17 2007 - halton.huo@sun.com
	105	+- Bump to 7.1
	106	+* Fri Jul 13 2007 - dougs@truemail.co.th
	107	+- Fixed cscope requirement clash
	108	+* Mon Sep 11 2006 - halton.huo@sun.com
	109	+- Correct remove l10n files part
	110	+* Mon Jul 10 2006 - laca@sun.com
	111	+- rename to SFEvim
	112	+- bump to 7.0
	113	+- delete -share subpkg, add -l10n subpkg
	114	+- update file attributes
	115	+- enable a bunch of features, add dependencies
	116	+* Wed Jun 28 2006 - halton.huo@sun.com
	117	+- Enable cscope plugin.
	118	+* Thu Apr 6 2006 - damien.carbery@sun.com
	119	+- Update Build/Requires after check-deps.pl run.
	120	+* Fri Jan 27 2005 - glynn.foster@sun.com
	121	+- Initial version
Index: trunk/tools/ts-specs/TSjoe.spec
—	—	@@ -0,0 +1,69 @@
	2	+#
	3	+# Copyright (c) 2006 Sun Microsystems, Inc.
	4	+# This file and all modifications and additions to the pristine
	5	+# package are under the same license as the package itself.
	6	+
	7	+%include Solaris.inc
	8	+
	9	+Name: TSjoe
	10	+Summary: Full feature editor reminiscent of WordStar and Turbo-C
	11	+Version: 3.5
	12	+Source: %{sf_download}/joe-editor/joe-%{version}.tar.gz
	13	+
	14	+SUNW_BaseDir: %{_basedir}
	15	+BuildRoot: %{_tmppath}/%{name}-%{version}-build
	16	+%include default-depend.inc
	17	+
	18	+# Requires:
	19	+
	20	+%package root
	21	+Summary: %{summary} - / filesystem
	22	+SUNW_BaseDir: /
	23	+%include default-depend.inc
	24	+
	25	+%prep
	26	+%setup -q -n joe-%version
	27	+
	28	+%build
	29	+
	30	+CPUS=`/usr/sbin/psrinfo \| grep on-line \| wc -l \| tr -d ' '`
	31	+if test "x$CPUS" = "x" -o $CPUS = 0; then
	32	+ CPUS=1
	33	+fi
	34	+
	35	+export CC="cc"
	36	+export CXX="CC"
	37	+export CFLAGS="%optflags"
	38	+export LDFLAGS="%{_ldflags}"
	39	+
	40	+./configure --prefix=%{_prefix} \
	41	+ --sysconfdir=%{_sysconfdir} \
	42	+ --mandir=%{_mandir}
	43	+
	44	+gmake -j$CPUS
	45	+
	46	+%install
	47	+rm -rf $RPM_BUILD_ROOT
	48	+
	49	+make install DESTDIR=$RPM_BUILD_ROOT
	50	+
	51	+%clean
	52	+rm -rf $RPM_BUILD_ROOT
	53	+
	54	+%files
	55	+%defattr (-, root, bin)
	56	+%dir %attr (0755, root, bin) %{_bindir}
	57	+%{_bindir}/*
	58	+%dir %attr (0755, root, sys) %{_datadir}
	59	+%{_datadir}/*
	60	+
	61	+%files root
	62	+%defattr (-, root, sys)
	63	+%dir %attr (0755, root, sys) %{_sysconfdir}
	64	+%{_sysconfdir}/*
	65	+
	66	+%changelog
	67	+* Thu Jun 19 2008 - river@wikimedia.org
	68	+- modified for toolserver
	69	+* Fri Sep 15 2006 - Eric Boutilier
	70	+- Initial spec
Index: trunk/tools/ts-specs/TSrsync.spec
—	—	@@ -0,0 +1,55 @@
	2	+%include Solaris.inc
	3	+
	4	+Name: TSrsync
	5	+Summary: file transfer program
	6	+Version: 3.0.2
	7	+Source: http://samba.anu.edu.au/ftp/rsync/src/rsync-%{version}.tar.gz
	8	+
	9	+SUNW_BaseDir: %{_basedir}
	10	+BuildRoot: %{_tmppath}/%{name}-%{version}-build
	11	+%include default-depend.inc
	12	+
	13	+# Requires:
	14	+
	15	+%prep
	16	+%setup -q -n rsync-%version
	17	+
	18	+%build
	19	+
	20	+CPUS=`/usr/sbin/psrinfo \| grep on-line \| wc -l \| tr -d ' '`
	21	+if test "x$CPUS" = "x" -o $CPUS = 0; then
	22	+ CPUS=1
	23	+fi
	24	+
	25	+export CC="cc"
	26	+export CXX="CC"
	27	+export CFLAGS="%optflags"
	28	+export LDFLAGS="%{_ldflags}"
	29	+
	30	+./configure --prefix=%{_prefix} \
	31	+ --sysconfdir=%{_sysconfdir} \
	32	+ --mandir=%{_mandir}
	33	+
	34	+gmake -j$CPUS
	35	+
	36	+%install
	37	+rm -rf $RPM_BUILD_ROOT
	38	+
	39	+make install DESTDIR=$RPM_BUILD_ROOT
	40	+
	41	+%clean
	42	+rm -rf $RPM_BUILD_ROOT
	43	+
	44	+%files
	45	+%defattr (-, root, bin)
	46	+%dir %attr (0755, root, bin) %{_bindir}
	47	+%{_bindir}/*
	48	+%dir %attr (0755, root, sys) %{_datadir}
	49	+%dir %attr(0755, root, bin) %{_mandir}
	50	+%dir %attr(0755, root, bin) %{_mandir}/*
	51	+%{_mandir}/man1/*
	52	+%{_mandir}/man5/*
	53	+
	54	+%changelog
	55	+* Thu Jun 19 2008 - river@wikimedia.org
	56	+- initial spec
Index: trunk/tools/ts-specs/TSneon.spec
—	—	@@ -0,0 +1,152 @@
	2	+#
	3	+# spec file for package TSneon
	4	+#
	5	+# includes module(s): neon
	6	+#
	7	+%include Solaris.inc
	8	+
	9	+Name: TSneon
	10	+License: LGPL
	11	+Group: system/dscm
	12	+# Be careful not to update this to a newer version without checking
	13	+# if subversion will like it.
	14	+Version: 0.26.2
	15	+Release: 1
	16	+Summary: neon http and webdav client library
	17	+Source: http://www.webdav.org/neon/neon-%{version}.tar.gz
	18	+URL: http://www.webdav.org/neon/
	19	+BuildRoot: %{_tmppath}/%{name}-%{version}-build
	20	+SUNW_BaseDir: %{_prefix}
	21	+%include default-depend.inc
	22	+Conflicts: SUNWneon
	23	+Requires: SUNWlibms
	24	+Requires: SUNWzlib
	25	+Requires: SUNWlexpt
	26	+Requires: SUNWopenssl-libraries
	27	+BuildRequires: SUNWopenssl-include
	28	+BuildRequires: SUNWsfwhea
	29	+
	30	+%package devel
	31	+Summary: %{summary} - development files
	32	+SUNW_BaseDir: %{_basedir}
	33	+%include default-depend.inc
	34	+Requires: %{name}
	35	+Requires: SUNWbash
	36	+
	37	+%if %build_l10n
	38	+%package l10n
	39	+Summary: %{summary} - l10n files
	40	+SUNW_BaseDir: %{_basedir}
	41	+%include default-depend.inc
	42	+Requires: %{name}
	43	+%endif
	44	+
	45	+%prep
	46	+%setup -q -n neon-%{version}
	47	+
	48	+%build
	49	+export CC="cc"
	50	+export CXX="CC"
	51	+export CFLAGS="%optflags -I/usr/sfw/include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
	52	+%if %debug_build
	53	+%define debug_option --enable-debug
	54	+%else
	55	+%define debug_option --disable-debug
	56	+%endif
	57	+export CPPFLAGS="-I/usr/sfw/include"
	58	+export LD=/usr/ccs/bin/ld
	59	+export LDFLAGS="-L/usr/sfw/lib -R/usr/sfw/lib -L$RPM_BUILD_ROOT%{_libdir}"
	60	+export PATH=$PATH:/usr/apache2/bin
	61	+./configure \
	62	+ --prefix=%{_prefix} \
	63	+ --exec-prefix=%{_prefix} \
	64	+ --disable-static \
	65	+ --enable-shared \
	66	+ --mandir=%{_mandir} \
	67	+ --with-ssl \
	68	+ --with-libxml2 \
	69	+ --infodir=%{_infodir} \
	70	+ %debug_option
	71	+gmake
	72	+
	73	+%install
	74	+rm -rf $RPM_BUILD_ROOT
	75	+gmake install DESTDIR=$RPM_BUILD_ROOT
	76	+rm -rf $RPM_BUILD_ROOT%{_infodir}
	77	+
	78	+#rm -f $RPM_BUILD_ROOT%{_libdir}/lib*a
	79	+rm -f $RPM_BUILD_ROOT%{_libdir}/*.exp
	80	+
	81	+%if %(test -f %{_mandir}/man1/neon-config.1 && echo 1 \|\| echo 0)
	82	+rm $RPM_BUILD_ROOT%{_mandir}/man1/neon-config.1
	83	+rmdir $RPM_BUILD_ROOT%{_mandir}/man1
	84	+rm $RPM_BUILD_ROOT%{_mandir}/man3/*
	85	+rmdir $RPM_BUILD_ROOT%{_mandir}/man3
	86	+rmdir $RPM_BUILD_ROOT%{_mandir}
	87	+%endif
	88	+
	89	+%if %build_l10n
	90	+%else
	91	+# REMOVE l10n FILES
	92	+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
	93	+%endif
	94	+
	95	+%clean
	96	+rm -rf $RPM_BUILD_ROOT
	97	+
	98	+%files
	99	+%defattr (-, root, bin)
	100	+%dir %attr (0755, root, bin) %{_libdir}
	101	+%{_libdir}/lib.so
	102	+%if %(test ! -f %{_mandir}/man1/neon-config.1 && echo 1 \|\| echo 0)
	103	+%dir %attr (0755, root, sys) %{_datadir}
	104	+%dir %attr (0755, root, bin) %{_mandir}
	105	+%dir %attr (0755, root, bin) %{_mandir}/man1
	106	+%{_mandir}/man1/*
	107	+%endif
	108	+
	109	+%files devel
	110	+%defattr (-, root, bin)
	111	+%dir %attr (0755, root, bin) %{_bindir}
	112	+%{_bindir}/neon-config
	113	+%dir %attr (0755, root, bin) %{_includedir}
	114	+%{_includedir}/*
	115	+%dir %attr (0755, root, bin) %{_libdir}
	116	+%{_libdir}/lib*a
	117	+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
	118	+%{_libdir}/pkgconfig/*
	119	+%dir %attr (0755, root, sys) %{_datadir}
	120	+%if %(test ! -f %{_mandir}/man1/neon-config.1 && echo 1 \|\| echo 0)
	121	+%dir %attr (0755, root, bin) %{_mandir}
	122	+%dir %attr (0755, root, bin) %{_mandir}/man3
	123	+%{_mandir}/man3/*
	124	+%endif
	125	+%dir %attr (0755, root, other) %{_datadir}/doc
	126	+%{_datadir}/doc/*
	127	+
	128	+%if %build_l10n
	129	+%files l10n
	130	+%defattr (-, root, other)
	131	+%dir %attr (0755, root, sys) %{_datadir}
	132	+%{_datadir}/locale
	133	+%endif
	134	+
	135	+%changelog
	136	+* Thu Jun 19 2008 - river@wikimedia.org
	137	+- modified for toolserver
	138	+* Mon Feb 25 2008 - laca@sun.com
	139	+- make installing man pages conditional to avoid conflict with
	140	+ SUNWsfwman, helps on indiana
	141	+* Sat Jan 26 2008 - moinakg.ghosh@sun.com
	142	+- Fixed typo in conflict tag.
	143	+* Sat Jan 13 2008 - moinak.ghosh@sun.com
	144	+- Add conflict with SUNWneon
	145	+* Wed Mar 28 2007 - laca@sun.com
	146	+- unbump to 0.25.5 otherwise subversion refuses to build with dav support
	147	+* Thu Mar 22 2007 - nonsea@users.sourceforge.net
	148	+- Bump to 0.26.3
	149	+- Add back l10n package
	150	+* Mon Nov 6 2006 - laca@sun.com
	151	+- delete l10n subpkg -- no l10n files
	152	+* Sat Oct 14 2006 - laca@sun.com
	153	+- initial version
Index: trunk/tools/ts-specs/TSsubversion.spec
—	—	@@ -0,0 +1,168 @@
	2	+#
	3	+# spec file for package TSsubversion
	4	+#
	5	+# includes module(s): subversion
	6	+#
	7	+%include Solaris.inc
	8	+
	9	+%define package_svn_apache %(/usr/bin/pkginfo -q SUNWsvn && echo 0 \|\| echo 1)
	10	+
	11	+Name: TSsubversion
	12	+License: Apache,LGPL,BSD
	13	+Group: system/dscm
	14	+Version: 1.4.6
	15	+Release: 1
	16	+Summary: Subversion SCM
	17	+Source: http://subversion.tigris.org/downloads/subversion-%{version}.tar.bz2
	18	+
	19	+# Home-grown svn-config needed by kdesdk
	20	+#Source1: svn-config
	21	+#Patch1: subversion-01-libneon.la.diff
	22	+URL: http://subversion.tigris.org/
	23	+BuildRoot: %{_tmppath}/%{name}-%{version}-build
	24	+SUNW_BaseDir: %{_prefix}
	25	+Requires: SUNWcsl
	26	+Requires: SUNWcsr
	27	+Requires: TSgdbm
	28	+Requires: SUNWlibms
	29	+Requires: SUNWzlib
	30	+Requires: SUNWpostrun
	31	+Requires: SUNWopenssl-libraries
	32	+Requires: SUNWlexpt
	33	+Requires: TSneon
	34	+BuildRequires: SUNWPython
	35	+BuildRequires: SUNWopenssl-include
	36	+BuildRequires: TSgdbm-devel
	37	+
	38	+%description
	39	+Subversion source code management system.
	40	+
	41	+%package devel
	42	+Summary: %{summary} - development files
	43	+SUNW_BaseDir: %{_basedir}
	44	+%include default-depend.inc
	45	+Requires: %{name}
	46	+Requires: SUNWbash
	47	+Requires: SUNWopenssl-include
	48	+Requires: TSgdbm-devel
	49	+Requires: SUNWPython
	50	+
	51	+%if %build_l10n
	52	+%package l10n
	53	+Summary: %{summary} - l10n files
	54	+SUNW_BaseDir: %{_basedir}
	55	+%include default-depend.inc
	56	+Requires: %{name}
	57	+%endif
	58	+
	59	+%prep
	60	+%setup -q -n subversion-%{version}
	61	+#%patch1 -p1 -b .patch01
	62	+
	63	+%build
	64	+export PATH=/opt/ts/bin:/usr/ccs/bin:/usr/gnu/bin:/usr/bin:/usr/sbin:/bin:/usr/sfw/bin:/opt/SUNWspro/bin:/opt/jdsbld/bin
	65	+export CC="cc"
	66	+export CXX="CC"
	67	+export CFLAGS="%optflags -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
	68	+export LD=/usr/ccs/bin/ld
	69	+export LDFLAGS="%_ldflags -L%{_libdir} -R%{_libdir} -L$RPM_BUILD_ROOT%{_libdir}"
	70	+export PATH=$PATH:/usr/apache2/bin
	71	+./configure \
	72	+ --prefix=%{_prefix} \
	73	+ --exec-prefix=%{_prefix} \
	74	+ --disable-static \
	75	+ --with-pic \
	76	+ --with-installbuilddir=%{_datadir}/apr/build \
	77	+ --disable-mod-activation \
	78	+ --mandir=%{_mandir} \
	79	+ --with-ssl \
	80	+ --infodir=%{_infodir} \
	81	+ --with-apr=/usr/apache2 \
	82	+ --with-apr-util=/usr/apache2 \
	83	+ --with-neon=%{_prefix}
	84	+
	85	+gmake
	86	+
	87	+%install
	88	+rm -rf $RPM_BUILD_ROOT
	89	+gmake install DESTDIR=$RPM_BUILD_ROOT
	90	+rm -rf $RPM_BUILD_ROOT%{_infodir}
	91	+
	92	+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*a
	93	+rm -f $RPM_BUILD_ROOT%{_libdir}/*.exp
	94	+
	95	+#/opt/gnu/bin/install %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
	96	+
	97	+# Patch svn-config with the correct version
	98	+#cat $RPM_BUILD_ROOT%{_bindir}/svn-config \| sed s/SVN_VERSION/%{version}/ > $RPM_BUILD_ROOT%{_bindir}/svn-config.new
	99	+#mv $RPM_BUILD_ROOT%{_bindir}/svn-config.new $RPM_BUILD_ROOT%{_bindir}/svn-config
	100	+#chmod 0755 $RPM_BUILD_ROOT%{_bindir}/svn-config
	101	+
	102	+rm -rf ${RPM_BUILD_ROOT}/usr/apache2
	103	+
	104	+%if %build_l10n
	105	+%else
	106	+# REMOVE l10n FILES
	107	+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
	108	+%endif
	109	+
	110	+%clean
	111	+rm -rf $RPM_BUILD_ROOT
	112	+
	113	+%files
	114	+%defattr (-, root, bin)
	115	+%dir %attr (0755, root, bin) %{_bindir}
	116	+%{_bindir}/svn*
	117	+%dir %attr (0755, root, bin) %{_libdir}
	118	+%{_libdir}/lib.so
	119	+%dir %attr (0755, root, sys) %{_datadir}
	120	+%dir %attr (0755, root, bin) %{_mandir}
	121	+%dir %attr (0755, root, bin) %{_mandir}/man1
	122	+%{_mandir}/man1/*
	123	+%dir %attr (0755, root, bin) %{_mandir}/man5
	124	+%{_mandir}/man5/*
	125	+%dir %attr (0755, root, bin) %{_mandir}/man8
	126	+%{_mandir}/man8/*
	127	+
	128	+%files devel
	129	+%defattr (-, root, bin)
	130	+%dir %attr (0755, root, bin) %{_includedir}
	131	+%{_includedir}/*
	132	+
	133	+%if %build_l10n
	134	+%files l10n
	135	+%defattr (-, root, bin)
	136	+%dir %attr (0755, root, sys) %{_datadir}
	137	+%attr (-, root, other) %{_datadir}/locale
	138	+%endif
	139	+
	140	+%changelog
	141	+* Thu Jun 19 2008 - river@wikimedia.org
	142	+- modified for toolserver
	143	+* Mon Feb 25 2008 - laca@sun.com
	144	+- build against either SUNWneon or SFEneon
	145	+* Tue Jan 22 2008 - moinak.ghosh@sun.com
	146	+- Major rework to install in /usr/gnu and avoid conflict with SUNWsvn
	147	+- Depends on two new package SFElibapr and SFEaprutil. Having svn to depend on whole
	148	+- of Apache seems a bit of an overkill. These are also needed by kdesdk.
	149	+- Bumped version to 1.4.6
	150	+- Package a home-grown svn-config to satisfy a few software like kdesdk.
	151	+* Thu Jan 3 2008 - laca@sun.com
	152	+- update apache2 location for newer nevada builds
	153	+* Thu Mar 22 2007 - nonsea@users.sourceforge.net
	154	+- Bump to 1.4.3.
	155	+- Remove "-I/usr/sfw/include" from CFLAGS and
	156	+ "-L/usr/sfw/lib -R/usr/sfw/lib" from LDFLAGS to build pass
	157	+- Nevada bundle neon, Change require from SFEneon to SUNWneon
	158	+* Sat Oct 14 2006 - laca@sun.com
	159	+- disable parallel build as it breaks on multicpu systems
	160	+- bump to 1.4.0
	161	+* Tue Sep 26 2006 - halton.huo@sun.com
	162	+- Add Requires after check-deps.pl run
	163	+* Fri Jul 7 2006 - laca@sun.com
	164	+- rename to SFEsubversion
	165	+- add info stuff
	166	+- add some configure options to enable ssl, apache, https support
	167	+- add devel and l10n pkgs
	168	+* Sat Jan 7 2006 <glynn.foster@sun.com>
	169	+- initial version
Index: trunk/tools/ts-specs/ext-sources/default-copyright.txt
—	—	@@ -0,0 +1,3 @@
	2	+This is an open source package.
	3	+Use and redistribution subject to license terms as described in the
	4	+documents included in the sources.
Index: trunk/tools/ts-specs/.pkgtoolrc
—	—	@@ -0,0 +1,3 @@
	2	+specdirs: include
	3	+sourcedirs: ${MYDIR}/ext-sources:${MYDIR}/copyright
	4	+patchdirs: ${MYDIR}/patches
Index: trunk/tools/ts-specs/include/opt-gnu.inc
—	—	@@ -0,0 +1,15 @@
	2	+%define _basedir /opt
	3	+%define _subdir gnu
	4	+%define _prefix %{_basedir}/%{_subdir}
	5	+%define _std_bindir %{_basedir}/bin
	6	+%define _sysconfdir /etc/opt/%{_subdir}
	7	+%define _std_sysconfdir /etc
	8	+%define _localedir %{_libdir}/locale
	9	+%define _localstatedir /var/opt/%{_subdir}
	10	+%define _std_localstatedir /var
	11	+%define _pkg_config_path %{_libdir}/pkgconfig
	12	+%define _pkg_config_path64 %{_libdir}/%{_arch64}/pkgconfig
	13	+%define _std_datadir %{_basedir}/%{_subdir}/share
	14	+%define _infodir %{_std_datadir}/info
	15	+%define _std_includedir %{_basedir}/%{_subdir}/include
	16	+%define _std_libdir %{_basedir}/%{_subdir}/lib
Index: trunk/tools/ts-specs/include/base.inc
—	—	@@ -0,0 +1,111 @@
	2	+#
	3	+# Base (32-bit) platform settings for Solaris packages
	4	+#
	5	+# Copyright 2007 Sun Microsystems, Inc.
	6	+#
	7	+# Solaris.inc must be included before this file
	8	+
	9	+%ifarch sparc
	10	+%define bld_arch "sparc"
	11	+%else
	12	+%define bld_arch "i386"
	13	+%endif
	14	+
	15	+# use --without-gtk-doc to disable building gtk-docs (it takes quite
	16	+# a while to build them)
	17	+# default: build gtk-doc API docs
	18	+%define gtk_doc_option %{?!_without_gtk_doc:--enable-gtk-doc}%{?_without_gtk_doc:--disable-gtk-doc}
	19	+
	20	+%define arch_ldadd
	21	+
	22	+%if %debug_build
	23	+%define pkgbuild_postprocess /bin/true
	24	+%define _cc_opt_level -g
	25	+%define _cxx_opt_level -g
	26	+%define _gcc_opt_level -g
	27	+%define _gxx_opt_level -g
	28	+%else
	29	+%define _gcc_opt_level -O3
	30	+%define _gxx_opt_level -O3
	31	+%define _cc_opt_level -xO4 -xspace
	32	+%define _cxx_opt_level -xO3 -xspace
	33	+%endif
	34	+
	35	+%ifarch sparc
	36	+%define gcc_optflags %_gcc_opt_level -mv8plus -Xlinker -i %gcc_picflags
	37	+%define gcc_cxx_optflags %_gxx_opt_level -mv8plus -Xlinker -i %gcc_picflags
	38	+%endif
	39	+
	40	+%ifarch i386
	41	+%define gcc_optflags %_gcc_opt_level -march=i586 -Xlinker -i -fno-omit-frame-pointer %gcc_picflags
	42	+%define gcc_cxx_optflags %_gxx_opt_level -march=i586 -Xlinker -i -fno-omit-frame-pointer %gcc_picflags
	43	+%endif
	44	+
	45	+%ifarch sparc
	46	+%define suncc_optflags -i %_cc_opt_level -xstrconst -xarch=v8a -mr
	47	+%define suncc_cxx_optflags -i %_cxx_opt_level -xarch=v8a -mr -norunpath
	48	+%endif
	49	+
	50	+%ifarch i386
	51	+%define suncc_optflags -i %_cc_opt_level -xstrconst -xpentium -mr -xregs=no%%frameptr
	52	+%define suncc_cxx_optflags -i %_cxx_opt_level -pentium -mr -norunpath -xregs=no%%frameptr
	53	+%endif
	54	+
	55	+%if %cc_is_gcc
	56	+
	57	+%define picflags %gcc_picflags
	58	+%define optflags %gcc_optflags
	59	+%define cxx_optflags %gcc_cxx_optflags
	60	+%define _gpp_version %(%{?_gpp:%_gpp}%{!?_gpp:g++} --version \| head -1 \| cut -f3 -d' ')
	61	+%define _cxx_libdir %{_prefix}/lib/g++/%{_gpp_version}
	62	+
	63	+%else
	64	+# cc is not gcc
	65	+
	66	+%define picflags %suncc_picflags
	67	+%define optflags %suncc_optflags ${EXTRA_CFLAGS}
	68	+%define cxx_optflags %suncc_cxx_optflags ${EXTRA_CXXFLAGS}
	69	+%define _cxx_libdir %{_prefix}/lib
	70	+
	71	+%endif
	72	+
	73	+%define _bindir %{_prefix}/bin
	74	+%define _libdir %{_prefix}/lib
	75	+%define _libexecdir %{_prefix}/lib
	76	+%define _pkg_config_path %{_libdir}/pkgconfig
	77	+%define _sysconfdir /etc
	78	+
	79	+# Define some standard directories
	80	+%define gnu_bin /usr/gnu/bin
	81	+%define gnu_inc /usr/gnu/include
	82	+%define gnu_lib /usr/gnu/lib
	83	+%define gnu_lib_path -L%gnu_lib -R%gnu_lib
	84	+%define sfw_bin /usr/sfw/bin
	85	+%define sfw_inc /usr/sfw/include
	86	+%define sfw_lib /usr/sfw/lib
	87	+%define sfw_lib_path -L%sfw_lib -R%sfw_lib
	88	+%define xorg_bin /usr/X11/bin
	89	+%define xorg_lib /usr/X11/lib
	90	+%define xorg_inc /usr/X11/include
	91	+%define xorg_lib_path -L%xorg_lib -R%xorg_lib
	92	+
	93	+# ChangeLog:
	94	+# 2008-05-09 Laszlo (Laca) Peter <laca@sun.com>
	95	+# - use %_gpp instead of g++ when checking the version of g++
	96	+# 2008-02-17 Laszlo (Laca) Peter <laca@sun.com>
	97	+# - define _cxx_libdir and _gpp_version for building C++ libs
	98	+# 2007-06-09 Laszlo (Laca) Peter <laca@sun.com>
	99	+# - delete cc_is_gcc conditional when setting _gcc_opt_level,
	100	+# because we want this set anyway so it can be used in spec
	101	+# files that force gcc
	102	+# 2007-04-05 Laszlo (Laca) Peter <laca@sun.com>
	103	+# - fix cxx_optflags: use EXTRA_CXXFLAGS and not EXTRA_LDFLAGS
	104	+# 2007-03-20 Doug Scott <dougs@truemail.co.th>
	105	+# added standard directories definitions
	106	+# 2007-03-19 Doug Scott <dougs@truemail.co.th>
	107	+# - Fixed -fno-omit-frame-pointer flag
	108	+# 2007-03-15 Laszlo (Laca) Peter <laca@sun.com>
	109	+# - copied from x86_sse2.inc
	110	+# - new include file that resets macros to their default (32-bit build)
	111	+# values
	112	+# 2007-03-12 Doug Scott <dougs@truemail.co.th>
Index: trunk/tools/ts-specs/include/CC-wrapper
—	—	@@ -0,0 +1,27 @@
	2	+#/bin/bash
	3	+# Some builds link with CXX and use CFLAGS
	4	+# This wrapper script simply removes or changes arguments that
	5	+# are different between Sun Pro C and C++
	6	+
	7	+REALCXX=/opt/SUNWspro/bin/CC
	8	+
	9	+[ -z "${BASH_ARGC}" ] && {
	10	+ exec $REALCXX
	11	+}
	12	+
	13	+declare -a args
	14	+cnt=0
	15	+i=$(( ${#BASH_ARGV[@]} - 1 ))
	16	+while (( i >= 0 ))
	17	+do
	18	+ if [ "${BASH_ARGV[$i]}" = "-xpentium" ]; then
	19	+ args[$(( cnt++ ))]="-pentium"
	20	+ elif [ "${BASH_ARGV[$i]}" = "-xstrconst" ]; then
	21	+ :
	22	+ else
	23	+ args[$(( cnt++ ))]="${BASH_ARGV[$i]}"
	24	+ fi
	25	+ : $(( i-- ))
	26	+done
	27	+
	28	+exec $REALCXX ${args[@]}
Property changes on: trunk/tools/ts-specs/include/CC-wrapper
___________________________________________________________________
Added: svn:executable
1	29	+ *
Index: trunk/tools/ts-specs/include/gconf-install.script
—	—	@@ -0,0 +1,9 @@
	2	+( echo 'test -x /usr/bin/gconftool-2 \|\| {';
	3	+ echo ' echo "ERROR: gconftool-2 not found"';
	4	+ echo ' exit 1';
	5	+ echo '}';
	6	+ echo 'umask 0022';
	7	+ echo 'GCONF_CONFIG_SOURCE=xml:merged:/etc/gconf/gconf.xml.defaults';
	8	+ echo 'export GCONF_CONFIG_SOURCE';
	9	+ echo '/usr/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas > /dev/null'
	10	+) \| $BASEDIR/var/lib/postrun/postrun -u -c JDS_wait
Index: trunk/tools/ts-specs/include/options.inc
—	—	@@ -0,0 +1,127 @@
	2	+#
	3	+# Macro definitions for optional features
	4	+#
	5	+
	6	+#
	7	+# Option: --with-l10n
	8	+#
	9	+# use --with-l10n to build the SUNWfoo-l10n packages
	10	+# default: no l10n packages
	11	+#
	12	+%define option_with_l10n %{?_with_l10n:1}%{?!_with_l10n:0}
	13	+%define option_without_l10n %{!?_with_l10n:1}%{?_with_l10n:0}
	14	+
	15	+# obsolete:
	16	+%define build_l10n %option_with_l10n
	17	+
	18	+#
	19	+# Option: --with-debug
	20	+#
	21	+# use --with-debug to build binaries with debug info (-g) and not to strip
	22	+# them.
	23	+# default: don't include debug info and strip the binaries (strip -x)
	24	+#
	25	+%define option_with_debug %{?_with_debug:1}%{?!_with_debug:0}
	26	+%define option_without_debug %{!?_with_debug:1}%{?_with_debug:0}
	27	+
	28	+# obsolete:
	29	+%define debug_build %option_with_debug
	30	+
	31	+#
	32	+# Option: --without-gtk-doc
	33	+#
	34	+# use --without-gtk-doc to disable building gtk-docs (it takes quite
	35	+# a while to build them)
	36	+# default: build gtk-doc API docs
	37	+#
	38	+%define option_with_gtk_doc %{?!_without_gtk_doc:1}%{?_without_gtk_doc:0}
	39	+%define option_without_gtk_doc %{?_without_gtk_doc:1}%{?!_without_gtk_doc:0}
	40	+
	41	+# macro to use as a configure option:
	42	+%define gtk_doc_option %{?!_without_gtk_doc:--enable-gtk-doc}%{?_without_gtk_doc:--disable-gtk-doc}
	43	+
	44	+#
	45	+# Option: --with-tjds
	46	+#
	47	+# use --with-tjds to build the JDS Trusted Extensions
	48	+# default: no tjds
	49	+%define option_with_tjds %{?_with_tjds:1}%{?!_with_tjds:0}
	50	+%define option_without_tjds %{!?_with_tjds:1}%{?_with_tjds:0}
	51	+
	52	+# obsolete:
	53	+%define build_tjds %option_with_tjds
	54	+
	55	+#
	56	+# Option: --with-fox
	57	+#
	58	+# use --with-fox to build JDS with the FOX project's X packages
	59	+# instead of the nevada X packages
	60	+# default: nevada
	61	+#
	62	+%define option_with_fox %{?_with_fox:1}%{?!_with_fox:0}
	63	+%define option_without_fox %{!?_with_fox:1}%{?_with_fox:0}
	64	+
	65	+#
	66	+# Option: --with-gnu-iconv
	67	+#
	68	+# use --with-gnu-iconv to build JDS with the GNU libiconv and
	69	+# libintl implementations instead of the nevada libc implementations
	70	+# default: libc
	71	+#
	72	+%define option_with_gnu_iconv %{?_with_gnu_iconv:1}%{?!_with_gnu_iconv:0}
	73	+%define option_without_gnu_iconv %{!?_with_gnu_iconv:1}%{?_with_gnu_iconv:0}
	74	+
	75	+#
	76	+# Option: --without-java
	77	+#
	78	+# use --without-java exclude the Java bits from the build and packages
	79	+# default: build java
	80	+#
	81	+%define option_with_java %{?!_without_java:1}%{?_without_java:0}
	82	+%define option_without_java %{?_without_java:1}%{?!_without_java:0}
	83	+
	84	+#
	85	+# Option: --without-dt
	86	+#
	87	+# use --without-dt to remove dependency on /usr/dt "stuff" like dtlogin
	88	+# default: depend on /usr/dt
	89	+#
	90	+%define option_with_dt %{?!_without_dt:1}%{?_without_dt:0}
	91	+%define option_without_dt %{?_without_dt:1}%{?!_without_dt:0}
	92	+
	93	+#
	94	+# Option: --with-sun-branding
	95	+#
	96	+# use --with-sun-branding to build JDS with Sun Solaris branding
	97	+# default: no Sun branding
	98	+#
	99	+%define option_with_sun_branding %{?_with_sun_branding:1}%{?!_with_sun_branding:0}
	100	+%define option_without_sun_branding %{!?_with_sun_branding:1}%{?_with_sun_branding:0}
	101	+
	102	+#
	103	+# Option: --with-indiana-branding
	104	+#
	105	+# use --with-indiana-branding to build JDS with Indiana Solaris branding
	106	+# default: no Indiana branding
	107	+#
	108	+%define option_with_indiana_branding %{?_with_indiana_branding:1}%{?!_with_indiana_branding:0}
	109	+%define option_without_indiana_branding %{!?_with_indiana_branding:1}%{?_with_indiana_branding:0}
	110	+
	111	+%if %option_with_sun_branding
	112	+%if %option_with_indiana_branding
	113	+%error You cannot enable both Sun Solaris and Indiana branding
	114	+%endif
	115	+%endif
	116	+
	117	+#
	118	+# Option: --without-blueprint
	119	+#
	120	+# use --without-blueprint if you do not with to include the blueprint theme
	121	+# default: include blueprint
	122	+#
	123	+%define option_with_blueprint %{?!_without_blueprint:1}%{?_without_blueprint:0}
	124	+%define option_without_blueprint %{?_without_blueprint:1}%{?!_without_blueprint:0}
	125	+
	126	+# ChangeLog:
	127	+# 2007-09-27 Laszlo (Laca) Peter <laca@sun.com>
	128	+# - create
Index: trunk/tools/ts-specs/include/Solaris.inc
—	—	@@ -0,0 +1,165 @@
	2	+#
	3	+# Macro definitions for Solaris packages
	4	+#
	5	+# Copyright 2007 Sun Microsystems, Inc.
	6	+#
	7	+
	8	+%include prod.inc
	9	+%include options.inc
	10	+
	11	+SUNW_Pkg_AllZones: false
	12	+SUNW_Pkg_Hollow: false
	13	+SUNW_Pkg_ThisZone: false
	14	+
	15	+%define cc_is_gcc %(test "x`basename $CC`" = xgcc && echo 1 \|\| echo 0)
	16	+
	17	+%define is_nevada %(test `uname -r` = 5.11 && echo 1 \|\| echo 0)
	18	+%define is_s10 %(test `uname -r` = 5.10 && echo 1 \|\| echo 0)
	19	+%define _patch_options --fuzz=0 --unified
	20	+
	21	+SUNW_Category: %{default_category}
	22	+SUNW_HotLine: Please contact your local service provider
	23	+SUNW_MaxInst: 1000
	24	+SUNW_Rev: 110.0.4.%(date +%Y.%m.%d.%H.%M)
	25	+SUNW_Copyright: default-copyright.txt
	26	+
	27	+%define _libexecdir %{_prefix}/lib
	28	+%define _mandir %{_datadir}/man
	29	+
	30	+# by default we don't build optimised versions
	31	+%define opt_sparcv9 0
	32	+%define opt_amd64 0
	33	+%define opt_sse2 0
	34	+# opt_arch64 means opt_sparcv9 or opt_amd64
	35	+%define opt_arch64 0
	36	+# can_isaexec gets redefined to 1 if multiple isas are built
	37	+%define can_isaexec 0
	38	+%ifarch sparc
	39	+%define base_isa sparcv7
	40	+%define base_arch sparc
	41	+%else
	42	+%define base_isa i86
	43	+%define base_arch i386
	44	+%endif
	45	+
	46	+%if %option_with_gnu_iconv
	47	+%define arch_ldadd -Wl,-zignore -R/usr/gnu/lib -lgnuintl -lgnuiconv
	48	+%else
	49	+%define arch_ldadd
	50	+%endif
	51	+%define ldadd
	52	+
	53	+%if %debug_build
	54	+%define _ldflags %arch_ldadd %ldadd ${EXTRA_LDFLAGS}
	55	+%else
	56	+%define _ldflags %arch_ldadd %ldadd -Wl,-zignore -Wl,-zcombreloc -Wl,-Bdirect ${EXTRA_LDFLAGS}
	57	+%endif
	58	+
	59	+%define gcc_picflags -fPIC -DPIC
	60	+%define suncc_picflags -KPIC
	61	+
	62	+# ifarch doesn't support checking for sse2
	63	+# this macros allows you to use %if %arch_sse2 instead
	64	+%define arch_sse2 %(isainfo -x \| grep sse2 > /dev/null && echo 1 \|\| echo 0)
	65	+
	66	+# temporary, until all spec files are converted to the new multi-isa build
	67	+# technique
	68	+%ifarch amd64 sparcv9
	69	+%include arch64.inc
	70	+%endif
	71	+
	72	+%include base.inc
	73	+
	74	+%define _basedir %{?_basedir}%{?!_basedir:/opt/ts}
	75	+%define _subdir
	76	+%define _prefix %{_basedir}
	77	+%define _sysconfdir /etc
	78	+%define _localstatedir /var
	79	+%define _localedir %{_datadir}/locale
	80	+%define _pkg_config_path %{_libdir}/pkgconfig
	81	+
	82	+# ChangeLog:
	83	+# 2008-02-18 Laszlo (Laca) Peter <laca@sun.com>
	84	+# - allow user to redefine _basedir
	85	+# 2007-09-28 Laszlo (Laca) Peter <laca@sun.com>
	86	+# - copy arch_ldadd definition from base.inc
	87	+# 2007-09-27 Laszlo (Laca) Peter <laca@sun.com>
	88	+# - move configurable build options to options.inc and include
	89	+# options.inc
	90	+# 2007-04-05 Laszlo (Laca) Peter <laca@sun.com>
	91	+# - fix _ldflags so that it includes the architecture specific flags
	92	+# 2007-03-15 Laszlo (Laca) Peter <laca@sun.com>
	93	+# - move product specific tags and macros to prod.inc
	94	+# - define can_isaexec, base_isa, base_arch
	95	+# - define arch_sse2
	96	+# - move 32-bit compiler flags to base.inc and include base.inc
	97	+# - move 64-bit compiler flags to arch64.inc and include it temporarily,
	98	+# but it will not be needed once all spec files that build 64-bit are
	99	+# rewritten to the new style
	100	+# 2007-01-28 Laszlo Peter <laca@sun.com>
	101	+# - define %is_s10
	102	+# 2006-12-06 Damien Carbery <damien.carbery@sun.com>
	103	+# - Bump SUNW_ProdVers and default_pkg_version to 2.17.3.
	104	+# 2006-11-23 Damien Carbery <damien.carbery@sun.com>
	105	+# - Bump SUNW_ProdVers and default_pkg_version to 2.17.1.
	106	+# 2006-11-03 Laszlo Peter <laca@sun.com>
	107	+# - define %gtk_doc_option, lets the user disable building gtk-docs
	108	+# using --without-gtk-doc; also added comments about usage
	109	+# 2006-10-03 Laszlo Peter <laca@sun.com>
	110	+# - define %_patch_options, this specifies extra options for gpatch when
	111	+# using pkgbuild 1.1.1 or later
	112	+# 2006-10-03 Damien Carbery <damien.carbery@sun.com>
	113	+# - Bump SUNW_ProdVers and default_pkg_version to 2.16.1.
	114	+# 2006-09-18 Laszlo Peter <laca@sun.com>
	115	+# - define cxx_optflags64
	116	+# 2006-08-23 Laszlo Peter <laca@sun.com>
	117	+# - define _localstatedir
	118	+# 2006-06-02 Laszlo Peter <laca@sun.com>
	119	+# - add the date string back into REV
	120	+# 2005-11-28 Laszlo Peter <laca@sun.com>
	121	+# - add -z combreloc and -Bdirect to the LDFLAGS
	122	+# 2005-10-23 Laszlo Peter <laca@sun.com>
	123	+# - define debug_build (if --with-debug is used) and build_l10n
	124	+# (when --with-l10n is used) build_l10n will disable building
	125	+# the l10n packages but needs changes in the spec files to work;
	126	+# debug_build is already functional: replaces the optimisation flags
	127	+# with -g and disables stripping the binaries. (Yay!)
	128	+# 2005-10-14 Laszlo Peter <laca@sun.com>
	129	+# - define _ldflags
	130	+# 2005-09-19 Laszlo Peter <laca@sun.com>
	131	+# - add -xregs=no%frameptr (Sun CC) or -fomit-frame-pointers (gcc)
	132	+# flags to enable dtrace get stack traces
	133	+# 2005-09-17 Laszlo Peter <laca@sum.com>
	134	+# - define %picflags and add them to the gcc CFLAGS otherwise most things
	135	+# seem to break
	136	+# 2005-09-16 Laszlo Peter <laca@sun.com>
	137	+# - define cc_is_gcc and define gcc specific compiler flags
	138	+# 2005-09-15 Brian Cameron <brian.cameron@sun.com>
	139	+# - Backout debug lines I accidently committed to this file.
	140	+# 2005-07-14 Laszlo Peter <laca@sun.com>
	141	+# - update product version to 2.10
	142	+# 2004-11-01 Laszlo Peter <laca@sun.com>
	143	+# - temporarily removed -O for amd64 to stop gtk-demo crashing
	144	+# 2004-10-13 Laszlo Peter <laca@sun.com>
	145	+# - defined _pkg_config_path64
	146	+# 2004-10-02 Laszlo Peter <laca@sun.com>
	147	+# - defined jds_version
	148	+# 2004-10-02 Joseph Townsend <jan@eng.sun.com>
	149	+# - Create 64bit libraries for Solaris
	150	+# 2004-08-12 Shirley Woo <shirley.woo@sun.com>
	151	+# - Updated SUNW_Category for G2.6 packages to 2.6.0
	152	+# 2004-07-23 Laszlo Peter <laca@sun.com>
	153	+# - Changed default copyright notice to default-copyright.txt
	154	+# - Prefixed REV with 9.7.2
	155	+# 2004-06-26 Shirley Woo <shirley.woo@sun.com>
	156	+# - Changed install location to /usr/...
	157	+# 2004-06-21 Laszlo Peter <laca@sun.com>
	158	+# - descrease C++ optimisation level to xO3
	159	+# - define _pkg_config_path
	160	+# 2004-05-03 Laszlo Peter <laca@sun.com>
	161	+# - define _basedir
	162	+# 2004-04-14 Laszlo Peter <laca@sun.com>
	163	+# - change CATEGORY to GNOME2,application,JDS3
	164	+# 2004-02-28 Laszlo Peter <laca@sun.com>
	165	+# - add -mr and -xtrconst options, -xpentium on intel.
	166	+# - define cxx_optflags for CC compilation
Index: trunk/tools/ts-specs/include/byteswap-compat.h
—	—	@@ -0,0 +1,104 @@
	2	+/*
	3	+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
	4	+ * copyright (c) 2007 Doug Scott <dougs@truemail.co.th>
	5	+ *
	6	+ * This file is came from FFmpeg.
	7	+ *
	8	+ * FFmpeg is free software; you can redistribute it and/or
	9	+ * modify it under the terms of the GNU Lesser General Public
	10	+ * License as published by the Free Software Foundation; either
	11	+ * version 2.1 of the License, or (at your option) any later version.
	12	+ *
	13	+ * FFmpeg is distributed in the hope that it will be useful,
	14	+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
	15	+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	16	+ * Lesser General Public License for more details.
	17	+ *
	18	+ * You should have received a copy of the GNU Lesser General Public
	19	+ * License along with FFmpeg; if not, write to the Free Software
	20	+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
	21	+ */
	22	+
	23	+#include <stdint.h>
	24	+#ifndef HAVE_BYTESWAP_COMPAT_H
	25	+#define HAVE_BYTESWAP_COMPAT_H 1
	26	+
	27	+#ifdef __amd64
	28	+# define LEGACY_REGS "=Q"
	29	+#else
	30	+# define LEGACY_REGS "=q"
	31	+#endif
	32	+
	33	+static inline uint16_t bswap_16(uint16_t x)
	34	+{
	35	+#if defined(__i386) && !defined(__SUNPRO_CC)
	36	+ __asm("rorw $8, %0" :
	37	+ LEGACY_REGS (x) :
	38	+ "0" (x));
	39	+#else
	40	+ x= (x>>8) \| (x<<8);
	41	+#endif
	42	+ return x;
	43	+}
	44	+
	45	+static inline uint32_t bswap_32(uint32_t x)
	46	+{
	47	+#if defined(__i386) && !defined(__SUNPRO_CC)
	48	+#if __CPU__ != 386
	49	+ __asm("bswap %0":
	50	+ "=r" (x) :
	51	+#else
	52	+ __asm("xchgb %b0,%h0\n"
	53	+ " rorl $16,%0\n"
	54	+ " xchgb %b0,%h0":
	55	+ LEGACY_REGS (x) :
	56	+#endif
	57	+ "0" (x));
	58	+#else
	59	+ x= ((x<<8)&0xFF00FF00) \| ((x>>8)&0x00FF00FF);
	60	+ x= (x>>16) \| (x<<16);
	61	+#endif
	62	+ return x;
	63	+}
	64	+
	65	+static inline uint64_t bswap_64(uint64_t x)
	66	+{
	67	+#if 0
	68	+ x= ((x<< 8)&0xFF00FF00FF00FF00ULL) \| ((x>> 8)&0x00FF00FF00FF00FFULL);
	69	+ x= ((x<<16)&0xFFFF0000FFFF0000ULL) \| ((x>>16)&0x0000FFFF0000FFFFULL);
	70	+ return (x>>32) \| (x<<32);
	71	+#elif defined(__amd64) && !defined(__SUNPRO_CC)
	72	+ __asm("bswap %0":
	73	+ "=r" (x) :
	74	+ "0" (x));
	75	+ return x;
	76	+#else
	77	+ union {
	78	+ uint64_t ll;
	79	+ uint32_t l[2];
	80	+ } w, r;
	81	+ w.ll = x;
	82	+ r.l[0] = bswap_32 (w.l[1]);
	83	+ r.l[1] = bswap_32 (w.l[0]);
	84	+ return r.ll;
	85	+#endif
	86	+}
	87	+
	88	+#if __BYTE_ORDER == __LITTLE_ENDIAN
	89	+#define __cpu_to_le32(x) (x)
	90	+#define __cpu_to_be32(x) bswap_32(x)
	91	+#define __cpu_to_le16(x) (x)
	92	+#define __cpu_to_be16(x) bswap_16(x)
	93	+#else
	94	+#define __cpu_to_le32(x) bswap_32(x)
	95	+#define __cpu_to_be32(x) (x)
	96	+#define __cpu_to_le16(x) bswap_16(x)
	97	+#define __cpu_to_be16(x) (x)
	98	+#endif
	99	+
	100	+#define __le32_to_cpu __cpu_to_le32
	101	+#define __be32_to_cpu __cpu_to_be32
	102	+#define __le16_to_cpu __cpu_to_le16
	103	+#define __be16_to_cpu __cpu_to_be16
	104	+
	105	+#endif /* HAVE_BYTESWAP_COMPAT_H */
Index: trunk/tools/ts-specs/include/endian-compat.h
—	—	@@ -0,0 +1,37 @@
	2	+/*
	3	+ * copyright (c) 2007 Doug Scott <dougs@truemail.co.th>
	4	+ *
	5	+ * This is free software; you can redistribute it and/or
	6	+ * modify it under the terms of the GNU Lesser General Public
	7	+ * License as published by the Free Software Foundation; either
	8	+ * version 2.1 of the License, or (at your option) any later version.
	9	+ *
	10	+ * This is distributed in the hope that it will be useful,
	11	+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
	12	+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	13	+ * Lesser General Public License for more details.
	14	+ *
	15	+ * You should have received a copy of the GNU Lesser General Public
	16	+ * License along with FFmpeg; if not, write to the Free Software
	17	+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
	18	+ */
	19	+
	20	+#ifndef HAVE_ENDIAN_COMPAT_H
	21	+#define HAVE_ENDIAN_COMPAT_H 1
	22	+
	23	+#define __LITTLE_ENDIAN 1234
	24	+#define __BIG_ENDIAN 4321
	25	+#define LITTLE_ENDIAN __LITTLE_ENDIAN
	26	+#define BIG_ENDIAN __BIG_ENDIAN
	27	+
	28	+#include <sys/byteorder.h>
	29	+
	30	+#if defined(_BIG_ENDIAN)
	31	+#define __BYTE_ORDER __BIG_ENDIAN
	32	+#else
	33	+#define __BYTE_ORDER __LITTLE_ENDIAN
	34	+#endif
	35	+
	36	+#define BYTE_ORDER __BYTE_ORDER
	37	+
	38	+#endif /* HAVE_ENDIAN_COMPAT_H */
Index: trunk/tools/ts-specs/include/perl-depend.inc
—	—	@@ -0,0 +1,16 @@
	2	+#
	3	+# Default system dependencies for PERL packages on Solaris
	4	+#
	5	+
	6	+%define perl_version 5.8.4
	7	+
	8	+BuildRequires: SUNWperl584core
	9	+Requires: SUNWperl584core
	10	+
	11	+%ifarch sparc
	12	+%define perl_dir sun4-solaris-64int
	13	+%else
	14	+%define perl_dir i86pc-solaris-64int
	15	+%endif
	16	+
	17	+%define perl_bin /usr/perl5/5.8.4/bin
Index: trunk/tools/ts-specs/include/default-depend.inc
—	—	@@ -0,0 +1,11 @@
	2	+#
	3	+# Default system dependencies for GNOME packages on Solaris
	4	+#
	5	+# Copyright (c) 2003 Sun Microsystems, Inc.
	6	+#
	7	+Requires: SUNWcar
	8	+Requires: SUNWkvm
	9	+Requires: SUNWcsr
	10	+Requires: SUNWcsu
	11	+Requires: SUNWcsd
	12	+Requires: SUNWcsl
Index: trunk/tools/ts-specs/include/x86_sse2.inc
—	—	@@ -0,0 +1,84 @@
	2	+#
	3	+# Intel SSE2 ISA settings for Solaris packages
	4	+#
	5	+# Copyright 2007 Sun Microsystems, Inc.
	6	+#
	7	+# Solaris.inc must be included before this file
	8	+
	9	+%define bld_arch pentium_pro+mmx
	10	+%define sse2_arch pentium_pro+mmx
	11	+
	12	+%define opt_sse2 1
	13	+%define can_isaexec 1
	14	+%define gtk_doc_option --disable-gtk-doc
	15	+
	16	+%define arch_ldadd -xarch=sse2 -L%{_libdir} -R%{_libdir}
	17	+
	18	+%if %debug_build
	19	+%define pkgbuild_postprocess /bin/true
	20	+%define _cc_opt_level -g
	21	+%define _cxx_opt_level -g
	22	+%define _gcc_opt_level -g
	23	+%define _gxx_opt_level -g
	24	+%else
	25	+%if %cc_is_gcc
	26	+%define _gcc_opt_level -O3
	27	+%define _gxx_opt_level -O3
	28	+%else
	29	+%define _cc_opt_level -xO4 -xspace -xvector
	30	+%define _cxx_opt_level -xO3 -xspace -xvector
	31	+%endif
	32	+%endif
	33	+
	34	+%define gcc_optflags %_gcc_opt_level -mcpu=pentiumpro -mtune=pentiumpro -msse2 -mfpmath=sse -Xlinker -i -fno-omit-frame-pointer %gcc_picflags
	35	+%define gcc_cxx_optflags %_gxx_opt_level -mcpu=pentiumpro -mtune=pentiumpro -msse2 -mfpmath=sse -Xlinker -i -fno-omit-frame-pointer %gcc_picflags
	36	+
	37	+%define suncc_optflags -i %_cc_opt_level -xstrconst -xarch=sse2 -mr -xregs=no%%frameptr
	38	+%define suncc_cxx_optflags -i %_cxx_opt_level -xarch=sse2 -mr -norunpath -xregs=no%%frameptr
	39	+
	40	+%if %cc_is_gcc
	41	+
	42	+%define picflags %gcc_picflags
	43	+%define optflags %gcc_optflags
	44	+%define cxx_optflags %gcc_cxx_optflags
	45	+
	46	+%else
	47	+# cc is not gcc
	48	+
	49	+%define picflags %suncc_picflags
	50	+%define optflags %suncc_optflags ${EXTRA_CFLAGS}
	51	+%define cxx_optflags %suncc_cxx_optflags ${EXTRA_CXXFLAGS}
	52	+
	53	+%endif
	54	+
	55	+%define _bindir %{_prefix}/bin/%{bld_arch}
	56	+%define _libdir %{_prefix}/lib/%{bld_arch}
	57	+%define _libexecdir %{_prefix}/lib/%{bld_arch}
	58	+%define _pkg_config_path %{_libdir}/%{bld_arch}/pkgconfig
	59	+
	60	+# Define some standard directories
	61	+%define gnu_bin /usr/gnu/bin/%{bld_arch}
	62	+%define gnu_inc /usr/gnu/include
	63	+%define gnu_lib /usr/gnu/lib/%{bld_arch}
	64	+%define gnu_lib_path -L%gnu_lib -L/usr/gnu/lib -R%gnu_lib -R/usr/gnu/lib
	65	+%define sfw_bin /usr/sfw/bin/%{bld_arch}
	66	+%define sfw_inc /usr/sfw/include
	67	+%define sfw_lib /usr/sfw/lib/%{bld_arch}
	68	+%define sfw_lib_path -L%sfw_lib -L/usr/sfw/lib -R%sfw_lib -R/usr/sfw/lib
	69	+%define xorg_bin /usr/X11/bin/%{bld_arch}
	70	+%define xorg_lib /usr/X11/lib/%{bld_arch}
	71	+%define xorg_inc /usr/X11/include
	72	+%define xorg_lib_path -L%xorg_lib -L/usr/X11/lib -R%xorg_lib -R/usr/X11/lib
	73	+
	74	+# ChangeLog:
	75	+# 2007-04-23 Doug Scott <dougs@truemail.co.th>
	76	+# - move -xvector the optimized flags as it required -xO3 or higher
	77	+# 2007-03-20 Doug Scott <dougs@truemail.co.th>
	78	+# added standard directories definitions
	79	+# 2007-03-20 Doug Scott <dougs@truemail.co.th>
	80	+# - Add -mfpmath=sse for gcc.
	81	+# 2007-03-19 Doug Scott <dougs@truemail.co.th>
	82	+# - Fixed -fno-omit-frame-pointer flag
	83	+# 2007-03-15 Laszlo (Laca) Peter <laca@sun.com>
	84	+# - define suncc_optflags, suncc_cxx_optflags, gcc_optflags, gcc_cxx_optflags
	85	+# 2007-03-12 Doug Scott <dougs@truemail.co.th>
Index: trunk/tools/ts-specs/include/prod.inc
—	—	@@ -0,0 +1,28 @@
	2	+#
	3	+# Default settings for GNOME packages on Solaris
	4	+#
	5	+# Portions Copyright 2007 Sun Microsystems, Inc.
	6	+#
	7	+SUNW_ProdName: SpecFilesExtra
	8	+SUNW_ProdVers: 1.0
	9	+
	10	+%define default_pkg_version 2.18.0
	11	+%define jds_version JDSosol
	12	+%define default_category SFE,application
	13	+%define support_level unsupported
	14	+
	15	+# use --with-tjds to build the JDS Trusted Extensions
	16	+# default: no tjds
	17	+%define build_tjds %{?_with_tjds:1}%{?!_with_tjds:0}
	18	+
	19	+Vendor: http://pkgbuild.sf.net/spec-files-extra
	20	+%define pkg_prefix SFE
	21	+%{?sf_mirror:#}%define sf_mirror easynews.dl.sourceforge.net
	22	+
	23	+%{?sf_download:#}%define sf_download http://downloads.sourceforge.net
	24	+
	25	+# ChangeLog:
	26	+# 2007-03-16 Laszlo (Laca) Peter <laca@sun.com>
	27	+# - copied from the JDS spec-files and updated for SFE
	28	+# 2007-03-15 Laszlo (Laca) Peter <laca@sun.com>
	29	+# - create by moving product specific stuff out of Solaris.inc
Index: trunk/tools/ts-specs/include/arch64.inc
—	—	@@ -0,0 +1,121 @@
	2	+#
	3	+# 64-bit platform settings for Solaris packages
	4	+#
	5	+# Copyright 2007 Sun Microsystems, Inc.
	6	+#
	7	+# Solaris.inc must be included before this file
	8	+
	9	+%ifarch amd64 sparcv9
	10	+
	11	+%ifarch amd64
	12	+%define _arch64 amd64
	13	+%else
	14	+%define _arch64 sparcv9
	15	+%endif
	16	+
	17	+%define opt_arch64 1
	18	+%define can_isaexec 1
	19	+%define gtk_doc_option --disable-gtk-doc
	20	+
	21	+%define arch_ldadd -L%{_libdir} -R%{_libdir}
	22	+
	23	+%ifarch amd64
	24	+%define opt_amd64 1
	25	+%define bld_arch "amd64"
	26	+%else
	27	+%define opt_sparcv9 1
	28	+%define bld_arch "sparcv9"
	29	+%endif
	30	+
	31	+%if %debug_build
	32	+%define pkgbuild_postprocess /bin/true
	33	+%define _cc64_opt_level -g
	34	+%define _cxx64_opt_level -g
	35	+%define _gcc64_opt_level -g
	36	+%define _gxx64_opt_level -g
	37	+%else
	38	+%if %cc_is_gcc
	39	+%define _gcc64_opt_level -O3
	40	+%define _gxx64_opt_level -O3
	41	+%else
	42	+%define _cc64_opt_level -xO4 -xspace
	43	+%define _cxx64_opt_level -xO3 -xspace
	44	+%endif
	45	+%endif
	46	+
	47	+%ifarch sparc
	48	+%define gcc_optflags64 %_gcc64_opt_level -mcpu=ultrasparc -m64 -Xlinker -i %gcc_picflags
	49	+%define gcc_cxx_optflags64 %gcc_optflags64
	50	+%endif
	51	+
	52	+%ifarch i386
	53	+%define gcc_optflags64 %_gcc64_opt_level -march=opteron -m64 -Xlinker -i -fno-omit-frame-pointer %gcc_picflags
	54	+%define gcc_cxx_optflags64 %gcc_optflags64
	55	+%endif
	56	+
	57	+%ifarch sparc
	58	+%define suncc_optflags64 -i %_cc64_opt_level -xstrconst -xarch=v9 -xcode=pic32 -mr
	59	+%define suncc_cxx_optflags64 -i %_cxx64_opt_level -xarch=v9 -xcode=pic32 -mr -norunpath
	60	+%endif
	61	+
	62	+%ifarch i386
	63	+%define suncc_optflags64 -i %_cc64_opt_level -xstrconst -xarch=generic64 -Kpic -xregs=no%%frameptr
	64	+%define suncc_cxx_optflags64 -i %_cxx64_opt_level -xarch=generic64 -Kpic -pentium -mr -norunpath -xregs=no%%frameptr
	65	+%endif
	66	+
	67	+%if %cc_is_gcc
	68	+
	69	+%define picflags %gcc_picflags
	70	+%define optflags64 %gcc_optflags64
	71	+%define cxx_optflags64 %gcc_cxx_optflags64
	72	+%define _gpp_version %(g++ --version \| head -1 \| cut -f3 -d' ')
	73	+%define _cxx_libdir %{_prefix}/lib/g++/%{_gpp_version}/%{_arch64}
	74	+
	75	+%else
	76	+# cc is not gcc
	77	+
	78	+%define picflags %suncc_picflags
	79	+%define optflags64 %suncc_optflags64
	80	+%define cxx_optflags64 %suncc_cxx_optflags64
	81	+%define _cxx_libdir %{_prefix}/lib
	82	+
	83	+%endif
	84	+
	85	+%define optflags %optflags64 ${EXTRA_CFLAGS}
	86	+%define cxx_optflags %cxx_optflags64 ${EXTRA_CXXFLAGS}
	87	+
	88	+%define _bindir %{_prefix}/bin/%{bld_arch}
	89	+%define _libdir %{_prefix}/lib/%{bld_arch}
	90	+%define _libexecdir %{_prefix}/lib/%{bld_arch}
	91	+%define _pkg_config_path %{_libdir}/pkgconfig
	92	+# obsolete, don't use:
	93	+%define _pkg_config_path64 %{_prefix}/lib/%{_arch64}/pkgconfig
	94	+
	95	+%endif
	96	+
	97	+# Define some standard directories
	98	+%define gnu_bin /usr/gnu/bin/%{bld_arch}
	99	+%define gnu_inc /usr/gnu/include
	100	+%define gnu_lib /usr/gnu/lib/%{bld_arch}
	101	+%define gnu_lib_path -L%gnu_lib -R%gnu_lib
	102	+%define sfw_bin /usr/sfw/bin/%{bld_arch}
	103	+%define sfw_inc /usr/sfw/include
	104	+%define sfw_lib /usr/sfw/lib/%{bld_arch}
	105	+%define sfw_lib_path -L%sfw_lib -R%sfw_lib
	106	+%define xorg_bin /usr/X11/bin/%{bld_arch}
	107	+%define xorg_lib /usr/X11/lib/%{bld_arch}
	108	+%define xorg_inc /usr/X11/include
	109	+%define xorg_lib_path -L%xorg_lib -R%xorg_lib
	110	+
	111	+# ChangeLog:
	112	+# 2008-02-17 Laszlo (Laca) Peter <laca@sun.com>
	113	+# - define _cxx_libdir and _gpp_version for building C++ libs
	114	+# 2007-03-20 Doug Scott <dougs@truemail.co.th>
	115	+# added %_cc64_opt_level to suncc_optflags64
	116	+# added standard directories definitions
	117	+# 2007-03-19 Doug Scott <dougs@truemail.co.th>
	118	+# - Fixed -fno-omit-frame-pointer flag
	119	+# 2007-03-15 Laszlo (Laca) Peter <laca@sun.com>
	120	+# - renamed from amd64.inc
	121	+# - updated to work for either amd64 or sparcv9
	122	+# 2007-03-12 Doug Scott <dougs@truemail.co.th>
Index: trunk/tools/ts-specs/TSslang.spec
—	—	@@ -0,0 +1,101 @@
	2	+#
	3	+# Copyright (c) 2006 Sun Microsystems, Inc.
	4	+# This file and all modifications and additions to the pristine
	5	+# package are under the same license as the package itself.
	6	+
	7	+%include Solaris.inc
	8	+
	9	+Name: TSslang
	10	+Summary: multi-platform programmer's library
	11	+Version: 2.1.3
	12	+Source: ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.1/slang-%{version}.tar.gz
	13	+
	14	+SUNW_BaseDir: %{_basedir}
	15	+BuildRoot: %{_tmppath}/%{name}-%{version}-build
	16	+%include default-depend.inc
	17	+
	18	+Requires: SUNWpng
	19	+
	20	+Requires: %name-root
	21	+%package root
	22	+Summary: %{summary} - / filesystem
	23	+SUNW_BaseDir: /
	24	+%include default-depend.inc
	25	+
	26	+%prep
	27	+%setup -q -n slang-%version
	28	+
	29	+%build
	30	+CPUS=`/usr/sbin/psrinfo \| grep on-line \| wc -l \| tr -d ' '`
	31	+if test "x$CPUS" = "x" -o $CPUS = 0; then
	32	+ CPUS=1
	33	+fi
	34	+
	35	+export CC="cc"
	36	+export CFLAGS="CC"
	37	+export CFLAGS="%optflags"
	38	+export LDFLAGS="%_ldflags -L../src/elfobjs"
	39	+
	40	+./configure --prefix=%{_prefix} \
	41	+ --mandir=%{_mandir} \
	42	+ --sysconfdir=%{_sysconfdir}
	43	+
	44	+gmake -j$CPUS elf
	45	+
	46	+%install
	47	+rm -rf $RPM_BUILD_ROOT
	48	+gmake install-elf DESTDIR=$RPM_BUILD_ROOT
	49	+#rm ${RPM_BUILD_ROOT}%{_libdir}/libslang.a
	50	+
	51	+%clean
	52	+rm -rf $RPM_BUILD_ROOT
	53	+
	54	+%files
	55	+%defattr (-, root, bin)
	56	+%dir %attr (0755, root, bin) %{_bindir}
	57	+%{_bindir}/*
	58	+%dir %attr (0755, root, bin) %{_libdir}
	59	+%{_libdir}/lib.so
	60	+%dir %attr (0755, root, other) %{_libdir}/slang
	61	+%dir %attr (0755, root, other) %{_libdir}/slang/v2
	62	+%dir %attr (0755, root, other) %{_libdir}/slang/v2/modules
	63	+%{_libdir}/slang/v2/modules/*
	64	+%dir %attr (0755, root, bin) %{_includedir}
	65	+%{_includedir}/*
	66	+%dir %attr (0755, root, sys) %{_datadir}
	67	+%dir %attr (0755, root, other) %{_datadir}/slsh
	68	+%{_datadir}/slsh/*.sl
	69	+%dir %attr (0755, root, other) %{_datadir}/slsh/local-packages
	70	+%dir %attr (0755, root, other) %{_datadir}/slsh/scripts
	71	+%{_datadir}/slsh/scripts/*
	72	+%dir %attr (0755, root, other) %{_datadir}/slsh/cmaps
	73	+%{_datadir}/slsh/cmaps/*
	74	+%dir %attr (0755, root, other) %{_datadir}/slsh/help
	75	+%{_datadir}/slsh/help/*
	76	+%dir %attr (0755, root, other) %{_datadir}/slsh/rline
	77	+%{_datadir}/slsh/rline/*
	78	+%dir %attr (0755, root, other) %{_datadir}/doc
	79	+%dir %attr (0755, root, other) %{_datadir}/doc/slang
	80	+%dir %attr (0755, root, other) %{_datadir}/doc/slang/v2
	81	+%{_datadir}/doc/slang/v2/*
	82	+%dir %attr (0755, root, other) %{_datadir}/doc/slsh
	83	+%dir %attr (0755, root, other) %{_datadir}/doc/slsh/html
	84	+%{_datadir}/doc/slsh/html/*.html
	85	+%dir %attr (0755, root, bin) %{_mandir}
	86	+%dir %attr (0755, root, bin) %{_mandir}/man1
	87	+%{_mandir}/man1/*
	88	+
	89	+%files root
	90	+%defattr (-, root, sys)
	91	+%dir %attr (0755, root, sys) %{_sysconfdir}
	92	+%{_sysconfdir}/slsh.rc
	93	+
	94	+%changelog
	95	+* Thu Jun 19 2008 - river@wikimedia.org
	96	+- modified for toolserver
	97	+* Fri May 02 2008 - ananth@sun.com
	98	+- Bump to 2.1.3
	99	+* Mon May 21 2007 - dick@nagual.nl
	100	+- Bump to 2.0.7
	101	+* Thu Dec 14 2006 - Eric Boutilier
	102	+- Initial spec

Status & tagging log

15:28, 12 September 2011 Meno25 (talk | contribs) changed the status of r36444 [removed: ok added: old]