Hello community, here is the log from the commit of package kde3-amarok for openSUSE:Factory checked in at 2012-05-14 16:14:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kde3-amarok (Old) and /work/SRC/openSUSE:Factory/.kde3-amarok.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kde3-amarok", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kde3-amarok/kde3-amarok.changes 2012-02-10 17:15:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kde3-amarok.new/kde3-amarok.changes 2012-05-14 16:14:48.000000000 +0200 @@ -1,0 +2,5 @@ +Sun May 13 08:25:59 UTC 2012 - [email protected] + +- add patches from Alt Linux to fix build with ruby-1.9 + +------------------------------------------------------------------- New: ---- amarok-1.4.10-alt-mongrel.patch amarok-1.4.10-alt-ruby19.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde3-amarok.spec ++++++ --- /var/tmp/diff_new_pack.jiiQfF/_old 2012-05-14 16:14:50.000000000 +0200 +++ /var/tmp/diff_new_pack.jiiQfF/_new 2012-05-14 16:14:50.000000000 +0200 @@ -30,7 +30,6 @@ Summary: Media Player for KDE Version: 1.4.10 Release: 31 -Requires: kdelibs3 >= %(rpm -q --queryformat '%{VERSION}' kdelibs3) Requires: amarok_engine >= %version Requires: ruby Requires: kde3-amarok-lang = %{version} @@ -64,6 +63,8 @@ Patch27: 18_add_lastfm_recommended_radio.diff Patch28: 10_queuemedia.patch Patch29: amarok-wiki-utf-fix.patch +Patch30: amarok-1.4.10-alt-ruby19.patch +Patch31: amarok-1.4.10-alt-mongrel.patch %description Amarok is a media player for all kinds of media. This includes MP3, Ogg @@ -152,6 +153,10 @@ %patch27 -p1 %patch28 -p1 %patch29 -p1 +%if %{suse_version} > 1210 +%patch30 -p2 +%patch31 -p1 +%endif sed -i 1i\ '#include <cstddef>' amarok/src/magnatunebrowser/magnatuneredownloaddialog.h sed -i 's|WFlags|Qt::WFlags|g' amarok/src/magnatunebrowser/magnatuneredownloaddialog.h @@ -182,7 +187,9 @@ %suse_update_desktop_file amarok AudioVideo Player kde_post_install rm -v $RPM_BUILD_ROOT/opt/kde3/%_lib/*.la +%if %{suse_version} <= 1210 rm -v $RPM_BUILD_ROOT/opt/kde3/%_lib/ruby_lib/*.la +%endif rm -rf $RPM_BUILD_ROOT/opt/kde3/share/locale/xx %find_lang amarok cp %{S:1} $RPM_BUILD_ROOT/opt/kde3/share/services @@ -298,9 +305,11 @@ /opt/kde3/share/services/amarok_mtp-mediadevice.desktop /opt/kde3/%_lib/kde3/libamarok_ipod-mediadevice.* /opt/kde3/share/services/amarok_ipod-mediadevice.desktop +%if %{suse_version} <= 1210 %dir /opt/kde3/%_lib/ruby_lib /opt/kde3/%_lib/ruby_lib/http11.rb /opt/kde3/%_lib/ruby_lib/libhttp11.* +%endif %files xine %defattr(-,root,root) ++++++ amarok-1.4.10-alt-mongrel.patch ++++++ --- amarok-1.4.10/amarok/src/mediadevice/daap/Makefile.am.mongrel 2008-08-14 01:21:51 +0400 +++ amarok-1.4.10/amarok/src/mediadevice/daap/Makefile.am 2008-08-31 18:34:43 +0400 @@ -36,7 +36,7 @@ noinst_HEADERS = \ bin_SCRIPTS = amarok_daapserver.rb -SUBDIRS = daapreader mongrel +SUBDIRS = daapreader amarokrubylibdir = \ $(kde_datadir)/amarok/ruby_lib ++++++ amarok-1.4.10-alt-ruby19.patch ++++++ diff --git a/amarok/amarok/configure.in.in b/amarok/amarok/configure.in.in index c47734e..c45bc3e 100644 --- a/amarok/amarok/configure.in.in +++ b/amarok/amarok/configure.in.in @@ -1082,7 +1082,10 @@ AC_CHECK_TYPES([uint8_t, u_int8_t, uint16_t, u_int16_t, uint32_t, u_int32_t, uin AC_PATH_PROG(RUBY, ruby, no) -ruby_includes=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["archdir"] )'`] +rubyhdrdir=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["rubyhdrdir"] )'`] +rubyarch=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["arch"] )'`] + +ruby_includes="$rubyhdrdir/$rubyarch -I$rubyhdrdir/ruby/backward -I$rubyhdrdir" ruby_ldflags=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["LIBRUBYARG_SHARED"] )'`] AC_SUBST(ruby_includes) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
