Hello community, here is the log from the commit of package amarok checked in at Sun Sep 10 23:44:20 CEST 2006. -------- --- KDE/amarok/amarok.changes 2006-09-06 09:50:02.000000000 +0200 +++ amarok/amarok.changes 2006-09-10 02:00:33.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Sep 10 02:00:29 CEST 2006 - dmueller@suse.de + +- use RPM_OPT_FLAGS + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.G9Wr7h/_old 2006-09-10 23:43:57.000000000 +0200 +++ /var/tmp/diff_new_pack.G9Wr7h/_new 2006-09-10 23:43:57.000000000 +0200 @@ -29,7 +29,7 @@ Group: Productivity/Multimedia/Sound/Players Summary: Media Player for KDE Version: 1.4.3 -Release: 1 +Release: 2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define mversion 0.5 Source0: %name-%version.tar.bz2 @@ -251,6 +251,8 @@ %endif %changelog -n amarok +* Sun Sep 10 2006 - dmueller@suse.de +- use RPM_OPT_FLAGS * Wed Sep 06 2006 - adrian@suse.de - simplify BuildRequires on behalf of AJ * Tue Sep 05 2006 - dmueller@suse.de ++++++ amarok-collectionscanner.diff ++++++ --- /var/tmp/diff_new_pack.G9Wr7h/_old 2006-09-10 23:43:58.000000000 +0200 +++ /var/tmp/diff_new_pack.G9Wr7h/_new 2006-09-10 23:43:58.000000000 +0200 @@ -1,11 +1,11 @@ --- amarok/src/collectionscanner/collectionscanner.cpp +++ amarok/src/collectionscanner/collectionscanner.cpp -@@ -202,7 +202,7 @@ +@@ -217,7 +217,7 @@ if ( ! ( S_ISDIR( statBuf.st_mode ) || S_ISREG( statBuf.st_mode ) ) ) continue; - if ( S_ISDIR( statBuf.st_mode ) && m_recursively && entry.length() && entryname[0] != '.' ) + if ( S_ISDIR( statBuf.st_mode ) && m_recursively && entry.length() && (entryname[0] != '.' || entryname[1] == '.') ) { - const QString file = QFile::decodeName( entry ); - + if ( S_ISLNK( statBuf_symlink.st_mode ) ) { + char nosymlink[PATH_MAX]; ++++++ amarok.diff ++++++ --- /var/tmp/diff_new_pack.G9Wr7h/_old 2006-09-10 23:43:58.000000000 +0200 +++ /var/tmp/diff_new_pack.G9Wr7h/_new 2006-09-10 23:43:58.000000000 +0200 @@ -1,13 +1,17 @@ --- amarok/src/amarok.desktop -+++ amarok/src/amarok.desktop 2005/08/10 11:01:25 -@@ -76,2 +76,3 @@ - Terminal=false - Categories=Qt;KDE;AudioVideo; ++++ amarok/src/amarok.desktop +@@ -75,6 +75,7 @@ + Comment[nl]=Oom Rodney zegt, "10/10, Amarok is werkelijk fantastisch!" + Comment[pa]=ਅੰਕਲ ਰੋਡੀਨੇ ਕਹਿੰਦੇ ਹਨ, "10/10, ਅਮਰੋਕ ਸਹੀਂ 'ਚ ਸੁਪਰ ਹੈ!" + Comment[pl]=Wujek Dobra Rada twierdzi: "10/10, Amarok jest po prostu super!" +InitialPreference=12 + Comment[pt]=O Tio Rodney diz, "10/10, Amarok é excelente!" + Comment[pt_BR]=O Tio Rodney diz: "10/10, o Amarok é mesmo muito bom!" + Comment[ru]=amaroK - просто лучший плеер. --- amarok/src/enginecontroller.cpp -+++ amarok/src/enginecontroller.cpp 2005/08/11 11:37:43 -@@ -136,6 +136,11 @@ - QString query = "[X-KDE-amaroK-plugintype] == 'engine' and [X-KDE-amaroK-name] != '%1'"; ++++ amarok/src/enginecontroller.cpp +@@ -145,6 +145,11 @@ + QString query = "[X-KDE-Amarok-plugintype] == 'engine' and [X-KDE-Amarok-name] != '%1'"; KTrader::OfferList offers = PluginManager::query( query.arg( engineName ) ); + for( int n = offers.count()-1, i = 0; i < n; i++ ) @@ -16,5 +20,19 @@ + offers[n]->property( "X-KDE-amaroK-rank" ) = "128"; + // sort by rank, QValueList::operator[] is O(n), so this is quite inefficient - #define rank( x ) (x)->property( "X-KDE-amaroK-rank" ).toInt() + #define rank( x ) (x)->property( "X-KDE-Amarok-rank" ).toInt() for( int n = offers.count()-1, i = 0; i < n; i++ ) +--- amarok/src/mediadevice/daap/mongrel/http11/Makefile.am ++++ amarok/src/mediadevice/daap/mongrel/http11/Makefile.am +@@ -4,10 +4,7 @@ + + amarokrubylib_DATA = http11.rb + +-INCLUDES = \ +- -I$(ruby_includes) +- +-CFLAGS = -Wall ++INCLUDES = -I$(ruby_includes) -Dinline=__inline__ + + libhttp11_la_LDFLAGS = \ + -shared \ ++++++ default-engine.diff ++++++ --- /var/tmp/diff_new_pack.G9Wr7h/_old 2006-09-10 23:43:58.000000000 +0200 +++ /var/tmp/diff_new_pack.G9Wr7h/_new 2006-09-10 23:43:58.000000000 +0200 @@ -1,11 +1,52 @@ --- amarok/src/engine/helix/amarok_helixengine_plugin.desktop -+++ amarok/src/engine/helix/amarok_helixengine_plugin.desktop 2006/07/03 15:34:00 -@@ -65,7 +65,7 @@ ++++ amarok/src/engine/helix/amarok_helixengine_plugin.desktop +@@ -77,7 +77,7 @@ X-KDE-Amarok-name=helix-engine X-KDE-Amarok-authors=Paul Cifarelli X-KDE-Amarok-email=paul@cifarelli.net -X-KDE-Amarok-rank=75 +X-KDE-Amarok-rank=256 X-KDE-Amarok-version=1 - X-KDE-Amarok-framework-version=25 + X-KDE-Amarok-framework-version=27 +--- amarok/src/mediadevice/daap/mongrel/http11/http11.c ++++ amarok/src/mediadevice/daap/mongrel/http11/http11.c +@@ -392,7 +392,7 @@ + { + VALUE hash; + +- // we create an internal hash to protect stuff from the GC ++ /* we create an internal hash to protect stuff from the GC */ + hash = rb_hash_new(); + rb_ivar_set(self, id_handler_map, hash); + +@@ -508,23 +508,24 @@ + + handler = tst_search(uri_str, tst, &pref_len); + +- // setup for multiple return values ++ /* setup for multiple return values */ + result = rb_ary_new(); + + if(handler) { + rb_ary_push(result, rb_str_substr (uri, 0, pref_len)); +- // compensate for a script_name="/" where we need to add the "/" to path_info to keep it consistent ++ /* compensate for a script_name="/" where we need to add the "/" to path_info to keep it ++ * consistent */ + if(pref_len == 1 && uri_str[0] == '/') { +- // matches the root URI so we have to use the whole URI as the path_info ++ /* matches the root URI so we have to use the whole URI as the path_info */ + rb_ary_push(result, uri); + } else { +- // matches a script so process like normal ++ /* matches a script so process like normal */ + rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING(uri)->len)); + } + + rb_ary_push(result, (VALUE)handler); + } else { +- // not found so push back nothing ++ /* not found so push back nothing */ + rb_ary_push(result, Qnil); + rb_ary_push(result, Qnil); + rb_ary_push(result, Qnil); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org