Hello community, here is the log from the commit of package gstreamer010-plugins-bad checked in at Sun Jun 3 22:15:59 CEST 2007. -------- --- GNOME/gstreamer010-plugins-bad/gstreamer010-plugins-bad.changes 2007-05-16 15:28:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/gstreamer010-plugins-bad/gstreamer010-plugins-bad.changes 2007-05-30 11:46:11.000000000 +0200 @@ -52 +52 @@ -- Support for BUILD_NONFREE and SPLIT_NONFREE defines (#237351). +- Support for BUILD_ORIG and BUILD_ORIG_ADDON defines (#237351). ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer010-plugins-bad.spec ++++++ --- /var/tmp/diff_new_pack.l14712/_old 2007-06-03 22:15:46.000000000 +0200 +++ /var/tmp/diff_new_pack.l14712/_new 2007-06-03 22:15:46.000000000 +0200 @@ -11,14 +11,14 @@ # norootforbuild Name: gstreamer010-plugins-bad -# Use rpmbuild -D 'BUILD_NONFREE 1' to build non-free code. -# Use rpmbuild -D 'BUILD_NONFREE 1' -D 'SPLIT_NONFREE 1' to split -# non-free parts to -nonfree package. +# Patched code is built by default. +# Use rpmbuild -D 'BUILD_ORIG 1' to build original code. +# Use rpmbuild -D 'BUILD_ORIG 1' -D 'BUILD_ORIG_ADDON 1' to build patched build plus original as addon. %define _name gst-plugins-bad BuildRequires: SDL-devel check-devel gstreamer010-plugins-base-devel gtk-doc jack-devel ladspa libcdaudio-devel libgsm-devel libmusicbrainz-devel liboil-devel neon-devel pyxml sgml-skel wavpack-devel %if %suse_version > 1020 BuildRequires: ladspa-devel swfdec-devel -# Prevent "have choice for swfdec: swfdec swfdec-nonfree": +# Prevent "have choice for swfdec: swfdec swfdec-orig": BuildRequires: swfdec %endif # Needed for modplug @@ -28,7 +28,7 @@ %else BuildRequires: DirectFB %endif -%if 0%{?BUILD_NONFREE} +%if 0%{?BUILD_ORIG} BuildRequires: amrwb-devel faac-devel faad2-devel libdca-devel %if %suse_version > 1010 BuildRequires: xvid-devel @@ -38,13 +38,14 @@ %ifarch %ix86 BuildRequires: divx4linux-devel %endif -%if ! 0%{?SPLIT_NONFREE} -Provides: %{name}-nonfree +%if 0%{?BUILD_ORIG_ADDON} +Provides: patched_subset %else -Provides: free_subset +Provides: %{name}-orig-addon = %{version} +Obsoletes: %{name}-orig-addon %endif %else -Provides: free_subset +Provides: patched_subset %endif %ifarch %ix86 ppc x86_64 BuildRequires: valgrind @@ -53,7 +54,7 @@ Group: System/GUI/GNOME Autoreqprov: on Version: 0.10.4 -Release: 16 +Release: 27 %define gst_branch 0.10 Source: %{_name}-%{version}.tar.bz2 Patch: gstreamer010-plugins-bad-shared-amrwb.patch @@ -105,9 +106,9 @@ Jan Schmidt <thaytan@mad.scientist.com> Arwed v. Merkatz <v.merkatz@gmx.net> -%if 0%{?BUILD_NONFREE} -%if 0%{?SPLIT_NONFREE} -%package nonfree +%if 0%{?BUILD_ORIG} +%if 0%{?BUILD_ORIG_ADDON} +%package orig-addon Summary: GStreamer Streaming-Media Framework Plug-Ins Group: System/GUI/GNOME Requires: %{name} = %{version} @@ -115,7 +116,7 @@ Supplements: %{name} %endif -%description nonfree +%description orig-addon GStreamer is a streaming media framework based on graphs of filters that operate on media data. Applications using this library can do anything from real-time sound processing to playing videos and just @@ -192,7 +193,7 @@ %prep %setup -q -n %{_name}-%{version} -%if 0%{?BUILD_NONFREE} +%if 0%{?BUILD_ORIG} %patch if ! grep -q faacDecOpen /usr/%{_lib}/libfaad.so ; then %patch1 @@ -217,7 +218,7 @@ %install make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{gst_branch}/*.*a -%if ! 0%{?BUILD_NONFREE} +%if ! 0%{?BUILD_ORIG} for MODULE in \ %{_libdir}/gstreamer-%{gst_branch}/libgstamrwb.so \ %{_libdir}/gstreamer-%{gst_branch}/libgstdivxdec.so \ @@ -272,10 +273,10 @@ %{_libdir}/gstreamer-%{gst_branch}/libgstwavpack.so %{_libdir}/gstreamer-%{gst_branch}/libgstxingheader.so %{_libdir}/gstreamer-%{gst_branch}/libgsty4menc.so -%if 0%{?BUILD_NONFREE} -%if 0%{?SPLIT_NONFREE} +%if 0%{?BUILD_ORIG} +%if 0%{?BUILD_ORIG_ADDON} -%files nonfree +%files orig-addon %defattr(-, root, root) %endif %ifarch %ix86 @@ -331,7 +332,7 @@ * rfbsrc, librfb based capture source ported from 0.8 * New element: jackaudiosink. JACK audio output element * Many fixes and improvements -- Support for BUILD_NONFREE and SPLIT_NONFREE defines (#237351). +- Support for BUILD_ORIG and BUILD_ORIG_ADDON defines (#237351). * Fri Mar 02 2007 - sbrabec@suse.cz - Fixed BuildRequires to build on all products. * Tue Feb 06 2007 - sbrabec@suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org