diff --git a/kaffeine-link.diff b/kaffeine-link.diff new file mode 100644 index 0000000..1471544 --- /dev/null +++ b/kaffeine-link.diff @@ -0,0 +1,11 @@ +--- kaffeine/src/input/disc/plugins/oggvorbis/Makefile.am.orig 2008-04-30 07:55:58.000000000 +0200 ++++ kaffeine/src/input/disc/plugins/oggvorbis/Makefile.am 2008-04-30 08:02:54.000000000 +0200 +@@ -9,7 +9,7 @@ kaffeineincludedir = $(includedir)/kaffe + noinst_HEADERS = koggenc.h + + libkaffeineoggvorbis_la_SOURCES = koggenc.cpp oggconfig.ui +-libkaffeineoggvorbis_la_LIBADD = ../libkaffeineaudioencoder.la $(LIB_OGGVORBIS) ++libkaffeineoggvorbis_la_LIBADD = ../libkaffeineaudioencoder.la $(LIB_OGGVORBIS) -lvorbis -logg + libkaffeineoggvorbis_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -avoid-version -no-undefined + + # this is where the desktop file will go diff --git a/kaffeine.changes b/kaffeine.changes index 12eb231..4bc3eca 100644 --- a/kaffeine.changes +++ b/kaffeine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 30 08:19:53 CEST 2008 - coolo@suse.de + +- fix build + ------------------------------------------------------------------- Mon Feb 4 22:04:26 CET 2008 - schwab@suse.de diff --git a/kaffeine.spec b/kaffeine.spec index 3ace55e..543c02d 100644 --- a/kaffeine.spec +++ b/kaffeine.spec @@ -10,6 +10,7 @@ # norootforbuild + Name: kaffeine BuildRequires: cdparanoia kdelibs3-devel xine-devel xine-lib %if %suse_version > 1001 @@ -22,7 +23,7 @@ License: GPL v2 or later Group: Productivity/Multimedia/Video/Players Summary: Xine-Based Multimedia Player Version: 0.8.6 -Release: 5 +Release: 41 %define rversion %version BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) @@ -40,6 +41,7 @@ Patch1: adjust-mimetypes.diff Patch2: messagebox-dvd.diff Patch4: mutex.diff Patch5: kaffeine-media.diff +Patch6: kaffeine-link.diff Patch8: kaffeine-quote-subs.patch Patch9: pedantic.diff Patch10: kaffeine-tmpobject.diff @@ -56,6 +58,7 @@ Authors: Jürgen Kofler %package gstreamer +License: GPL v2 or later Group: Productivity/Multimedia/Video/Players Summary: Multimedia Player using Gstreamer @@ -80,6 +83,7 @@ Authors: %patch2 %patch4 #%patch5 +%patch6 %patch8 %patch9 %patch10 @@ -146,7 +150,9 @@ kde_post_install %endif %changelog -* Mon Feb 04 2008 schwab@suse.de +* Wed Apr 30 2008 coolo@suse.de +- fix build +* Tue Feb 05 2008 schwab@suse.de - Fix use of temporary object. * Sun Jan 27 2008 stbinner@suse.de - update to 0.8.6: @@ -157,7 +163,7 @@ kde_post_install * several DVB fixes and improvements * CDDA: fixed encoding crash * kaffeine: requires xine-lib =>1.1.9 -* Mon Aug 13 2007 coolo@suse.de +* Tue Aug 14 2007 coolo@suse.de - don't duplicate the docs between -lang and base pack * Fri Aug 10 2007 olh@suse.de - remove private __u64 declaration, asm/types.h was fixed for -ansi