Apologies for combining fixes, I decided to make the gtk-doc changes when
I was trying to rebuild SUNWgnome-base-libs to test the fix for 6443777
and it was frying my CPU...
So the changes are:
1) defined a new option in Solaris.inc: --without-gtk-doc if you use
this with pkgbuild or pkgtool, %gtk_doc_option will be defined
as --disable-gtk-doc. By default, it'll be --enable-gtk-doc.
This makes is _a lot_ faster to rebuild modules like
SUNWgnome-base-libs.
2) Added --datadir=%{_datadir} to the gtk2 configure options so that
it's not defined as '${prefix}/share' in the binaries
3) Add -lm to poppler's LDFLAGS
4) fixed prepare-ChangeLog.pl to work with Subversion 1.4.0
5+) made some patch comment changes that I'm using to test the
patch report script I'm writing.
Laca
Index: ChangeLog
===================================================================
--- ChangeLog (revision 9656)
+++ ChangeLog (working copy)
@@ -1,3 +1,23 @@
+2006-11-03 Laszlo (Laca) Peter <laca at sun.com>
+
+ * gtk2.spec: use %gtk_doc_option in configure so that it can be
+ disabled using --without-gtk-doc; add --datadir=%{_datadir}
+ to the configure options, fixes 6443777
+ * GConf.spec, ORBit2.spec, at-spi.spec, atk.spec, cairo.spec,
+ evolution-data-server.spec, gail.spec, gimp.spec, glib2.spec,
+ gnome-panel.spec, gnome-python-desktop.spec, gnome-vfs.spec,
+ gst-plugins-base.spec, gst-plugins-good.spec, gst.spec,
+ gtksourceview.spec, libbonobo.spec, libbonoboui.spec, libglade.spec,
+ libgnome.spec, libgnomecanvas.spec, libgnomeprint.spec,
+ libgnomeprintui.spec, libgnomeui.spec, liboil.spec, librsvg.spec,
+ pango.spec, poppler.spec, vte.spec: use %gtk_doc_option in
+ configure so that it can be disabled using --without-gtk-doc
+ * scripts/prepare-ChangeLog.pl: update to work with subversion 1.4.0
+ where .svn/README.txt doesn't exist
+ * brltty.spec: update patch comments
+ * file-roller.spec: add owner and patch comments
+ * gaim.spec: add patch comments
+
2006-11-03 Damien Carbery <damien.carbery at sun.com>
* gaim.spec: Specify sysconfdir in configure call as gaim.schemas is
Index: scripts/prepare-ChangeLog.pl
===================================================================
--- scripts/prepare-ChangeLog.pl (revision 9656)
+++ scripts/prepare-ChangeLog.pl (working copy)
@@ -52,7 +52,7 @@
{
$command = "cvs";
}
-elsif (-e ".svn/README.txt")
+elsif (-e ".svn/entries")
{
$command = "svn";
}
Index: gnome-panel.spec
===================================================================
--- gnome-panel.spec (revision 9656)
+++ gnome-panel.spec (working copy)
@@ -137,7 +137,7 @@
--mandir=%{_mandir} \
--sysconfdir=%{_sysconfdir} \
--disable-scrollkeeper \
- --enable-gtk-doc
+ %{gtk_doc_option}
make
@@ -216,6 +216,9 @@
%{_mandir}/man3/*
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Tue Oct 03 2006 - damien.carbery at sun.com
- Bump to 2.16.1.
* Mon Oct 02 2006 - padraig.obriain at sun.com
Index: gtk2.spec
===================================================================
--- gtk2.spec (revision 9656)
+++ gtk2.spec (working copy)
@@ -137,7 +137,7 @@
CPUS=1
fi
-CONFLAGS="--prefix=%{_prefix} --with-native-locale=yes \
+CONFLAGS="--prefix=%{_prefix} --datadir=%{_datadir} --with-native-locale=yes \
--with-xinput=xfree --mandir=%{_mandir} --infodir=%{_infodir} \
--enable-shm --enable-xim --enable-fbmanager --with-gdktarget=x11"
@@ -194,7 +194,7 @@
CFLAGS="$RPM_OPT_FLAGS" \
./configure $CONFLAGS \
--sysconfdir=%{_sysconfdir} \
- --enable-gtk-doc
+ %{gtk_doc_option}
make -j $CPUS
@@ -275,198 +275,148 @@
%{_mandir}/man3/*.gz
%changelog -n gtk2
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
+- add --datadir=%{_datadir} to the configure options, fixes 6443777
* Thu Oct 26 2006 padraig.obriain at sun.com
- Add patch, 18-recent-files-crash, for bugster 6485464, bugzilla 365031.
Index: librsvg.spec
===================================================================
--- librsvg.spec (revision 9656)
+++ librsvg.spec (working copy)
@@ -85,7 +85,7 @@
./configure --prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
--mandir=%{_mandir} \
- --enable-gtk-doc \
+ %{gtk_doc_option} \
--with-html-dir=%{_datadir}/gtk-doc/html/librsvg
make -j $CPUS
@@ -132,92 +132,67 @@
%{_datadir}/gtk-doc/html/librsvg
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Fri Nov 03 2006 - dermot.mccluskey at sun.com
- Bump to 2.16.1.
Index: brltty.spec
===================================================================
--- brltty.spec (revision 9656)
+++ brltty.spec (working copy)
@@ -15,7 +15,8 @@
Summary: Braille Support
Source: http://www.mielke.cc/brltty/releases/brltty-%{version}.tar.gz
Patch1: brltty-01-suncc.diff
-# date:2006-11-01 owner:damienc type:bug bugster:6454451
+# date:2006-11-01 owner:dcarbery type:bug bugster:6454451
+# patch sent upstream
Patch2: brltty-02-lib-symlinks.diff
URL: http://mielke.cc/brltty/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Index: gst-plugins-base.spec
===================================================================
--- gst-plugins-base.spec (revision 9656)
+++ gst-plugins-base.spec (working copy)
@@ -92,12 +92,9 @@
--prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
--mandir=%{_mandir} \
- --enable-gtk-doc \
+ %{gtk_doc_option} \
--enable-external
-# FIXME: hack: stop the build from looping
-touch po/stamp-it
-
if [ "$SMP" != "" ]; then
(make "MAKE=make -k -j $SMP"; exit 0)
make
@@ -144,250 +141,191 @@
%{_libdir}/libgst*.so
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Mon Oct 16 2006 - damien.carbery at sun.com
- Remove the '-f' from the 'rm *.la *.a' lines so that any changes to the
module source will be seen as a build error and action can be taken.
Index: libgnomeui.spec
===================================================================
--- libgnomeui.spec (revision 9656)
+++ libgnomeui.spec (working copy)
@@ -89,7 +89,7 @@
--sysconfdir=%{_sysconfdir} \
--mandir=%{_mandir} \
--libexecdir=%{_libexecdir} \
- --enable-gtk-doc
+ %{gtk_doc_option}
make -j $CPUS
%install
@@ -134,197 +134,144 @@
%{_mandir}/man3/*
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Thu Oct 05 2006 - damien.carbery at sun.com
- Bump to 2.16.1. Remove upstream patch, 03-hang-on-mutex.
Index: gnome-python-desktop.spec
===================================================================
--- gnome-python-desktop.spec (revision 9656)
+++ gnome-python-desktop.spec (working copy)
@@ -74,7 +74,8 @@
%build
CFLAGS="$RPM_OPT_FLAGS" \
./configure --prefix=%{_prefix} \
- --sysconfdir=%{_sysconfdir}
+ --sysconfdir=%{_sysconfdir} \
+ %{gtk_doc_option}
make \
pyexecdir=%{_libdir}/python%{python_version}/vendor-packages \
pythondir=%{_libdir}/python%{python_version}/vendor-packages
@@ -107,14 +108,14 @@
%{_datadir}/gtk-doc
%changelog -n gnome-python-desktop
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Tue Sep 05 2006 - damien.carbery at sun.com
- Bump to 2.16.0.
Index: libbonoboui.spec
===================================================================
--- libbonoboui.spec (revision 9656)
+++ libbonoboui.spec (working copy)
@@ -77,7 +77,7 @@
./configure --prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
--libexecdir=%{_libexecdir} \
- --enable-gtk-doc
+ %{gtk_doc_option}
make -j $CPUS
%install
@@ -118,108 +118,79 @@
%{_mandir}/man3/*.gz
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Mon Sep 04 2006 - damien.carbery at sun.com
- Bump to 2.16.0.
Index: vte.spec
===================================================================
--- vte.spec (revision 9656)
+++ vte.spec (working copy)
@@ -81,7 +81,7 @@
--sysconfdir=%{_sysconfdir} \
--datadir=%{_datadir} \
--libexecdir=%{_libexecdir} \
- --enable-gtk-doc
+ %{gtk_doc_option}
make -j $CPUS \
pyexecdir=%{_libdir}/python%{python_version}/vendor-packages \
pythondir=%{_libdir}/python%{python_version}/vendor-packages
@@ -135,208 +135,153 @@
%{_libdir}/python2.4/vendor-packages/gtk-2.0/vtemodule.so
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Tue Oct 03 2006 - damien.carbery at sun.com
- Bump to 0.14.1.
Index: gail.spec
===================================================================
--- gail.spec (revision 9656)
+++ gail.spec (working copy)
@@ -70,7 +70,7 @@
CFLAGS="$RPM_OPT_FLAGS" \
./configure --prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
- --enable-gtk-doc
+ %{gtk_doc_option}
make -j $CPUS
%install
@@ -96,7 +96,7 @@
%files devel
%defattr(-, root, root)
-%doc %{_datadir}/gtk-doc/html/gail-libgail-util
+%{_datadir}/gtk-doc/html/gail-libgail-util
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%{_includedir}/*
@@ -104,169 +104,120 @@
%{_mandir}/man3/*
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Mon Oct 02 2006 - damien.carbery at sun.com
- Bump to 1.9.3.
Index: libbonobo.spec
===================================================================
--- libbonobo.spec (revision 9656)
+++ libbonobo.spec (working copy)
@@ -138,7 +138,7 @@
./configure $CONFLAGS \
--sysconfdir=%{_sysconfdir} \
--libexecdir=%{_libexecdir} \
- --enable-gtk-doc
+ %{gtk_doc_option}
make -j $CPUS
@@ -208,140 +208,102 @@
%{_mandir}/man3/*
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Fri Oct 06 2006 - padraig.obriain at sun.com
- Add patch libbonobo-03-close-down.diff to fix bug 6472900.
Index: evolution-data-server.spec
===================================================================
--- evolution-data-server.spec (revision 9656)
+++ evolution-data-server.spec (working copy)
@@ -120,6 +120,7 @@
%ldap_option \
--with-krb4=%{_prefix} \
%krb5_option \
+ %gtk_doc_option \
%bdb_option
make
@@ -162,25 +163,23 @@
%{_datadir}/idl/*
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Mon Nov 04 2006 - irene.huang at sun.com
- Change owner to be opensolaris account.
Index: libglade.spec
===================================================================
--- libglade.spec (revision 9656)
+++ libglade.spec (working copy)
@@ -123,7 +123,7 @@
CFLAGS="$RPM_OPT_FLAGS" \
./configure --prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
- --enable-gtk-doc
+ %{gtk_doc_option}
make -j $CPUS
%install
@@ -165,54 +165,41 @@
%{_mandir}/man3/*
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Thu Jul 20 2006 - damien.carbery at sun.com
- Bump to 2.6.0.
Index: pango.spec
===================================================================
--- pango.spec (revision 9656)
+++ pango.spec (working copy)
@@ -141,7 +141,7 @@
automake -a -c -f
./configure $CONFLAGS \
--sysconfdir=%{_sysconfdir} \
- --enable-gtk-doc
+ %{gtk_doc_option}
make -j $CPUS
%install
@@ -192,184 +192,136 @@
%{_mandir}/man3/*
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Mon Oct 16 2006 - damien.carbery at sun.com
- Bump to 1.14.7.
Index: libgnomeprintui.spec
===================================================================
--- libgnomeprintui.spec (revision 9656)
+++ libgnomeprintui.spec (working copy)
@@ -82,8 +82,8 @@
./configure --prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
--libexecdir=%{_libexecdir} \
- --mandir=%{_mandir} \
- --enable-gtk-doc
+ --mandir=%{_mandir} \
+ %{gtk_doc_option}
make -j $CPUS
%install
@@ -120,109 +120,82 @@
%{_mandir}/man3/*
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Wed Apr 26 2006 - ghee.teo at sun.com
- Fixed 6418240 with libgnomeprintui-01-papi-print-dialog.diff.
Index: liboil.spec
===================================================================
--- liboil.spec (revision 9656)
+++ liboil.spec (working copy)
@@ -105,7 +105,7 @@
--libdir=%{_libdir} \
--includedir=%{_includedir} \
--sysconfdir=%{_sysconfdir} \
- --enable-gtk-doc
+ %{gtk_doc_option}
make
%install
@@ -143,11 +143,12 @@
%{_datadir}/gtk-doc/*
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Wed Jun 14 2006 - brian.cameron at sun.com
- Bump to 0.3.9.
Index: atk.spec
===================================================================
--- atk.spec (revision 9656)
+++ atk.spec (working copy)
@@ -99,10 +99,11 @@
%endif
+gtkdocize
CFLAGS="$RPM_OPT_FLAGS" \
./configure $CONFLAGS \
--sysconfdir=%{_sysconfdir} \
- --enable-gtk-doc
+ %{gtk_doc_option}
make -j $CPUS
%install
@@ -143,96 +144,69 @@
%{_mandir}/man3/*
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Mon Oct 02 2006 - damien.carbery at sun.com
- Bump to 1.12.3.
Index: libgnomecanvas.spec
===================================================================
--- libgnomecanvas.spec (revision 9656)
+++ libgnomecanvas.spec (working copy)
@@ -84,7 +84,7 @@
./configure --prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
--mandir=%{_mandir} \
- --enable-gtk-doc
+ %{gtk_doc_option}
make -j $CPUS
@@ -123,66 +123,50 @@
%{_mandir}/man3/*
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Mon Mar 13 2006 - damien.carbery at sun.com
- Bump to 2.14.0.
Index: GConf.spec
===================================================================
--- GConf.spec (revision 9656)
+++ GConf.spec (working copy)
@@ -135,7 +135,7 @@
./configure $CONFLAGS \
--sysconfdir=%{_sysconfdir} \
--libexecdir=%{_libexecdir} \
- --enable-gtk-doc
+ %{gtk_doc_option}
# For some reason using -j $CPUS breaks the build on my machine with
# 2 processors, so just using make
@@ -199,6 +199,9 @@
%{_mandir}/man3/*
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Tue Oct 17 2006 - damien.carbery at sun.com
- Bump to 2.16.0.
* Mon Sep 25 2006 - padraig.obriain at sun.com
Index: libgnome.spec
===================================================================
--- libgnome.spec (revision 9656)
+++ libgnome.spec (working copy)
@@ -99,7 +99,7 @@
--sysconfdir=%{_sysconfdir} \
--libexecdir=%{_libexecdir} \
--mandir=%{_mandir} \
- --enable-gtk-doc
+ %{gtk_doc_option}
./config.status
make -j $CPUS
@@ -170,177 +170,131 @@
%{_mandir}/man7/*
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Mon Sep 04 2006 - damien.carbery at sun.com
- Bump to 2.16.0.
Index: gnome-vfs.spec
===================================================================
--- gnome-vfs.spec (revision 9656)
+++ gnome-vfs.spec (working copy)
@@ -133,7 +133,7 @@
./configure --prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
--libexecdir=%{_libexecdir} \
- --enable-gtk-doc
+ %{gtk_doc_option}
make -j $CPUS
%install
@@ -197,6 +197,9 @@
%{_mandir}/man3/*
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Mon Oct 23 2006 - takao.fujiwara at sun.com
- Added intlotoolize to build .po files. Fixes 6484798.
* Mon Oct 02 2006 - damien.carbery at sun.com
Index: ORBit2.spec
===================================================================
--- ORBit2.spec (revision 9656)
+++ ORBit2.spec (working copy)
@@ -151,7 +151,8 @@
CFLAGS="$RPM_OPT_FLAGS" \
./configure $CONFLAGS \
--sysconfdir=%{_sysconfdir} \
- --enable-gtk-doc
+ %{gtk_doc_option}
+
make -j $CPUS
%install
@@ -216,17 +217,18 @@
%{_mandir}/man3/*
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Wed Sep 20 2006 - brian.cameron at sun.omc
- Add patch ORBit-06-fixhyphen.diff to resolve escalation #1-19359745
and bug 6466464. GNOME Bugzilla bug #152659.
Index: file-roller.spec
===================================================================
--- file-roller.spec (revision 9656)
+++ file-roller.spec (working copy)
@@ -4,6 +4,7 @@
# 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.
+# Owner: mattman
#
Name: file-roller
License: GPL
@@ -16,6 +17,7 @@
Source:
http://ftp.gnome.org/pub/GNOME/sources/file-roller/2.16/%{name}-%{version}.tar.bz2
Source1: file-roller.1.gz
Patch1: file-roller-01-menu-entry.diff
+# owner:mattman type:bug date:2006-10-04 bugster:6478062 bugzilla:359629
Patch2: file-roller-02-rpm-cpio.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Index: gst.spec
===================================================================
--- gst.spec (revision 9656)
+++ gst.spec (working copy)
@@ -130,7 +130,7 @@
--prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
--mandir=%{_mandir} \
- --enable-gtk-doc \
+ %{gtk_doc_option} \
--disable-tests --disable-examples \
--program-suffix=""
@@ -203,151 +203,115 @@
%{_mandir}/man1/gst-*
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Mon Oct 16 2006 - damien.carbery at sun.com
- Remove the '-f' from the 'rm *.la *.a' lines so that any changes to the
module source will be seen as a build error and action can be taken.
Index: cairo.spec
===================================================================
--- cairo.spec (revision 9656)
+++ cairo.spec (working copy)
@@ -132,7 +132,7 @@
./configure \
--prefix=%{_prefix} \
--libdir=%{_libdir} \
- --enable-gtk-doc
+ %{gtk_doc_option}
make -j $CPUS
@@ -173,29 +173,25 @@
%{_libdir}/pkgconfig/*
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Mon Oct 16 2006 brian.cameron at sun.com
- Enable gtk-docs. This required adding gtkdocize and automake
before calling configure
Index: gst-plugins-good.spec
===================================================================
--- gst-plugins-good.spec (revision 9656)
+++ gst-plugins-good.spec (working copy)
@@ -86,7 +86,7 @@
--prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
--mandir=%{_mandir} \
- --enable-gtk-doc \
+ %{gtk_doc_option} \
--enable-external
# FIXME: hack: stop the build from looping
@@ -144,291 +144,224 @@
%{_datadir}/gtk-doc
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Tue Oct 17 2006 - damien.carbery at sun.com
- Remove code that deletes *.a and *.la from %{_libdir} as none are installed
there.
Index: libgnomeprint.spec
===================================================================
--- libgnomeprint.spec (revision 9656)
+++ libgnomeprint.spec (working copy)
@@ -90,7 +90,7 @@
./configure --prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
--mandir=%{_mandir} \
- --enable-gtk-doc
+ %{gtk_doc_option}
make -j $CPUS
@@ -134,47 +134,37 @@
%{_mandir}/man3/*
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Wed Aug 09 2006 - ghee.teo at sun.com
- Fixes 6437235 which also requires a patch in evince itself.
Index: poppler.spec
===================================================================
--- poppler.spec (revision 9656)
+++ poppler.spec (working copy)
@@ -122,7 +122,8 @@
--sysconfdir=%{_sysconfdir} \
--enable-poppler-glib \
--mandir=%{_mandir} \
- --enable-zlib
+ --enable-zlib \
+ %{gtk_doc_option}
make -j $CPUS
%install
@@ -153,6 +154,9 @@
%{_datadir}/gtk-doc
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Sun Jun 11 2006 - laca at sun.com
- Bump to 0.5.3 to fix the build of evince
- Add patch, 03-glib-2, so that configure looks for glib-2.0, not the old glib.
Index: gimp.spec
===================================================================
--- gimp.spec (revision 9656)
+++ gimp.spec (working copy)
@@ -131,7 +131,7 @@
--localstatedir=/var/lib \
--mandir=%{_mandir} \
--enable-mp \
- --enable-gtk-doc \
+ %{gtk_doc_option} \
--enable-default-binary \
%{mmx_options} \
%{print_options}
@@ -152,7 +152,7 @@
--localstatedir=/var/lib \
--mandir=%{_mandir} \
--enable-mp \
- --enable-gtk-doc \
+ %{gtk_doc_option} \
--enable-default-binary \
%{print_options}
make
@@ -236,141 +236,106 @@
%{_libdir}/pkgconfig/*.pc
%dir %{_libdir}/gimp/%{subver_install}/modules
%{_datadir}/aclocal/gimp-2.0.m4
-%doc %{_datadir}/gtk-doc/html/
+%{_datadir}/gtk-doc/html/
%{_mandir}/man1/gimptool-%{subver_install}.1*
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Tue Oct 17 2006 - matt.keenan at sun.com
-- Created bugzilla : #362877, attached patch gimp-02-Xext.diff, To get this
upstream
-
+- Created bugzilla : #362877, attached patch gimp-02-Xext.diff,
+ to get this upstream
* Tue Oct 17 2006 - damien.carbery at sun.com
- Add patch, 04-null-char, to remove a null char that is breaking the build.
Bugzilla #362832.
Index: at-spi.spec
===================================================================
--- at-spi.spec (revision 9656)
+++ at-spi.spec (working copy)
@@ -81,7 +81,7 @@
--sysconfdir=%{_sysconfdir} \
--mandir=%{_mandir} \
--libexecdir=%{_libexecdir} \
- --enable-gtk-doc
+ %{gtk_doc_option}
make -j $CPUS
%install
@@ -128,134 +128,97 @@
%{_mandir}/man3/*
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Wed Oct 11 2006 - padraig.obriain at sun.com
- Add patch 02-fix-leak to fix bug 6457388
Index: glib2.spec
===================================================================
--- glib2.spec (revision 9656)
+++ glib2.spec (working copy)
@@ -153,7 +153,7 @@
CFLAGS="$RPM_OPT_FLAGS" \
./configure $CONFLAGS \
--sysconfdir=%{_sysconfdir} \
- --enable-gtk-doc
+ %{gtk_doc_option}
make -j $CPUS
@@ -214,6 +214,9 @@
%{_mandir}/man3/*
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Wed Nov 01 2006 - stephen.browne at sun.com
- added patch glib-11-trusted-extensions.diff: covers bugster 639371
* Mon Oct 02 2006 - damien.carbery at sun.com
Index: gtksourceview.spec
===================================================================
--- gtksourceview.spec (revision 9656)
+++ gtksourceview.spec (working copy)
@@ -75,7 +75,7 @@
CFLAGS="$RPM_OPT_FLAGS" \
./configure --prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
- --enable-gtk-doc
+ %{gtk_doc_option}
./config.status
make -j $CPUS
@@ -105,102 +105,75 @@
%{_libdir}/*.so
%{_mandir}/man3/*
-
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- use %gtk_doc_option in configure so that it can be disabled using
+ --without-gtk-doc
* Mon Oct 02 2006 - damien.carbery at sun.com
- Bump to 1.8.1.
Index: gaim.spec
===================================================================
--- gaim.spec (revision 9656)
+++ gaim.spec (working copy)
@@ -20,6 +20,8 @@
Patch4: gaim-04-long-preferences.diff
Patch5: gaim-05-msn-crash.diff
Patch6: gaim-06-proxy_mnemotics.diff
+# date:2006-11-02 owner:dcarbery type:bug
+#
http://sourceforge.net/tracker/index.php?func=detail&aid=1589599&group_id=235&atid=300235
Patch7: gaim-07-gtk-func-def.diff
URL: http://gaim.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Index: Solaris/ChangeLog
===================================================================
--- Solaris/ChangeLog (revision 9656)
+++ Solaris/ChangeLog (working copy)
@@ -1,3 +1,11 @@
+2006-11-03 Laszlo (Laca) Peter <laca at sun.com>
+
+ * SUNWgnome-pdf-viewer.spec: add -lm to LDFLAGS so that
+ libpoppler links against it, fixes 6470804
+ * Solaris.inc: define %gtk_doc_option, lets the user disable
+ building gtk-docs using --without-gtk-doc; also added comments
+ about usage
+
2006-11-03 Damien Carbery <damien.carbery at sun.com>
* manpages/Makefile: Remove sman3/libwnck-1.3 from SUNWgnome-panel
Index: Solaris/SUNWgnome-pdf-viewer.spec
===================================================================
--- Solaris/SUNWgnome-pdf-viewer.spec (revision 9656)
+++ Solaris/SUNWgnome-pdf-viewer.spec (working copy)
@@ -88,7 +88,7 @@
%build
export PKG_CONFIG_PATH=%{_pkg_config_path}
-export LDFLAGS="%_ldflags -L/usr/X11/lib -R /usr/X11/lib -L/usr/sfw/lib
-R/usr/sfw/lib -lX11"
+export LDFLAGS="%_ldflags -L/usr/X11/lib -R /usr/X11/lib -L/usr/sfw/lib
-R/usr/sfw/lib -lX11 -lm"
export MSGFMT="/usr/bin/msgfmt"
export CFLAGS="%optflags -I/usr/sfw/include"
%if %cc_is_gcc
@@ -220,6 +220,8 @@
%{_sysconfdir}/gconf/schemas/evince-thumbnailer.schemas
%changelog
+* Fri Nov 3 2006 - laca at sun.com
+- add -lm to LDFLAGS so that libpoppler links against it, fixes 6470804
* Fri Sep 08 2006 - Matt.Keenan at sun.com
- Remove "rm" of _mandir during %install, Deliver community pages, pdf*.1
* Sat Aug 12 2006 - laca at sun.com
Index: Solaris/Solaris.inc
===================================================================
--- Solaris/Solaris.inc (revision 9656)
+++ Solaris/Solaris.inc (working copy)
@@ -16,9 +16,29 @@
%define default_category GNOME2,application,%{jds_version}
%{?support_level:#}%define support_level unsupported
%define cc_is_gcc %(test "x`basename $CC`" = xgcc && echo 1 || echo 0)
+
+# Command line configurable build options:
+
+# use --with-build-l10n to build the SUNWfoo-l10n packages
+# default: no l10n packages
%define build_l10n %{?_with_l10n:1}%{?!_with_l10n:0}
+
+# use --with-tjds to build the JDS Trusted Extensions
+# default: no tjds
%define build_tjds %{?_with_tjds:1}%{?!_with_tjds:0}
+
+# use --with-debug to build binaries with debug info (-g) and not to strip
+# them.
+# default: don't include debug info and strip the binaries (strip -x)
%define debug_build %{?_with_debug:1}%{?!_with_debug:0}
+
+# use --without-gtk-doc to disable building gtk-docs (it takes quite
+# a while to build them)
+# default: build gtk-doc API docs
+%define gtk_doc_option
%{?!_without_gtk_doc:--enable-gtk-doc}%{?_without_gtk_doc:--disable-gtk-doc}
+
+# end of command line configurable build options
+
%define is_nevada %(test `uname -r` = 5.11 && echo 1 || echo 0)
%define _patch_options --fuzz=0 --unified
@@ -112,6 +132,9 @@
%define _pkg_config_path64 %{_libdir}/%{_arch64}/pkgconfig
# ChangeLog:
+# 2006-11-03 Laszlo Peter <laca at sun.com>
+# - define %gtk_doc_option, lets the user disable building gtk-docs
+# using --without-gtk-doc; also added comments about usage
# 2006-10-03 Laszlo Peter <laca at sun.com>
# - define %_patch_options, this specifies extra options for gpatch when
# using pkgbuild 1.1.1 or later
