... well, from Fedora Core 6.
This review is for SUNWgnome-xml-share and SUNWgnome-xml-root.
As indicated earlier, I'm deleting all the old SuSE specs and patches
and use the latest Fedora Core specs and patches instead.
Since this is a new start, I'm not going to include diffs in this
review (they would be unreadable anyway). Instead, attaching the
new SUNWgnome-xml.spec and a tarball of the Fedora specs and patches.
I made the following changes to the original Fedora specs:
- renamed the patches to follow JDS patch naming conventions
- added patch comments
- added comment block to the top
- removed rm -rf $DESTDIR from %install so that we can
combine them into one package
- s/tar/gtar/ s/patch/gpatch
- removed some build crack from sgml-common.spec
I did not change the patches themselves.
The fedora spec files had a bunch of postinstall/preuninstall
scripts that update the xml/sgml catalogs. I concatenated these
into two scripts and replaced %version with $Version (defined Version
at the top). These scripts live in /usr/share/sgml/docbook.
They are called by postrun scripts, because they use /bin/xmlcatalog
to update the catalogs.
Summary of changes:
D ext-sources/dbtohtml.dsl
D ext-sources/docbook-xsl-stylesheets-README.SuSE
D ext-sources/png-support.dtd
D ext-sources/png-support-3.1.dtd
D ext-sources/ld2db.dsl
D ext-sources/docbook_3-README.SuSE
D ext-sources/docbook_4-README.SuSE
D ext-sources/docbook-dsssl-stylesheets-README.SuSE
D Solaris/patches/docbook-xsl-stylesheets-02-g11n-i18n-ja.diff
D Solaris/patches/docbk30xml.dif
D Solaris/patches/docbk30.dif
D Solaris/patches/docbkdsl.dif
D Solaris/patches/docbk30sxml.dif
D Solaris/extra-specs/docbook-dsssl-stylesheets-1.77.spec
D Solaris/extra-specs/sgml-skel.spec
D Solaris/extra-specs/docbook-xsl-stylesheets-1.60.1.spec
D Solaris/extra-specs/docbook_3-3.1.spec
D Solaris/extra-specs/docbook_4-4.2.spec
M Solaris/SUNWgnome-xml.spec
A docbook-style-dsssl.spec
A docbook-dtds.spec
A docbook-style-xsl.spec
A sgml-common.spec
A patches/sgml-common-01-umask.diff
A patches/sgml-common-02-xmldir.diff
A patches/sgml-common-03-quotes.diff
A patches/sgml-common-04-automake.diff
A patches/sgml-common-05-docdir.diff
A patches/docbook-dtds-01-30-sgml-1.0.catalog.diff
A patches/docbook-dtds-02-31-sgml-1.0.catalog.diff
A patches/docbook-dtds-03-40-sgml-1.0.catalog.diff
A patches/docbook-dtds-04-41-sgml-1.0.catalog.diff
A patches/docbook-dtds-05-42-sgml-1.0.catalog.diff
A patches/docbook-dtds-06-4.2-euro.diff
A patches/docbook-dtds-07-ents.diff
A patches/docbook-style-xsl-01-pagesetup.diff
A patches/docbook-style-xsl-02-marginleft.diff
A patches/docbook-style-xsl-03-lists.diff
A patches/docbook-style-xsl-04-sp.diff
A ext-sources/docbook-style-dsssl.Makefile
A ext-sources/docbook-style-xsl.Makefile
A ext-sources/html.soc
A ext-sources/docbook-catalog-install.sh
A ext-sources/xml.soc
A ext-sources/html.dcl
A ext-sources/xml.dcl
A ext-sources/docbook-catalog-uninstall.sh
Attachments:
1) SUNWgnome-xml.spec - the new spec file
2) docbook-fedora.tar.bz2 - all (modified) fedora spec files, patches
and ext-sources
3) docbook-catalog-install.sh
4) docbook-catalog-uninstall.sh
Thanks,
Laca
-------------- next part --------------
#
# spec file for package SUNWgnome-xml-root and SUNWgnome-xml-share
#
# includes module(s): sgml-common docbook-dtds docbook-style-dsssl
# docbook-style-xsl
# all of the above originally taken from Fedora Core 6
#
# Copyright 2007 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Owner: laca
#
%include Solaris.inc
%use common = sgml-common.spec
%use dtds = docbook-dtds.spec
%use dsssl = docbook-style-dsssl.spec
%use xsl = docbook-style-xsl.spec
Name: SUNWgnome-xml-share
Summary: docbook SGML and XML stylesheets
Version: %{default_pkg_version}
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source1: docbook-catalog-install.sh
Source2: docbook-catalog-uninstall.sh
%include default-depend.inc
Requires: SUNWlxml
# /usr/bin/unzip in SUNWunzip on Nevada, SUNWswmt on Solaris 10.
%if %is_nevada
BuildRequires: SUNWunzip
%else
BuildRequires: SUNWswmt
%endif
%package -n SUNWgnome-xml-root
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
Requires: SUNWgnome-xml-share
Requires: SUNWpostrun-root
%prep
rm -rf %name-%version
mkdir %name-%version
%common.prep -d %name-%version
%dtds.prep -d %name-%version
%dsssl.prep -d %name-%version
%xsl.prep -d %name-%version
%build
%common.build -d %name-%version
%dtds.build -d %name-%version
%dsssl.build -d %name-%version
%xsl.build -d %name-%version
%install
rm -rf $RPM_BUILD_ROOT
%common.install -d %name-%version
%dtds.install -d %name-%version
%dsssl.install -d %name-%version
%xsl.install -d %name-%version
install -m 744 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/sgml/docbook
install -m 744 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/sgml/docbook
touch $RPM_BUILD_ROOT%{_sysconfdir}/xml/catalog
# move collateindex.pl out of /usr/bin
mv $RPM_BUILD_ROOT%{_bindir}/collateindex.pl \
$RPM_BUILD_ROOT%{_datadir}/sgml/docbook
rmdir $RPM_BUILD_ROOT%{_bindir}
# move /usr/share/sgml/docbook/xmlcatalog to /etc/xml because it's edited
# by the postinstall script
mv $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/xmlcatalog \
$RPM_BUILD_ROOT%{_sysconfdir}/xml/docbook-xmlcatalog
( cd $RPM_BUILD_ROOT%{_datadir}/sgml/docbook;
ln -s ../../../../etc/xml/docbook-xmlcatalog xmlcatalog )
# create an empty catalog so that it's included in the pkgmap
touch $RPM_BUILD_ROOT%{_sysconfdir}/sgml/catalog
# remove stale symlinks -- the files these point to are created by the
# postinstall script, so create the symlink there
rm $RPM_BUILD_ROOT%{_sysconfdir}/sgml/sgml-docbook.cat
rm $RPM_BUILD_ROOT%{_sysconfdir}/sgml/xml-docbook.cat
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr (-, root, bin)
%dir %attr (0755, root, sys) %{_datadir}
%{_datadir}/*
%files -n SUNWgnome-xml-root
%defattr (-, root, sys)
%dir %attr (0755, root, sys) %{_sysconfdir}
%ghost %{_sysconfdir}/*
%defattr (-, root, sys)
%post -n SUNWgnome-xml-root
( echo %{_datadir}/sgml/docbook/docbook-catalog-install.sh
) | $BASEDIR/var/lib/postrun/postrun -b -c JDS
%preun -n SUNWgnome-xml-root
test -x $BASEDIR/var/lib/postrun/postrun || exit 0
( echo %{_datadir}/sgml/docbook/docbook-catalog-uninstall.sh
) | $BASEDIR/var/lib/postrun/postrun -c JDS
%changelog
* Sun Jun 11 2006 - laca at sun.com
- change group from other to bin/sys
* Tue Mar 21 2006 - damien.carbery at sun.com
- Modify BuildRequires to work on s10 and snv, where /usr/bin/unzip in
different packages.
* Mon Mar 13 2006 - damien.carbery at sun.com
- Add BuildRequires for SUNWunzip.
* Mon Feb 20 2006 - damien.carbery at sun.com
- Update Build/Requires after running check-deps.pl script.
* Fri Jan 27 2006 - damien.carbery at sun.com
- Add BuildRequires SUNWswmt for /usr/bin/unzip.
* Tue Sep 13 2005 - brian.cameron at sun.com
- Bump to 2.12.
* Thu Sep 08 2005 - brian.cameron at sun.com
- Verified builds fine on Solaris, bump to 2.11.
* Fri Sep 02 2005 - laca at sun.com
- remove unpackaged files
* Sat Jun 26 2004 shirley.woo at sun.com
- Changed install location to /usr/...
* Tue Feb 24 2004 - laca at sun.com
- Initial version
-------------- next part --------------
A non-text attachment was scrubbed...
Name: docbook-fedora.tar.bz2
Type: application/x-bzip-compressed-tar
Size: 19053 bytes
Desc: not available
URL:
<http://mail.opensolaris.org/pipermail/jds-review/attachments/20070221/3d8105af/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: docbook-catalog-install.sh
Type: application/x-shellscript
Size: 29603 bytes
Desc: not available
URL:
<http://mail.opensolaris.org/pipermail/jds-review/attachments/20070221/3d8105af/attachment-0001.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: docbook-catalog-uninstall.sh
Type: application/x-shellscript
Size: 15181 bytes
Desc: not available
URL:
<http://mail.opensolaris.org/pipermail/jds-review/attachments/20070221/3d8105af/attachment-0002.bin>
