Hello community,
here is the log from the commit of package vcdimager
checked in at Fri Jun 23 01:16:34 CEST 2006.
--------
--- vcdimager/vcdimager.changes 2006-01-31 14:20:48.000000000 +0100
+++ vcdimager/vcdimager.changes 2006-06-22 18:37:23.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jun 22 18:36:29 CEST 2006 - sbrabec@suse.cz
+
+- Simpler solution of cyclic dependencies.
+
+-------------------------------------------------------------------
Old:
----
libcddb-1.2.1.tar.bz2
libcddb.changes
libcddb.spec
libcdio-0.76.tar.bz2
libcdio.changes
libcdio.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vcdimager.spec ++++++
--- /var/tmp/diff_new_pack.24l0he/_old 2006-06-23 01:16:17.000000000 +0200
+++ /var/tmp/diff_new_pack.24l0he/_new 2006-06-23 01:16:17.000000000 +0200
@@ -5,29 +5,22 @@
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: vcdimager
-BuildRequires: cdparanoia gcc-c++ libxml2-devel pkgconfig popt-devel
+BuildRequires: cdparanoia libcddb-devel libcdio-mini-devel libxml2-devel pkgconfig popt-devel
URL: http://www.vcdimager.org/
License: GPL
Group: Productivity/Multimedia/CD/Record
PreReq: %install_info_prereq
Autoreqprov: on
Version: 0.7.23
-Release: 7
-%define libcdio_version 0.76
-%define libcddb_version 1.2.1
+Release: 19
Summary: Video CD (VCD) authoring software
Source: %{name}-%{version}.tar.bz2
-Source1: libcdio-%{libcdio_version}.tar.bz2
-Source2: libcddb-%{libcddb_version}.tar.bz2
-# Sources are parts of libcdio and libcddb.
-NoSource: 1
-NoSource: 2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -98,43 +91,11 @@
Rocky Bernstein
%prep
-%setup -a1 -a2
+%setup
%build
-LIBCDIO_INSTALL=$PWD/libcdio-install
-LIBCDDB_INSTALL=$PWD/libcddb-install
-export C_INCLUDE_PATH="$LIBCDIO_INSTALL/usr/include:$LIBCDDB_INSTALL/usr/include"
-export LIBRARY_PATH="$LIBCDIO_INSTALL%{_libdir}:$LIBCDDB_INSTALL%{_libdir}"
-export PKG_CONFIG_PATH="$LIBCDIO_INSTALL%{_libdir}/pkgconfig:$LIBCDDB_INSTALL%{_libdir}/pkgconfig"
-export CFLAGS="$RPM_OPT_FLAGS"
-# Now build libcddb, which has circular dependency on libcdio (to prevent weak symbols).
-cd libcddb-%{libcddb_version}
-%{?suse_update_config:%{suse_update_config -f -l}}
-./configure\
- --prefix=/usr\
- --libdir=%{_libdir}\
- --mandir=%{_mandir}
-make %{?jobs:-j%jobs}
-make DESTDIR="$LIBCDDB_INSTALL" install
-for lib in $LIBCDDB_INSTALL%{_libdir}/*.la ; do
- sed -i "s@installed=yes@installed=no@g" $lib
-done
-cd ..
-# Now build version of libcdio, which does not depend on vcdimager..
-cd libcdio-%{libcdio_version}
-./configure\
- --prefix=/usr\
- --libdir=%{_libdir}\
- --infodir=%{_infodir}\
- --mandir=%{_mandir}
-make %{?jobs:-j%jobs}
-make DESTDIR="$LIBCDIO_INSTALL" install
-for lib in $LIBCDIO_INSTALL%{_libdir}/*.la ; do
- sed -i "s@installed=yes@installed=no@g;/dependency_libs/s@%{_libdir}@$LIBCDIO_INSTALL%{_libdir}@g" $lib
-done
-cd ..
-# And finally build vcdimager.
%{?suse_update_config:%{suse_update_config -f -l}}
+export CFLAGS="$RPM_OPT_FLAGS"
./configure\
--prefix=/usr\
--libdir=%{_libdir}\
@@ -143,17 +104,7 @@
make %{?jobs:-j%jobs}
%install
-LIBCDIO_INSTALL=$PWD/libcdio-install
-LIBCDDB_INSTALL=$PWD/libcddb-install
-export LIBRARY_PATH="$LIBCDIO_INSTALL%{_libdir}:$LIBCDDB_INSTALL%{_libdir}"
make DESTDIR=$RPM_BUILD_ROOT install
-# skip-check-libtool-deps
-# Because helper libraries are not installed, wee need this comment
-# to prevent following errors:
-# Error: Required library iso9660 not found (required by /usr/lib64/libvcdinfo.la from vcdimager-devel).
-# Error: Required library cdio not found (required by /usr/lib64/libvcdinfo.la from vcdimager-devel).
-# NOTE: Remove this check skip temporarily during update to check, that
-# devel dependencies are complete.
%clean
rm -rf $RPM_BUILD_ROOT
@@ -182,6 +133,8 @@
/usr/include/*
%changelog -n vcdimager
+* Thu Jun 22 2006 - sbrabec@suse.cz
+- Simpler solution of cyclic dependencies.
* Tue Jan 31 2006 - sbrabec@suse.cz
- Do not link with invalid rpath.
- Enabled parallel build.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org