> +rm -rf $RPM_BUILD_ROOT%{_bindir}/psktool
> rm -rf $RPM_BUILD_ROOT%{_datadir}/man
> rm -rf $RPM_BUILD_ROOT%{_datadir}/info
1) I would like to see '-rf' switches removed so that we know when these
directories/files have been moved or removed and we can then update the
spec file.
2) You say that "we do not use it (psktool) now". Is it a problem to
leave that file in the package? Maybe someone else will need that file.
> +rm -rf doc/signatures.texi
> +touch doc/signatures.texi
Again, please don't use '-rf'. If signatures.texi disappeared from the
build we would not see a build error, we would continue to create an
empty signatures.texi. In that situation we should probably remove those
two lines.
Damien
Jedy Wang wrote:
> Hi all,
>
> The patch to bump gnutls and fix some build problems is attached. Please
> review it.
>
> psktool is a new tool in gnutls which we do not need right now, so I
> removed it. And doc/signatures.texi contains @euro which is not
> compatible with makeinfo on Solaris, so I removed the original file and
> create a new one.
>
> Regards,
>
> Jedy Wang
>
>
> ------------------------------------------------------------------------
>
> Index: Solaris/SUNWgnutls.spec
> ===================================================================
> --- Solaris/SUNWgnutls.spec (revision 9567)
> +++ Solaris/SUNWgnutls.spec (working copy)
> @@ -40,6 +40,7 @@
>
> %install
> %gnutls.install -d %name-%version
> +rm -rf $RPM_BUILD_ROOT%{_bindir}/psktool
> rm -rf $RPM_BUILD_ROOT%{_datadir}/man
> rm -rf $RPM_BUILD_ROOT%{_datadir}/info
>
> @@ -72,6 +73,8 @@
> %{_datadir}/aclocal/*
>
> %changelog
> +* Wed Oct 25 2006 - jedy.wang at sun.com
> +- Remove bin/psktool because we do not use it now
> * Sun Jun 11 2006 - laca at sun.com
> - change group from other to bin/sys
> * Thu May 11 2006 - halton.huo at sun.com
> Index: Solaris/extra-specs/gnutls.spec
> ===================================================================
> --- Solaris/extra-specs/gnutls.spec (revision 9567)
> +++ Solaris/extra-specs/gnutls.spec (working copy)
> @@ -5,7 +5,7 @@
> #
>
> Name: gnutls
> -Version: 1.2.10
> +Version: 1.4.4
> Release: 1
> Vendor: Sun Microsystems, Inc.
> Distribution: Java Desktop System
> @@ -14,7 +14,7 @@
> Docdir: %{_datadir}/doc
> Autoreqprov: on
> URL: http://www.gnutls.org
> -Source: ftp://ftp.gnutls.org/pub/gnutls/%{name}-%{version}.tar.bz2
> +Source: http://ftp.gnutls.org/pub/gnutls/%{name}-%{version}.tar.bz2
> Source1: l10n-configure.sh
>
> %define glib2_version 2.0
> @@ -97,6 +97,8 @@
> DESTDIR=${DESTDIR:-"$RPM_BUILD_ROOT"}
> ARCH=%{_target_platform}
> export MAKE RPM_COMMAND DESTDIR ARCH
> +rm -rf doc/signatures.texi
> +touch doc/signatures.texi
> case "$RPM_COMMAND" in
> prepare|all)
> ./configure --prefix=%{_prefix} --sysconfdir=%{_sysconfdir}
> --mandir=%{_mandir} --infodir=%{_datadir}/info --localstatedir=/var
> --with-included-libtasn1
> @@ -140,6 +142,11 @@
>
>
> %changelog
> +* Wed Oct 25 2006 - halton.huo at sun.com
> +- Bump to 1.4.4.
> +- Remove doc/signatures.texi because makeinfo
> + on Solaris does not support @euro yet.
> +
> * Thu Apr 20 2006 - halton.huo at sun.com
> - Bump to 1.2.10.
>
--
Damien Carbery, Gnome Release Engineer
Ext: x (70) 19218
