i thought gnome community had decided not to upgrade to glade3 because of lack of maturity ?
if that is the case we should not upgrade either.... or should we have a new spec file for glade3 ? Matt Halton Huo wrote: > Update glade to glade3, there may have two issues here: > > [1] Add new package SUNWgnome-ui-designer-devel > Glade3 will install files into /usr/include/libgladeui-1.0/gladeui (*.h > and *.atk.xpm) and /usr/lib/pkgconfig/gladeui-1.0.pc. Glade2 does not > have such files. They are devel files, so add a new package. > > > [2] files under /var/lib/scrollkeeper/ > There are files will be installed into /var/lib/scrollkeeper/, need more > discussion to make clear the usage of them. Now, they are removed. > > > ------------------------------------------------------------------------ > > Index: glade.spec > =================================================================== > --- glade.spec (revision 10678) > +++ glade.spec (working copy) > @@ -11,14 +11,15 @@ > Name: glade > License: GPL > Group: System/GUI/GNOME > -Version: 2.12.1 > +Version: 3.1.5 > Release: 1 > Distribution: Java Desktop System > Vendor: Sun Microsystems, Inc. > Summary: GLADE User Interface Builder for GNOME > -Source: > http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.12/%{name}-%{version}.tar.bz2 > +Source: > http://ftp.gnome.org/pub/GNOME/sources/%{name}3/3.1/%{name}3-%{version}.tar.bz2 > Source1: %{name}-po-sun-%{po_sun_version}.tar.bz2 > -Patch1: glade-01-menu-entry.diff > +# date:2007-02-28 bugzilla:412993 owner:halton type:bug > +Patch1: %{name}-01-Wall-remove.diff > URL: http://www.gnome.org > BuildRoot: %{_tmppath}/%{name}-%{version}-build > Docdir: %{_docdir}/doc > @@ -37,7 +38,7 @@ > Glade is a User Interface Builder for GTK+ and GNOME. This package contains > GLADE for the GTK + 2.0 and GNOME 2.0 Platform. > > %prep > -%setup -q > +%setup -q -n %{name}3-%{version} > %if %build_l10n > bzcat %SOURCE1 | tar xf - > cd po-sun; make; cd .. > @@ -57,7 +58,7 @@ > fi > > libtoolize --force > -aclocal $ACLOCAL_FLAGS > +aclocal $ACLOCAL_FLAGS -I ./m4 > automake -a -c -f > autoconf > > @@ -71,11 +72,17 @@ > make -j $CPUS > > %install > -make -i DESTDIR=$RPM_BUILD_ROOT install > +export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 > +make -i install DESTDIR=$RPM_BUILD_ROOT > +unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL > > +find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' > +find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';' > +# FXIME > +# there are files under /var/lib/scrollkeeper/, need more discussion > +# to make clear the usage of them. > +rm -rf $RPM_BUILD_ROOT/var > > -rm -rf $RPM_BUILD_ROOT%{_datadir}/omf/glade-2/glade-faq-*.omf > - > %clean > rm -rf $RPM_BUILD_ROOT > > @@ -92,6 +99,11 @@ > %{_datadir}/glade-2 > > %changelog > +* Wed Feb 28 2007 - halton.huo at sun.com > +- Bump to 3.1.5. > +- Add patch 01-Wall-remove.diff to fix bugzilla #412993. > +- Remove obsoleted patch 01-menu-entry.diff. > + > * Tue Feb 13 2007 - takao.fujiwara at sun.com > - Add Add l10n tarball. > > Index: Solaris/SUNWgnome-ui-designer.spec > =================================================================== > --- Solaris/SUNWgnome-ui-designer.spec (revision 10678) > +++ Solaris/SUNWgnome-ui-designer.spec (working copy) > @@ -41,6 +41,12 @@ > Requires: %{name} > %endif > > +%package devel > +Summary: %{summary} - development files > +SUNW_BaseDir: %{_basedir} > +%include default-depend.inc > +Requires: %{name} > + > %prep > rm -rf %name-%version > mkdir %name-%version > @@ -100,15 +106,21 @@ > %defattr (-, root, bin) > %dir %attr (0755, root, bin) %{_bindir} > %{_bindir}/* > +%dir %attr (0755, root, bin) %{_libdir} > +%{_libdir}/*.so* > +%{_libdir}/glade* > %dir %attr (0755, root, sys) %{_datadir} > %dir %attr (0755, root, other) %{_datadir}/applications > %{_datadir}/applications/* > -%{_datadir}/glade-2 > +%{_datadir}/glade* > %dir %attr (0755, root, other) %{_datadir}/gnome > %{_datadir}/gnome/* > %{_datadir}/omf > -%dir %attr (0755, root, other) %{_datadir}/pixmaps > -%{_datadir}/pixmaps/* > +%dir %attr (0755, root, other) %{_datadir}/icons > +%dir %attr (0755, root, other) %{_datadir}/icons/hicolor > +%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/* > +%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/*/apps > +%{_datadir}/icons/hicolor/*/apps/* > %dir %attr(0755, root, bin) %{_mandir} > %dir %attr(0755, root, bin) %{_mandir}/* > %{_mandir}/*/* > @@ -120,7 +132,17 @@ > %attr (-, root, other) %{_datadir}/locale > %endif > > +%files devel > +%defattr (-, root, bin) > +%dir %attr (0755, root, bin) %{_includedir} > +%{_includedir}/* > +%dir %attr (0755, root, bin) %{_libdir} > +%dir %attr (0755, root, other) %{_libdir}/pkgconfig > +%{_libdir}/pkgconfig/* > + > %changelog > +* Wed Feb 28 2007 - halton.huo at sun.com > +- Add package -devel and change files section since upgrade to glade3. > * Mon Sep 04 2006 - Matt.Keenan at sun.com > - New Manpage tarball > * Fri Jul 14 2006 - laca at sun.com >
