From: <no...@us...> - 2008-06-30 09:27:11
|
Revision: 1262 http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1262&view=rev Author: nonsea Date: 2008-06-30 02:27:10 -0700 (Mon, 30 Jun 2008) Log Message: ----------- 2008-06-30 Halton Huo <no...@us...> Roll back goffice and tsclient, move them to archive. * archive/SFEgoffice.spec: * archive/SUNWtsclient.spec: * base-specs/goffice.spec: * base-specs/tsclient.spec: * patches/goffice-01-no-sunmath-lib.diff: * patches/tsclient-01-libsocket.diff: Modified Paths: -------------- spec-files-extra/trunk/ChangeLog Added Paths: ----------- spec-files-extra/trunk/archive/SFEgoffice.spec spec-files-extra/trunk/archive/SUNWtsclient.spec spec-files-extra/trunk/base-specs/goffice.spec spec-files-extra/trunk/base-specs/tsclient.spec spec-files-extra/trunk/patches/goffice-01-no-sunmath-lib.diff spec-files-extra/trunk/patches/tsclient-01-libsocket.diff Modified: spec-files-extra/trunk/ChangeLog =================================================================== --- spec-files-extra/trunk/ChangeLog 2008-06-30 08:03:29 UTC (rev 1261) +++ spec-files-extra/trunk/ChangeLog 2008-06-30 09:27:10 UTC (rev 1262) @@ -1,5 +1,15 @@ 2008-06-30 Halton Huo <no...@us...> + Roll back goffice and tsclient, move them to archive. + * archive/SFEgoffice.spec: + * archive/SUNWtsclient.spec: + * base-specs/goffice.spec: + * base-specs/tsclient.spec: + * patches/goffice-01-no-sunmath-lib.diff: + * patches/tsclient-01-libsocket.diff: + +2008-06-30 Halton Huo <no...@us...> + Move goffice and tsclient into spec-files-other. * SFEgnucash.spec: * SFEgoffice.spec: Added: spec-files-extra/trunk/archive/SFEgoffice.spec =================================================================== --- spec-files-extra/trunk/archive/SFEgoffice.spec (rev 0) +++ spec-files-extra/trunk/archive/SFEgoffice.spec 2008-06-30 09:27:10 UTC (rev 1262) @@ -0,0 +1,127 @@ +# +# spec file for package SFEgoffice +# +# includes module(s): goffice +# +# Copyright 2008 Sun Microsystems, Inc. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Owner: halton +# + +%include Solaris.inc + +%use goffice = goffice.spec + +Name: SFEgoffice +Summary: goffice - Document centric set of APIs +Version: %{goffice.version} +SUNW_BaseDir: %{_basedir} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%include default-depend.inc +Requires: SUNWlxml +Requires: SUNWzlib +Requires: SUNWlibgsf +Requires: SUNWlibms +Requires: SUNWgnome-libs +Requires: SUNWgnome-base-libs +Requires: SUNWgnome-python-libs +BuildRequires: SUNWlxml-devel +BuildRequires: SUNWgnome-libs-devel +BuildRequires: SUNWgnome-base-libs-devel +BuildRequires: SUNWgnome-python-libs-devel +%if %option_with_gnu_iconv +Requires: SUNWgnu-libiconv +Requires: SUNWgnu-gettext +%else +Requires: SUNWuiu8 +%endif + +%package devel +Summary: %{summary} - development files +SUNW_BaseDir: %{_basedir} +%include default-depend.inc +Requires: %name +BuildRequires: SUNWgnome-libs-devel + +%if %build_l10n +%package l10n +Summary: %{summary} - l10n files +SUNW_BaseDir: %{_basedir} +%include default-depend.inc +Requires: %{name} +%endif + +%prep +rm -rf %name-%version +mkdir -p %name-%version +%goffice.prep -d %name-%version + +%build +export ACLOCAL_FLAGS="-I %{_datadir}/aclocal" +export CFLAGS="%optflags" +%if %option_with_gnu_iconv +export CFLAGS="$CFLAGS -I/usr/gnu/include -L/usr/gnu/lib -R/usr/gnu/lib -lintl" +%endif +export RPM_OPT_FLAGS="$CFLAGS" +export LDFLAGS="%_ldflags" + +%goffice.build -d %name-%version + +%install +rm -rf $RPM_BUILD_ROOT +%goffice.install -d %name-%version + +%if %build_l10n +%else +# REMOVE l10n FILES +rm -rf $RPM_BUILD_ROOT%{_datadir}/locale +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-, root, bin) +%dir %attr (0755, root, bin) %{_libdir} +%{_libdir}/libgoffice*.so* +%{_libdir}/goffice +%dir %attr (0755, root, sys) %{_datadir} +%{_datadir}/goffice +%dir %attr (0755, root, other) %{_datadir}/pixmaps +%{_datadir}/pixmaps/* + +%files devel +%defattr (-, root, bin) +%dir %attr (0755, root, bin) %{_includedir} +%{_includedir}/* +%dir %attr (0755, root, bin) %{_libdir} +%dir %attr (0755, root, other) %{_libdir}/pkgconfig +%{_libdir}/pkgconfig/* +%dir %attr (0755, root, sys) %dir %{_datadir} +%{_datadir}/gtk-doc + +%if %build_l10n +%files l10n +%defattr (-, root, bin) +%dir %attr (0755, root, sys) %{_datadir} +%attr (-, root, other) %{_datadir}/locale +%endif + + +%changelog +* Tue Jun 24 2008 - no...@us... +- Split base part to base/goffice.spec +- Bump to 0.6.4 +* Mon Apr 14 2008 - tr...@ac... +- Bump to 0.6.2, update dependencies +* Tue Sep 04 2007 - Thomas Wagner +- bump to 0.15.1, add %{version} to Download-Dir (might change again) +- conditional !%build_l10n rmdir $RPM_BUILD_ROOT/%{_datadir}/locale +* Sat May 26 2007 - Thomas Wagner +- bump to 0.15.0 +- set compiler to gcc +- builds with Avahi, if present +* Thu Apr 06 2007 - Thomas Wagner +- Initial spec Added: spec-files-extra/trunk/archive/SUNWtsclient.spec =================================================================== --- spec-files-extra/trunk/archive/SUNWtsclient.spec (rev 0) +++ spec-files-extra/trunk/archive/SUNWtsclient.spec 2008-06-30 09:27:10 UTC (rev 1262) @@ -0,0 +1,128 @@ +# +# spec file for package SUNWtsclient +# +# includes module(s): tsclient +# +# Copyright 2008 Sun Microsystems, Inc. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Owner: halton +# + +%include Solaris.inc + +%use tsclient = tsclient.spec + +Name: SUNWtsclient +Summary: tsclient - A frontend for rdesktop and other remote desktop tools +Version: %{tsclient.version} +SUNW_BaseDir: %{_basedir} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%include default-depend.inc +Requires: SUNWgnome-panel +Requires: SUNWgnome-libs +Requires: SUNWxwplt +Requires: SUNWxwice +Requires: SUNWgnome-vfs +Requires: SUNWgnome-config +Requires: SUNWgnome-base-libs +Requires: SUNWlibpopt +Requires: SUNWlibm +Requires: SUNWmlib +Requires: SUNWfontconfig +Requires: SUNWxorg-clientlibs +Requires: SUNWgnome-component +Requires: SUNWlxml +Requires: SUNWdbus-bindings +Requires: SUNWdbus +Requires: SUNWopenssl-libraries +Requires: SUNWgnome-audio +Requires: SUNWfreetype2 +Requires: SUNWlexpt +Requires: SUNWzlib +Requires: SUNWpng +Requires: SUNWrdesktop +Requires: SUNWvncviewer +Requires: SUNWxwsrv +BuildRequires: SUNWgnome-panel-devel +BuildRequires: SUNWgnome-libs-devel +BuildRequires: SUNWgnome-vfs-devel +BuildRequires: SUNWgnome-config-devel +BuildRequires: SUNWgnome-base-libs-devel +BuildRequires: SUNWlibpopt-devel +BuildRequires: SUNWmlibh +BuildRequires: SUNWgnome-component-devel +BuildRequires: SUNWlxml-devel +BuildRequires: SUNWdbus-bindings-devel +BuildRequires: SUNWdbus-devel +BuildRequires: SUNWsfwhea +BuildRequires: SUNWgnome-audio-devel +BuildRequires: SUNWpng-devel + +%if %build_l10n +%package l10n +Summary: %{summary} - l10n files +SUNW_BaseDir: %{_basedir} +%include default-depend.inc +Requires: %{name} +%endif + +%prep +rm -rf %name-%version +mkdir -p %name-%version +%tsclient.prep -d %name-%version + +%build +export ACLOCAL_FLAGS="-I %{_datadir}/aclocal" +export CFLAGS="%optflags" +export RPM_OPT_FLAGS="$CFLAGS" +%tsclient.build -d %name-%version + +%install +rm -rf $RPM_BUILD_ROOT +%tsclient.install -d %name-%version + +%if %build_l10n +%else +# REMOVE l10n FILES +rm -rf $RPM_BUILD_ROOT%{_datadir}/locale +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr (-, root, bin) +%dir %attr (0755, root, bin) %{_bindir} +%{_bindir}/tsclient +%dir %attr (0755, root, bin) %{_libdir} +%{_libdir}/tsclient-applet +%dir %attr (0755, root, bin) %{_libdir}/bonobo +%dir %attr (0755, root, bin) %{_libdir}/bonobo/servers +%{_libdir}/bonobo/servers/GNOME_TSClientApplet.server +%dir %attr (0755, root, sys) %{_datadir} +%dir %attr (-, root, other) %{_datadir}/application-registry +%{_datadir}/application-registry/tsclient.applications +%dir %attr (-, root, other) %{_datadir}/applications +%{_datadir}/applications/tsclient.desktop +%dir %attr (-, root, other) %{_datadir}/mime-info +%{_datadir}/mime-info/* +%dir %attr (-, root, other) %{_datadir}/pixmaps +%{_datadir}/pixmaps/* +%dir %attr(0755, root, bin) %{_mandir} +%dir %attr(0755, root, bin) %{_mandir}/* +%{_mandir}/*/* + +%if %build_l10n +%files l10n +%defattr (-, root, bin) +%dir %attr (0755, root, sys) %{_datadir} +%attr (-, root, other) %{_datadir}/locale +%endif + +%changelog +* Fri Jun 27 2008 - no...@us... +- Add Requires to SUNWrdesktop, SUNWvncviewer and SUNWxwsrv +* Thu Jun 19 2008 - no...@us... +- Initial spec Added: spec-files-extra/trunk/base-specs/goffice.spec =================================================================== --- spec-files-extra/trunk/base-specs/goffice.spec (rev 0) +++ spec-files-extra/trunk/base-specs/goffice.spec 2008-06-30 09:27:10 UTC (rev 1262) @@ -0,0 +1,106 @@ +# +# spec file for package goffice +# +# Copyright 2008 Sun Microsystems, Inc. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Owner: halton +# + + +Name: goffice +Summary: Set of document centric objects and utilities for glib/gtk +License: GPL +Group: System/Libraries +Version: 0.7.0 +Release: 1 +Distribution: Java Desktop System +Vendor: Sun Microsystems, Inc. +URL: http://www.gnome.org/ +Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.7/%{name}-%{version}.tar.gz +# date:2008-06-24 owner:halton type:bug bugzilla:539930 +Patch1: %{name}-01-no-sunmath-lib.diff +BuildRoot: %{tmpdir}/%{name}-%{version}-root + +BuildRequires: automake1.8 +BuildRequires: intltool +BuildRequires: gtk+2-devel +BuildRequires: libgnomeprint-devel >= 2.8.2 +BuildRequires: libgsf-devel >= 1:1.13.3 +BuildRequires: libglade2.0-devel +BuildRequires: gtk-doc +BuildRequires: perl-XML-Parser + + +%description +There are common operations for document centric applications that are +conceptually simple, but complex to implement fully. + - plugins + - load/save documents + - undo/redo + +%prep +%setup -q +%patch1 -p1 + +%build +%ifos linux +if [ -x /usr/bin/getconf ]; then + CPUS=`getconf _NPROCESSORS_ONLN` +fi +%else + CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '` +%endif +if test "x$CPUS" = "x" -o $CPUS = 0; then + CPUS=1 +fi + +aclocal $ACLOCAL_FLAGS +libtoolize --force +intltoolize --force --automake +autoheader +automake -a -f -c --gnu +autoconf + +CFLAGS="$RPM_OPT_FLAGS" +./configure --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --libexecdir=%{_libexecdir} \ + --datadir=%{_datadir} \ + --mandir=%{_mandir} \ + --sysconfdir=%{_sysconfdir} \ + %gtk_doc_option + +make -j $CPUS + + +%install +export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 +make -i install DESTDIR=$RPM_BUILD_ROOT +unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL +find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';' + + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc README NEWS AUTHORS BUGS ChangeLog MAINTAINERS +%{_libdir}/lib*.so* +%dir %{_libdir}/%name/ +%{_datadir}/%name +%{_datadir}/pixmaps/%name +%{_includedir}/libgoffice-0.3/ +%attr(644,root,root) %{_libdir}/lib*a +%{_libdir}/pkgconfig/*.pc +%{_datadir}/gtk-doc/html/goffice/ + + +%changelog +* Wed Jun 25 2008 - no...@us... +- Bump to 0.7.0 +* Tue Jun 24 2008 - no...@us... +- Initial version Added: spec-files-extra/trunk/base-specs/tsclient.spec =================================================================== --- spec-files-extra/trunk/base-specs/tsclient.spec (rev 0) +++ spec-files-extra/trunk/base-specs/tsclient.spec 2008-06-30 09:27:10 UTC (rev 1262) @@ -0,0 +1,103 @@ +# +# spec file for package tsclient +# +# Copyright 2008 Sun Microsystems, Inc. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Owner: halton +# bugdb: http://sourceforge.net/tracker/index.php?func=detail&group_id=192483&atid=941574&aid= +# + + +Name: tsclient +Summary: a frontend for rdesktop and other remote desktop tools for the GNOME2 platform. +License: GPL +Group: User Interface/Desktops +Version: 0.150 +Release: 1 +Distribution: Java Desktop System +Vendor: Sun Microsystems, Inc. +URL: http://sourceforge.net/projects/tsclient +Source: http://%{sf_mirror}/%{name}/%{name}-%{version}.tar.gz +# date:2008-06-19 owner:halton type:bug bugid:1997801 +Patch1: %{name}-01-libsocket.diff +BuildRoot: %{tmpdir}/%{name}-%{version}-root + +Requires: glib2 >= 2.0.0, gtk2 >= 2.0.0, rdesktop >= 1.3.0, vnc >= 4.0 +BuildRequires: glib2-devel >= 2.0.0, gtk2-devel >= 2.0.0 + + +%description +Terminal Server Client is a frontend for rdesktop, vnc and other remote desktop tools. + + +%prep +%setup -q +%patch1 -p1 + + +%build +%ifos linux +if [ -x /usr/bin/getconf ]; then + CPUS=`getconf _NPROCESSORS_ONLN` +fi +%else + CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '` +%endif +if test "x$CPUS" = "x" -o $CPUS = 0; then + CPUS=1 +fi + +aclocal $ACLOCAL_FLAGS +libtoolize --force +intltoolize --force --automake +autoheader +automake -a -f -c --gnu +autoconf + +CFLAGS="$RPM_OPT_FLAGS" +./configure --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --libexecdir=%{_libexecdir} \ + --datadir=%{_datadir} \ + --mandir=%{_mandir} \ + --sysconfdir=%{_sysconfdir} \ +%if %debug_build + --enable-debug=yes +%endif + +make -j $CPUS + + +%install +export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 +make -i install DESTDIR=$RPM_BUILD_ROOT +unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL +find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';' + + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc README ChangeLog AUTHORS NEWS +%{_prefix}/bin/tsclient +%{_prefix}/libexec/tsclient-applet +%{_libdir}/bonobo/servers/GNOME_TSClientApplet.server +%{_datadir}/applications/tsclient.desktop +%{_datadir}/pixmaps/*.png +%{_datadir}/pixmaps/tsclient +%{_datadir}/locale/*/LC_MESSAGES/tsclient.mo +%{_datadir}/application-registry/tsclient.* +%{_datadir}/mime-info/tsclient.* +%{_datadir}/man/man1/tsclient.1* + + +%changelog +* Fri Jun 27 2008 - no...@us... +- Add debug option +* Thu Jun 19 2008 - no...@us... +- Initial version Added: spec-files-extra/trunk/patches/goffice-01-no-sunmath-lib.diff =================================================================== --- spec-files-extra/trunk/patches/goffice-01-no-sunmath-lib.diff (rev 0) +++ spec-files-extra/trunk/patches/goffice-01-no-sunmath-lib.diff 2008-06-30 09:27:10 UTC (rev 1262) @@ -0,0 +1,42 @@ +Index: trunk/configure.in +=================================================================== +--- trunk/configure.in (revision 2123) ++++ trunk/configure.in (working copy) +@@ -440,7 +440,12 @@ + if test $ac_cv_c_long_double = yes; then + have_mandatory_funcs=yes + need_sunmath=0 +- sunmathlinkstuff='-L/opt/SUNWspro/lib -R/opt/SUNWspro/lib -lsunmath' ++ ss_cc=`which $CC` ++ ss_dir=`dirname $ss_cc`"/.." ++ if test ! -f $ss_dir/lib/libsunmath.so; then ++ ss_dir="/opt/SUNWspro" ++ fi ++ sunmathlinkstuff="-L$ss_dir/lib -R$ss_dir/lib -lsunmath" + for ldfunc in fabsl logl log10l ceill floorl powl isnanl finitel; do + AC_CHECK_FUNC($ldfunc, + , +@@ -452,12 +457,12 @@ + [ if test $need_sunmath = 0; then + # FIXME: better idea? + LDFLAGS="$LDFLAGS $sunmathlinkstuff" +- sunmathinclude=`ls -d /opt/SUNWspro/*/include/cc | sed '$!d'` ++ sunmathinclude=`ls -d $ss_dir/*/include/cc | sed '$!d'` + CPPFLAGS="$CPPFLAGS -I$sunmathinclude" + fi + need_sunmath=1 ], + [have_mandatory_funcs=no], +- [-L/opt/SUNWspro/lib $GOFFICE_LIBS])])]) ++ [-L$ss_dir/lib $GOFFICE_LIBS])])]) + done + if test $need_sunmath = 1; then + EXTRA_LIBS="$EXTRA_LIBS $sunmathlinkstuff" +@@ -467,6 +472,8 @@ + [AC_MSG_WARN([Long doubles require the $ac_header header.]) + have_mandatory_funcs=no]) + fi ++ unset ss_cc ++ unset ss_dir + unset need_sunmath + unset sunmathlinkstuff + unset sunmathinclude Added: spec-files-extra/trunk/patches/tsclient-01-libsocket.diff =================================================================== --- spec-files-extra/trunk/patches/tsclient-01-libsocket.diff (rev 0) +++ spec-files-extra/trunk/patches/tsclient-01-libsocket.diff 2008-06-30 09:27:10 UTC (rev 1262) @@ -0,0 +1,14 @@ +Index: trunk/configure.in +=================================================================== +--- trunk/configure.in (revision 63) ++++ trunk/configure.in (working copy) +@@ -25,6 +25,9 @@ + + dnl ========================================================================== + ++dnl Check for bind in libsocket (needed on Solaris) ++AC_CHECK_LIB(socket, bind) ++ + set_debug=no + AC_ARG_ENABLE(debug, + [ --enable-debug Lots of noisy debug messages], This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |