Some comments below.
>
>
>
>
>
>
> rpm spec file
> attachment
> (mousetweaks.spec)
> %install
> echo "RPM_BUILD_ROOT"
> echo $RPM_BUILD_ROOT
The above 2 lines look like they were left there from debugging.
> rm -rf $RPM_BUILD_ROOT
Please move this to the SUNW spec file.
> export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
> make DESTDIR=$RPM_BUILD_ROOT install
> unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
> %clean
>
>
>
> differences
> between files
> attachment
> (mousetweaks-01-mfversion.diff)
>
> --- mousetweaks-2.21.90/configure 2008-01-28 02:08:31.000000000
> +0800
> +++ mousetweaks-2.21.90/configure.new 2008-02-02 11:38:30.648449000
Please don't patch configure files, they are generated files.
Patch configure.in or configure.ac instead and add an autoconf
line to %build.
> +0800
> @@ -6095,8 +6095,7 @@
> fi
> xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
> mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
> -mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
> -if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
> +if test -z "$xgversion" -o -z "$mmversion"; then
Actually, for this fix, you don't even need a patch.
Add intltoolize, aclocal, autoconf, automake and it should
go away, because this is already fixed in the intltool macro
that we ship in SUNWgnome-common-devel.
>
> --- mousetweaks-2.21.1/src/Makefile.in 2008-01-28 02:08:35.000000000
> +0800
> +++ mousetweaks-2.21.1/src/Makefile.in.new 2008-01-31
> 16:30:47.273394000 +0800
> @@ -257,8 +257,7 @@
> AM_CFLAGS = \
> -DGLADEDIR=\"$(gladedir)\" \
> -DDATADIR=\"$(datadir)\" \
> - -DLOCALEDIR=\"$(localedir)\" \
> - -Wall -export-dynamic
> + -DLOCALEDIR=\"$(localedir)\"
>
> @BUILD_PCA_TRUE at pca_bin = pointer-capture-applet
> @BUILD_CTA_TRUE at cta_bin = dwell-click-applet
The -Wall flag should be reported upstream.
Why was -export-dynamic removed?
> %include Solaris.inc
> %use mousetweaks = mousetweaks.spec
>
> Name: SUNWgnome-a11y-mousetweaks
> Summary: provided mouse accessibility enhancements
> Version: %{mousetweaks.version}
> SUNW_BaseDir: %{_basedir}
> BuildRoot: %{_tmppath}/%{name}-%{version}-build
>
> %prep
> rm -rf %name-%version
> mkdir %name-%version
> %mousetweaks.prep -d %name-%version
> cd %{_builddir}/%name-%version
> gzcat %SOURCE0 | tar xf -
There is no %SOURCE0 defined.
> %build
> export PKG_CONFIG_PATH=%{_pkg_config_path}
> export MSGFMT="/usr/bin/msgfmt"
The above 2 lines should not be needed, in fact setting MSGFMT will
break the build on indiana, please remove them.
> export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
> export CFLAGS="%optflags -I%{_includedir}"
Is there a reason for including %{_includedir} or was this just
copy&pasted from another spec file? Same for ACLOCAL_FLAGS.
> export RPM_OPT_FLAGS="$CFLAGS"
> export LDFLAGS="%_ldflags"
>
> %mousetweaks.build -d %name-%version
>
> %install
> gconftool-2 --shutdown
Why?
> %mousetweaks.install -d %name-%version
>
> %if %build_l10n
> %else
> # REMOVE l10n FILES
> rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
> %endif
>
>
> %{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:
> %{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):
> %{support_level}" $RPM_BUILD_ROOT}
>
> %clean
> rm -rf $RPM_BUILD_ROOT
>
> %post
> %include desktop-database-install.script
> %include scrollkeeper-update.script
>
> %postun
> test -x $BASEDIR/lib/postrun || exit 0
> %include desktop-database-uninstall.script
> %include scrollkeeper-update.script
SUNWgnome-a11y-mousetweaks should depend on SUNWpostrun.
BTW, does it really need libdaemon? I don't see that
in the configure script.
Laca
> %post root
> %include gconf-install.script
>
> %preun root
> test -x $BASEDIR/var/lib/postrun/postrun || exit 0
> ( echo 'test -x /usr/bin/gconftool-2 || {';
> echo ' echo "ERROR: gconftool-2 not found"';
> echo ' exit 0';
> echo '}';
> echo 'umask 0022';
> echo 'GCONF_CONFIG_SOURCE=xml:merged:
> $PKG_INSTALL_ROOT/etc/gconf/gconf.xml.defaults';
> echo 'GCONF_BACKEND_DIR=$PKG_INSTALL_ROOT/usr/lib/GConf/2';
> echo 'LD_LIBRARY_PATH=$PKG_INSTALL_ROOT/usr/lib';
> echo 'export GCONF_CONFIG_SOURCE GCONF_BACKEND_DIR LD_LIBRARY_PATH';
> echo 'SDIR=$PKG_INSTALL_ROOT%{_sysconfdir}/gconf/schemas';
> echo 'schemas="$SDIR/mousetweaks.schemas';
> echo ' $SDIR/pointer-capture-applet.schemas"';
> echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2
> --makefile-uninstall-rule $schemas'
> ) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
>
>
> %files
> %defattr(-,root,bin)
> %dir %attr (0755, root, bin) %{_bindir}
> %{_bindir}/*
> %dir %attr (0755, root, bin) %{_libdir}
> %{_libdir}/*
> %dir %attr(0755, root, sys) %{_datadir}
> %{_datadir}/mousetweaks
> %dir %attr (0755, root, other) %{_datadir}/gnome
> %dir %attr (0755, root, bin) %{_datadir}/gnome/help
> %{_datadir}/gnome/help/*
> %dir %attr(0755, root, bin) %{_mandir}
> %dir %attr(0755, root, bin) %{_mandir}/man1
> %{_mandir}/man1/*
>
>
> %if %build_l10n
> %files l10n
> %defattr (-, root, bin)
> %dir %attr (0755, root, sys) %{_datadir}
> %attr (-, root, other) %{_datadir}/locale
> %endif
>
> %files root
> %defattr (-, root, sys)
> %attr (0755, root, sys) %dir %{_sysconfdir}
> %{_sysconfdir}/gconf/schemas/mousetweaks.schemas
> %{_sysconfdir}/gconf/schemas/pointer-capture-applet.schemas
>
>
>
> %changelog
> * Tue Jan 29 2008 Li Yuan <li.yuan at sun.com>
> - Initial version.
