Hello community,
here is the log from the commit of package gnome-media
checked in at Wed Jan 10 17:43:17 CET 2007.
--------
--- GNOME/gnome-media/gnome-media.changes 2006-11-21 16:20:50.000000000 +0100
+++ /mounts/work_src_done/STABLE/gnome-media/gnome-media.changes 2007-01-04 12:42:10.000000000 +0100
@@ -1,0 +2,11 @@
+Thu Jan 4 12:41:49 CET 2007 - sbrabec@suse.cz
+
+- Reflect gstreamer010-plugins-base merge.
+
+-------------------------------------------------------------------
+Mon Dec 18 19:08:40 CET 2006 - sbrabec@suse.cz
+
+- Prefix changed to /usr.
+- Spec file cleanup.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-media.spec ++++++
--- /var/tmp/diff_new_pack.r15164/_old 2007-01-10 17:42:40.000000000 +0100
+++ /var/tmp/diff_new_pack.r15164/_new 2007-01-10 17:42:40.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gnome-media (Version 2.16.1)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -12,23 +12,23 @@
Name: gnome-media
%define DISTRIBUTABLE 1
-BuildRequires: docbook-utils gail-devel gnome-common gnome-desktop-devel gnutls-devel gstreamer010-plugins-base-devel gstreamer010-plugins-base-oil gstreamer010-plugins-good intltool kdelibs3-doc libcddb-devel libglade2-devel libidl-devel mDNSResponder-devel nautilus-cd-burner-devel perl-XML-Parser scrollkeeper update-desktop-files
-%define prefix /opt/gnome
-%define sysconfdir /etc%{prefix}
+BuildRequires: docbook-utils gail-devel gnome-common gnome-desktop-devel gnutls-devel gstreamer010-plugins-base-devel gstreamer010-plugins-good intltool kdelibs3-doc libcddb-devel libglade2-devel libidl-devel mDNSResponder-devel nautilus-cd-burner-devel perl-XML-Parser scrollkeeper update-desktop-files
License: GNU General Public License (GPL)
Group: System/GUI/GNOME
Requires: control-center2 gstreamer010-plugins-good
# For sound recorder:
-# Requires: gstreamer010-plugins-base-oil
-Suggests: gstreamer010-plugins-base-oil
-Requires: sox dbus-1 hal
+%if %suse_version > 1000
+Recommends: gstreamer010-plugins-base
+%else
+Requires: gstreamer010-plugins-base
+%endif
+Requires: hal
Provides: gnome-media2
Obsoletes: gnome-media2
-Autoreqprov: on
Version: 2.16.1
-Release: 28
+Release: 39
Summary: GNOME Multimedia (Media)
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.14/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.16/%{name}-%{version}.tar.bz2
Patch: gnome-media-void.patch
Patch3: %name-desktop.patch
Patch4: %name-64bit.patch
@@ -41,7 +41,9 @@
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}
-PreReq: filesystem gconf2
+Autoreqprov: on
+
+%gconf_schemas_prereq
%description
This package contains multimedia programs for GNOME.
@@ -62,14 +64,15 @@
Seth Nickell
Balamurali Viswanathan
-%package devel
-Summary: GNOME Multimedia (Media)
+%package cd
+Summary: GNOME Multimedia CD Player(Media)
Group: System/GUI/GNOME
-Autoreqprov: on
-Requires: %name = %version dbus-1-devel hal-devel gconf2-devel gtk2-devel libglade2-devel libgnome-devel libgnomeui-devel
+Requires: %{name} = %{version}
-%description devel
-This package contains multimedia programs for GNOME.
+%gconf_schemas_prereq
+
+%description cd
+This package contains the GNOME CD player
@@ -83,14 +86,13 @@
Seth Nickell
Balamurali Viswanathan
-%package cd
-Summary: GNOME Multimedia CD Player(Media)
+%package devel
+Summary: GNOME Multimedia (Media)
Group: System/GUI/GNOME
-Autoreqprov: on
-Requires: %name = %version
+Requires: %{name} = %{version} dbus-1-devel hal-devel gconf2-devel gtk2-devel libglade2-devel libgnome-devel libgnomeui-devel
-%description cd
-This package contains the GNOME CD player
+%description devel
+This package contains multimedia programs for GNOME.
@@ -119,28 +121,19 @@
%patch12
%build
-libtoolize -f
-intltoolize --force --copy
-aclocal -I ./m4
-autoconf
-automake
-CFLAGS="$RPM_OPT_FLAGS" \
-./configure \
- --prefix=%prefix \
- --libdir=%prefix/%_lib \
- --libexecdir=%prefix/lib/gnome-media \
- --sysconfdir=%sysconfdir \
- --datadir=%prefix/share \
- --localstatedir=/var/lib \
- --disable-schemas-install
-export LIBRARY_PATH=/opt/gnome/%_lib
-make
+autoreconf -f -i
+# needed for gnome-media-2.16.1:
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+# FIXME: Build as root modifies system!
+# gnome-media-2.16.1: --disable-scrollkeeper does not work properly.
+%configure\
+ --libexecdir=%{_prefix}/lib/gnome-media\
+ --disable-schemas-install\
+ --disable-scrollkeeper
+make %{?jobs:-j%jobs}
%install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-%find_lang %{name}-2.0
%suse_update_desktop_file vumeter AudioVideo Mixer
%suse_update_desktop_file gnome-volume-control AudioVideo Mixer
%suse_update_desktop_file reclevel AudioVideo Recorder
@@ -148,92 +141,112 @@
%suse_update_desktop_file gnome-cd AudioVideo Player CD
%suse_update_desktop_file -N "GStreamer Properties" -G "Multimedia Systems Selector" gstreamer-properties System SystemSetup X-SuSE-ControlCenter-System
%suse_update_desktop_file -G "CD Database Preferences Tool" -C "Modify your CD database server preferences" -D "user-guide/user-guide.xml?goscustlookandfeel-39" cddb-slave AudioVideo CD
-for xml in $RPM_BUILD_ROOT%{prefix}/share/gnome/help/*/*/*.xml; do
+for xml in $RPM_BUILD_ROOT%{_datadir}/gnome/help/*/*/*.xml; do
if echo $xml | egrep 'share/gnome/help/([^/]*)/[^/]*/\1\.xml$' > /dev/null; then
meinproc --cache `echo $xml | sed 's/xml$/cache.bz2/'` $xml || :
fi
done
-rm $RPM_BUILD_ROOT/opt/gnome/%_lib/libglade/2.0/*.*a
+%find_lang %{name}-2.0
+
+%def_gconf_schemas %{name}
+
+%add_gconf_schemas gnome-audio-profiles
+
+%add_gconf_schemas gnome-sound-recorder
+
+%add_gconf_schemas gnome-volume-control
+
+%def_gconf_schemas %{name}-cd
+
+%add_gconf_schemas gnome-cd
+
+%add_gconf_schemas CDDB-Slave2
+
+%end_gconf_schemas
+cat %{name}-2.0.lang %{name}.schemas_list >%{name}.lst
+rm $RPM_BUILD_ROOT%{_libdir}/libglade/2.0/*.*a
%clean
rm -rf $RPM_BUILD_ROOT
+%pre -f %{name}.schemas_pre
+
%post
%run_ldconfig
-export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/gnome-audio-profiles.schemas >/dev/null
-opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/gnome-sound-recorder.schemas >/dev/null
-opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/gnome-volume-control.schemas >/dev/null
+
+%posttrans -f %{name}.schemas_posttrans
+
+%preun -f %{name}.schemas_preun
%postun
%run_ldconfig
-%post cd
-export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/gnome-cd.schemas >/dev/null
-opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/CDDB-Slave2.schemas >/dev/null
+%pre cd -f %{name}-cd.schemas_pre
+
+%posttrans cd -f %{name}-cd.schemas_posttrans
+
+%preun cd -f %{name}-cd.schemas_preun
-%files -f %files -f %{name}-2.0.lang
+%files -f %{name}.lst
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%defattr (-, root, root)
-%{prefix}/bin/gnome-audio-profiles-properties
-%{prefix}/bin/gnome-sound-recorder
-%{prefix}/bin/gnome-volume-control
-%{prefix}/bin/gstreamer-properties
-%{prefix}/bin/vumeter
-%{prefix}/%_lib/*.so.*
-%{prefix}/%_lib/bonobo/servers/*
-%{prefix}/lib/gnome-media
-%{prefix}/%_lib/libglade/2.0/*.so
-%dir %{prefix}/share/omf/gnome-media
-%{prefix}/share/omf/gnome-media/gnome-volume-control*.omf
-%{prefix}/share/omf/gnome-media/grecord*.omf
-%{prefix}/share/omf/gnome-media/gstreamer-properties*.omf
-%{prefix}/share/gnome/help/gnome-sound-recorder
-%{prefix}/share/gnome/help/gnome-volume-control
-%{prefix}/share/gnome/help/grecord
-%{prefix}/share/gnome/help/gstreamer-properties
-%{prefix}/share/idl/*
-%{prefix}/share/pixmaps/gnome-cd.png
-%{prefix}/share/pixmaps/gnome-grecord.png
-%{prefix}/share/pixmaps/gnome-mixer.png
-%{prefix}/share/pixmaps/gnome-reclevel.png
-%{prefix}/share/pixmaps/gnome-vumeter.png
-%{prefix}/share/pixmaps/gstreamer-properties.png
-%{sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas
-%{sysconfdir}/gconf/schemas/gnome-sound-recorder.schemas
-%{sysconfdir}/gconf/schemas/gnome-volume-control.schemas
-%{prefix}/share/applications/gnome-sound-recorder.desktop
-%{prefix}/share/applications/gnome-volume-control.desktop
-%{prefix}/share/applications/gstreamer-properties.desktop
-%{prefix}/share/applications/reclevel.desktop
-%{prefix}/share/applications/vumeter.desktop
-%{prefix}/share/gnome-media
-%{prefix}/share/gstreamer-properties
-%{prefix}/share/gnome-sound-recorder
+%{_bindir}/gnome-audio-profiles-properties
+%{_bindir}/gnome-sound-recorder
+%{_bindir}/gnome-volume-control
+%{_bindir}/gstreamer-properties
+%{_bindir}/vumeter
+%{_datadir}/applications/gnome-sound-recorder.desktop
+%{_datadir}/applications/gnome-volume-control.desktop
+%{_datadir}/applications/gstreamer-properties.desktop
+%{_datadir}/applications/reclevel.desktop
+%{_datadir}/applications/vumeter.desktop
+%{_datadir}/gnome/help/gnome-sound-recorder
+%{_datadir}/gnome/help/gnome-volume-control
+%{_datadir}/gnome/help/grecord
+%{_datadir}/gnome/help/gstreamer-properties
+%{_datadir}/gnome-media
+%{_datadir}/gnome-sound-recorder
+%{_datadir}/gstreamer-properties
+%{_datadir}/idl/*
+%dir %{_datadir}/omf/gnome-media
+%{_datadir}/omf/gnome-media/gnome-volume-control*.omf
+%{_datadir}/omf/gnome-media/grecord*.omf
+%{_datadir}/omf/gnome-media/gstreamer-properties*.omf
+%{_datadir}/pixmaps/gnome-cd.png
+%{_datadir}/pixmaps/gnome-grecord.png
+%{_datadir}/pixmaps/gnome-mixer.png
+%{_datadir}/pixmaps/gnome-reclevel.png
+%{_datadir}/pixmaps/gnome-vumeter.png
+%{_datadir}/pixmaps/gstreamer-properties.png
+%{_libdir}/*.so.*
+%{_libdir}/bonobo/servers/*
+%{_libdir}/libglade/2.0/*.so
+%{_prefix}/lib/gnome-media
%files devel
%defattr(-,root,root)
-%{prefix}/%_lib/*.so
-%{prefix}/%_lib/*.*a
-#%{prefix}/%_lib/libglade/2.0/*.*a
-%{prefix}/%_lib/pkgconfig/*.pc
-%{prefix}/include/*
+%{_libdir}/*.so
+%{_libdir}/*.*a
+%{_libdir}/pkgconfig/*.pc
+%{_includedir}/*
-%files cd
+%files cd -f %{name}-cd.schemas_list
%defattr(-,root,root)
-%{prefix}/bin/gnome-cd
-%{prefix}/bin/cddb-slave2-properties
-%{prefix}/share/applications/cddb-slave.desktop
-%{prefix}/share/applications/gnome-cd.desktop
-%{prefix}/share/gnome/help/gnome-cd
-%{prefix}/share/omf/gnome-media/gnome-cd*.omf
-%{prefix}/share/pixmaps/gnome-cd
-%{sysconfdir}/gconf/schemas/gnome-cd.schemas
-%{sysconfdir}/gconf/schemas/CDDB-Slave2.schemas
+%{_bindir}/gnome-cd
+%{_bindir}/cddb-slave2-properties
+%{_datadir}/applications/cddb-slave.desktop
+%{_datadir}/applications/gnome-cd.desktop
+%{_datadir}/gnome/help/gnome-cd
+%{_datadir}/omf/gnome-media/gnome-cd*.omf
+%{_datadir}/pixmaps/gnome-cd
%changelog -n gnome-media
+* Thu Jan 04 2007 - sbrabec@suse.cz
+- Reflect gstreamer010-plugins-base merge.
+* Mon Dec 18 2006 - sbrabec@suse.cz
+- Prefix changed to /usr.
+- Spec file cleanup.
* Tue Nov 21 2006 - sbrabec@suse.cz
- Do not explicitly require mDNSResponder-lib blocking avahi compat
package.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org