sustaining/oi_151a/spec-files: comparison gnome-user-docs.spec

equal deleted inserted replaced

-:c3ddcedacbf0
+:235b0b4aa324
 #
-# Copyright (c) Sun Microsystems, Inc.
+# spec file for package gnome-user-docs
+#
+# Copyright (c) 2005 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
 #
 Name:		        gnome-user-docs
 License:		FDL
 Group:			Documentation
 BuildArchitectures:	noarch
 Version:		2.5.0
-Release:		42
+Release:		48
-Distribution:		Java Desktop System, Release 3
+Distribution:		Java Desktop System
 Vendor:			Sun Microsystems, Inc.
 Summary:		User Documentation for the GNOME desktop
 Source:		        http://ftp.gnome.org/pub/GNOME/sources/gnome2-user-docs/2.0/gnome2-user-docs-%{version}.tar.bz2
-Source1:	        gnome-user-docs-l10n-online-help-ci-linux-1.1.tar.bz2
+Source1:	        gnome-user-docs-l10n-online-help-ci-linux-1.3.tar.bz2
 Source2:		gnome-user-docs-AG-0.10linux.tar.bz2
 Source3:		quick-start-user-guide-0.5.tar.bz2
 Source4:		gnome-user-docs-SAG-0.17linux.tar.bz2
 Source5:		gnome-user-docs-SAG-0.13solaris.tar.bz2
 Source6:                gnome-user-docs-UG-0.28linux.tar.bz2
 Source7:                gnome-user-docs-UG-0.21solaris.tar.bz2
 Source8:		gnome-user-docs-ORMS-0.6solaris.tar.bz2
 Source9:		gnome-user-docs-ORMS-0.12linux.tar.bz2
-Source10:		l10n-configure.sh
 Patch1:		   	gnome-user-docs-01-l10n-online-help.diff
 Patch2:		   	gnome-user-docs-02-sun-desktop-section.diff
 Patch3:                 gnome-user-docs-03-add-l10n-docs.diff
 Patch4:                 gnome-user-docs-04-preface-xml.diff
 Patch5:                 gnome-user-docs-05-omfdestdir.diff
 %prep
 %setup -q -n gnome2-user-docs-%{version}
 rm -Rf gnome2-user-guide/C/figures
 %ifos solaris
-bzcat %SOURCE7 | tar xvf -
+# FIXME: Use Linux UG tarball because floppy-formatter-C.omf not in Solaris ver
-%else
+# FIXME: and its absense breaks the build.
+# FIXME: bzcat %SOURCE7 | tar xvf -
 bzcat %SOURCE6 | tar xvf -
+%else
+bzcat %SOURCE6 | tar xvf -
 %endif
 bzcat %SOURCE3 | tar xf -
 %ifos solaris
 bzcat %SOURCE5 | tar xf -
 %else
 bzcat %SOURCE4 | tar xf -
 %endif
 bzcat %SOURCE2 | tar xf -
 %ifos solaris
-bzcat %SOURCE8 | tar xf -
+# FIXME: Use Linux ORMS tarball because online_update-C.omf not in Solaris ver
+# FIXME: and its absense breaks the build.
+# FIXME: bzcat %SOURCE8 | tar xf -
+bzcat %SOURCE9 | tar xf -
 %else
 bzcat %SOURCE9 | tar xf -
 %endif
 bzcat %SOURCE1 | tar xf -
 %patch2 -p1
 %endif
 %patch7 -p1
 %patch8 -p1
 %patch1 -p1
-bash -x %SOURCE10
 %build
 %ifos linux
 if [ -x /usr/bin/getconf ]; then
 CPUS=`getconf _NPROCESSORS_ONLN`
 if test "x$CPUS" = "x" -o $CPUS = 0; then
 CPUS=1
 fi
 libtoolize --force
-aclocal -I %{_datadir}/aclocal/gnome2-macros
+aclocal $ACLOCAL_FLAGS
 automake -a -c -f
 autoconf
 ./configure --prefix=%{_prefix}			\
 --datadir=%{_datadir}
 %{_datadir}/gnome/help/*
 %{_datadir}/gnome/javahelp/*
 %{_datadir}/omf/*
 %changelog
+* Fri Jul 15 2005 - [email protected]
+- Use Linux docs tarballs on Solaris because some omf files missing.
+* Mon Jun 20 2005 - [email protected]
+- Update l10n tarball to 1.3
 * Thu May 05 2005 - [email protected]
 - Updated docs tarball (gnome-user-docs-AG-0.10linux) from [email protected].
 * Wed May 04 2005 - [email protected]
 - Updated docs tarball (gnome-user-docs-AG-0.9linux) from [email protected].

changeset 5518	235b0b4aa324
parent 5517	c3ddcedacbf0
child 5529	9133a916e53a