Hello community,
here is the log from the commit of package swfdec
checked in at Sun Jun 3 22:14:06 CEST 2007.
--------
--- swfdec/swfdec.changes 2007-04-17 17:30:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/swfdec/swfdec.changes 2007-05-30 11:56:17.000000000 +0200
@@ -5 +5 @@
-- Support for BUILD_NONFREE and SPLIT_NONFREE defines (#237351).
+- Support for BUILD_ORIG and BUILD_ORIG_ADDON defines (#237351).
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ swfdec.spec ++++++
--- /var/tmp/diff_new_pack.hz7266/_old 2007-06-03 22:13:53.000000000 +0200
+++ /var/tmp/diff_new_pack.hz7266/_new 2007-06-03 22:13:53.000000000 +0200
@@ -11,23 +11,27 @@
# norootforbuild
Name: swfdec
-# Use rpmbuild -D 'BUILD_NONFREE 1' to build non-free code.
-# Use rpmbuild -D 'BUILD_NONFREE 1' -D 'SPLIT_NONFREE 1' to name
-# non-free package as -nonfree.
+# 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 name original code as -orig.
URL: http://swfdec.freedesktop.org/
BuildRequires: alsa-devel cairo-devel gtk2-devel liboil-devel
# Only for directory ownership:
BuildRequires: gtk-doc
-%if 0%{?BUILD_NONFREE}
+%if 0%{?BUILD_ORIG}
BuildRequires: ffmpeg-devel mad-devel
+%if ! 0%{?BUILD_ORIG_ADDON}
+Obsoletes: %{name}-orig
+%endif
%else
-Provides: free_build
+Provides: patched_build
+Conflicts: %{name}-orig
%endif
License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: Productivity/Multimedia/Other
Summary: A free Flash player
Version: 0.4.3
-Release: 4
+Release: 22
Source: http://swfdec.freedesktop.org/download/swfdec/0.4/%name-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -42,14 +46,14 @@
Benjamin Otte
David Schleef
-%if 0%{?BUILD_NONFREE}
-%if 0%{?SPLIT_NONFREE}
-%package nonfree
+%if 0%{?BUILD_ORIG}
+%if 0%{?BUILD_ORIG_ADDON}
+%package orig
Group: Productivity/Multimedia/Other
Summary: A free Flash player
Provides: %{name} = %{version}-%{release}
-%description nonfree
+%description orig
swfdec is a free flash player. It is usually embedded into a browser
via for instance the swfdec-mozilla package.
@@ -62,27 +66,27 @@
%endif
%endif
-%if 0%{?BUILD_NONFREE}
-%if 0%{?SPLIT_NONFREE}
-%package nonfree-devel
+%if 0%{?BUILD_ORIG}
+%if 0%{?BUILD_ORIG_ADDON}
+%package orig-devel
Provides: %{name}-devel = %{version}-%{release}
%else
%package devel
+Obsoletes: %{name}-orig-devel
%endif
+Requires: ffmpeg-devel mad-devel
%else
%package devel
-Provides: free_build
+Provides: patched_build
+Conflicts: %{name}-orig-devel
%endif
Group: Productivity/Multimedia/Other
Summary: A free Flash player
Requires: %{name} = %{version} glib2-devel liboil-devel cairo-devel pango-devel
-%if 0%{?BUILD_NONFREE}
-Requires: ffmpeg-devel mad-devel
-%endif
-%if 0%{?BUILD_NONFREE}
-%if 0%{?SPLIT_NONFREE}
+%if 0%{?BUILD_ORIG}
+%if 0%{?BUILD_ORIG_ADDON}
-%description nonfree-devel
+%description orig-devel
swfdec is a free flash player. It is usually embedded into a browser
via for instance the swfdec-mozilla package.
@@ -141,8 +145,11 @@
%setup -q
%build
+# Do it, otherwise it can fail on bi-arch with:
+# /usr/lib/lib....so: could not read symbols: File in wrong format
+export LDFLAGS=-L%{_libdir}
%configure\
-%if ! 0%{?BUILD_NONFREE}
+%if ! 0%{?BUILD_ORIG}
--disable-mad\
--disable-ffmpeg
%endif
@@ -155,10 +162,10 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%if 0%{?BUILD_NONFREE}
-%if 0%{?SPLIT_NONFREE}
+%if 0%{?BUILD_ORIG}
+%if 0%{?BUILD_ORIG_ADDON}
-%files nonfree
+%files orig
%else
%files
@@ -170,10 +177,10 @@
%defattr(-, root, root)
%doc AUTHORS COPYING NEWS README
%{_libdir}/*.so.*
-%if 0%{?BUILD_NONFREE}
-%if 0%{?SPLIT_NONFREE}
+%if 0%{?BUILD_ORIG}
+%if 0%{?BUILD_ORIG_ADDON}
-%files nonfree-devel
+%files orig-devel
%else
%files devel
@@ -195,7 +202,7 @@
%changelog
* Tue Apr 17 2007 - sbrabec@suse.cz
- Split devel and doc subpackages.
-- Support for BUILD_NONFREE and SPLIT_NONFREE defines (#237351).
+- Support for BUILD_ORIG and BUILD_ORIG_ADDON defines (#237351).
* Thu Mar 29 2007 - meissner@suse.de
- Initial import of swfdec-0.4.3. Opensource Flash Player.
Disabled MAD and FFMPEG support (for now).
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org