2005-09-21 Brian Cameron <
[email protected]>
* control-center.spec: Disable scrollkeeper and add patch
19 so it builds if xcursor is not available.
* gst.spec, gst-plugins.spec: Bump to 0.8.11.
* gdm.spec: Bump to 2.8.0.4
* SUNWgnome-base-libs.spec: No longer comment out
postprocess, I accidently committed this.
* SUNWgnome-desktop-prefs.spec: Fix packaging.
* SUNWgnome-media.spec: Add SUNWogg-vorbis-devel to
BuildRequires
* SUNWgnome-media-apps.spec: Fix packaging
* extra-specs/libvorbis.spec: Bump to 1.1.1.
--- a/Solaris/ChangeLog Wed Sep 21 22:15:40 2005 +0000
+++ b/Solaris/ChangeLog Thu Sep 22 02:47:58 2005 +0000
@@ -1,3 +1,13 @@
+2005-09-20 Brian Cameron <[email protected]>
+
+ * SUNWgnome-base-libs.spec: No longer comment out
+ postprocess, I accidently committed this.
+ * SUNWgnome-desktop-prefs.spec: Fix packaging.
+ * SUNWgnome-media.spec: Add SUNWogg-vorbis-devel to
+ BuildRequires
+ * SUNWgnome-media-apps.spec: Fix packaging
+ * extra-specs/libvorbis.spec: Bump to 1.1.1.
+
2005-09-20 Brian Cameron <[email protected]>
* extra-specs/gnome-netstatus.spec,
--- a/Solaris/SUNWgnome-base-libs.spec Wed Sep 21 22:15:40 2005 +0000
+++ b/Solaris/SUNWgnome-base-libs.spec Thu Sep 22 02:47:58 2005 +0000
@@ -289,7 +289,7 @@
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-#%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
+%{?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
--- a/Solaris/SUNWgnome-desktop-prefs.spec Wed Sep 21 22:15:40 2005 +0000
+++ b/Solaris/SUNWgnome-desktop-prefs.spec Thu Sep 22 02:47:58 2005 +0000
@@ -177,10 +177,12 @@
%dir %attr(0755, root, sys) %{_datadir}
%{_datadir}/applications
%{_datadir}/control-center-2.0
+%{_datadir}/emacs
%{_datadir}/gnome
%{_datadir}/gnome-background-properties
%{_datadir}/icons
%{_datadir}/idl
+%{_datadir}/omf
%{_datadir}/pixmaps
%dir %attr(0755, root, bin) %{_mandir}
%dir %attr(0755, root, bin) %{_mandir}/*
--- a/Solaris/SUNWgnome-media-apps.spec Wed Sep 21 22:15:40 2005 +0000
+++ b/Solaris/SUNWgnome-media-apps.spec Thu Sep 22 02:47:58 2005 +0000
@@ -131,7 +131,9 @@
schemas/desktop/?gconf.xml \
schemas/desktop/gnome/?gconf.xml \
schemas/system/?gconf.xml \
+ schemas/system/gstreamer/?gconf.xml \
system/?gconf.xml \
+ system/gstreamer/?gconf.xml \
; do
test ! -s $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.defaults/$f && \
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.defaults/$f
@@ -148,6 +150,14 @@
chmod 755 $RPM_BUILD_ROOT%{_mandir}/sman1/*.1
+# Remove files we don't ship
+#
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/javahelp/gnome-sound-recorder/uk
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/javahelp/gnome-volume-control/uk
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/javahelp/gstreamer-properties/uk
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libglade/2.0/lib*.la
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libglade/2.0/lib*.a
+
%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
%clean
@@ -222,7 +232,6 @@
%{_datadir}/pixmaps/gnome-mixer.png
%{_datadir}/pixmaps/gnome-reclevel.png
%{_datadir}/pixmaps/gnome-vumeter.png
-%{_datadir}/pixmaps/gnome-media
%dir %attr(0755, root, bin) %{_mandir}
%dir %attr(0755, root, bin) %{_mandir}/sman1
%{_mandir}/sman1/gnome-sound-recorder.1
@@ -242,9 +251,12 @@
#%config %{_localstatedir}/*
%attr (0755, root, sys) %dir %{_sysconfdir}
%defattr (-, root, other)
-%{_sysconfdir}/gconf/gconf.xml.defaults/system/gstreamer/audio
-%{_sysconfdir}/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio
+%{_sysconfdir}/gconf/gconf.xml.defaults/apps/gnome-volume-control
+%{_sysconfdir}/gconf/gconf.xml.defaults/system/gstreamer
+%{_sysconfdir}/gconf/gconf.xml.defaults/schemas/apps/gnome-volume-control
+%{_sysconfdir}/gconf/gconf.xml.defaults/schemas/system/gstreamer
%{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas
+%{_sysconfdir}/gconf/schemas/gnome-volume-control.schemas
%files -n SUNWgnome-freedb-libs-root
%attr (0755, root, sys) %dir %{_sysconfdir}
@@ -274,6 +286,9 @@
%{_datadir}/idl
%changelog
+* Wed Sep 21 2005 - [email protected]
+- Fix packaging.
+
* Tue Jul 12 2005 - [email protected]
- Don't build gnome-cd and remove nautilus-cd-burner dependency
--- a/Solaris/SUNWgnome-media.spec Wed Sep 21 22:15:40 2005 +0000
+++ b/Solaris/SUNWgnome-media.spec Thu Sep 22 02:47:58 2005 +0000
@@ -55,6 +55,7 @@
BuildRequires: SUNWspeex-devel
BuildRequires: SUNWflac-devel
BuildRequires: SUNWlibtheora-devel
+BuildRequires: SUNWogg-vorbis-devel
Requires: SUNWgnome-libs
Requires: SUNWgnome-media-root
Requires: SUNWgnome-media-share
--- a/Solaris/Solaris.inc Wed Sep 21 22:15:40 2005 +0000
+++ b/Solaris/Solaris.inc Thu Sep 22 02:47:58 2005 +0000
@@ -25,16 +25,16 @@
%define picflags -fPIC -DPIC
%ifarch sparc
-%define optflags -O2 -mv8plus -Xlinker -i %picflags
-%define cxx_optflags -O2 -mv8plus -Xlinker -i %picflags
-%define optflags64 -O2 -mcpu=ultrasparc -m64 -Xlinker -i %picflags
+%define optflags -g -mv8plus -Xlinker -i %picflags
+%define cxx_optflags -g -mv8plus -Xlinker -i %picflags
+%define optflags64 -g -mcpu=ultrasparc -m64 -Xlinker -i %picflags
%define _arch64 sparcv9
%endif
%ifarch i386
-%define optflags -O2 -march=i586 -Xlinker -i -fomit-frame-pointers %picflags
-%define cxx_optflags -O2 -march=i586 -Xlinker -i -fomit-frame-pointers %picflags
-%define optflags64 -O2 -march=opteron -m64 -Xlinker -i -fomit-frame-pointers %picflags
+%define optflags -g -march=i586 -Xlinker -i -fomit-frame-pointers %picflags
+%define cxx_optflags -g -march=i586 -Xlinker -i -fomit-frame-pointers %picflags
+%define optflags64 -g -march=opteron -m64 -Xlinker -i -fomit-frame-pointers %picflags
%define _arch64 amd64
%endif
@@ -43,16 +43,16 @@
%define picflags -KPIC
%ifarch sparc
-%define optflags -i -xO4 -xspace -xstrconst -xarch=v8a -mr
-%define cxx_optflags -i -xO3 -xspace -xarch=v8a -mr -norunpath
-%define optflags64 -i -xO4 -xspace -xstrconst -xarch=v9 -xcode=pic32 -mr
+%define optflags -i -g -xspace -xstrconst -xarch=v8a -mr
+%define cxx_optflags -i -g -xspace -xarch=v8a -mr -norunpath
+%define optflags64 -i -g -xspace -xstrconst -xarch=v9 -xcode=pic32 -mr
%define _arch64 sparcv9
%endif
%ifarch i386
-%define optflags -i -xO4 -xspace -xstrconst -xpentium -mr -xregs=no%%frameptr
-%define cxx_optflags -i -xO3 -xspace -pentium -mr -norunpath -xregs=no%%frameptr
-%define optflags64 -i -xarch=generic64 -Kpic -xregs=no%%frameptr
+%define optflags -i -g -xspace -xstrconst -xpentium -mr -xregs=no%%frameptr
+%define cxx_optflags -i -g -xspace -pentium -mr -norunpath -xregs=no%%frameptr
+%define optflags64 -i -g -xarch=generic64 -Kpic -xregs=no%%frameptr
%define _arch64 amd64
%endif
--- a/Solaris/extra-specs/libvorbis.spec Wed Sep 21 22:15:40 2005 +0000
+++ b/Solaris/extra-specs/libvorbis.spec Thu Sep 22 02:47:58 2005 +0000
@@ -13,7 +13,7 @@
Name: libvorbis
Summary: The Vorbis General Audio Compression Codec
-Version: 1.1.0
+Version: 1.1.1
Release: 95
Group: System/Libraries
License: BSD
@@ -88,6 +88,8 @@
%{_datadir}/gtk-doc
%changelog -n libvorbis
+* Tue Sep 20 2005 - [email protected]
+- Bump to 1.1.1
* Mon Jun 06 2005 - [email protected]
- Removed libvorbis-01-configure.diff since it is no longer
necessary.
--- a/control-center.spec Wed Sep 21 22:15:40 2005 +0000
+++ b/control-center.spec Thu Sep 22 02:47:58 2005 +0000
@@ -51,6 +51,7 @@
Patch16: control-center-16-layout-deletion.diff
Patch17: control-center-17-background-crash.diff
Patch18: control-center-18-xkb-check-remote-login.diff
+Patch19: control-center-19-xcursor.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -123,7 +124,7 @@
%patch16 -p1
%patch17 -p1
%patch18 -p1
-
+%patch19 -p1
%build
%ifos linux
@@ -140,6 +141,8 @@
LC_ALL=
LANG=
export LC_ALL LANG
+gnome-doc-common
+gnome-doc-prepare
libtoolize --force
aclocal $ACLOCAL_FLAGS -I .
autoheader
@@ -149,7 +152,8 @@
./configure \
--prefix=%{_prefix} \
--libexecdir=%{_libexecdir} \
- --sysconfdir=%{_sysconfdir}
+ --sysconfdir=%{_sysconfdir} \
+ --disable-scrollkeeper
make -j $CPUS
%install
@@ -236,6 +240,12 @@
%changelog
+* Wed Sep 21 2005 - [email protected]
+- Add patch 19 so that if xcursor is not present, the configure doesn't
+ bomb out. The HAVE_XCURSOR stuff is #ifdef'ed in the code so this
+ should just build okay without xcursor support. Better than not
+ building at all.
+
* Sat Sep 17 2005 - [email protected]
- Bump to 2.12.0
--- a/gdm.spec Wed Sep 21 22:15:40 2005 +0000
+++ b/gdm.spec Thu Sep 22 02:47:58 2005 +0000
@@ -8,7 +8,7 @@
Name: gdm
License: GPL
Group: System/GUI/GNOME
-Version: 2.8.0.3
+Version: 2.8.0.4
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -240,6 +240,9 @@
%config /etc/security/*
%changelog
+* Wed Sep 21 2005 - [email protected]
+- Bump to 2.8.0.4
+
* Wed Sep 07 2005 - [email protected]
- Remove capplets dir from %files. Contents moved in 2.8.0.3.
--- a/gst-plugins.spec Wed Sep 21 22:15:40 2005 +0000
+++ b/gst-plugins.spec Thu Sep 22 02:47:58 2005 +0000
@@ -8,7 +8,7 @@
Name: gstreamer-plugins
License: LGPL
-Version: 0.8.10
+Version: 0.8.11
Release: 3
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -367,6 +367,9 @@
%{_libdir}/pkgconfig/gstreamer-*-%{majorminor}.pc
%changelog
+* Tue Sep 20 2005 - [email protected]
+- Bump to 0.8.11.
+
* Mon Aug 15 2005 - [email protected]
- Bump to 0.8.10.
--- a/gst.spec Wed Sep 21 22:15:40 2005 +0000
+++ b/gst.spec Thu Sep 22 02:47:58 2005 +0000
@@ -9,7 +9,7 @@
Name: gstreamer
License: LGPL
Group: Libraries/Multimedia
-Version: 0.8.10
+Version: 0.8.11
Release: 35
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -229,6 +229,9 @@
%{_mandir}/man1/gst-xmlinspect*
%changelog
+* Tue Sep 20 2005 - [email protected]
+- Bump to 0.8.11.
+
* Thu Sep 08 2005 - [email protected]
- Unbump back to 0.8.10 as 0.9.x is not in gnome2.12.