Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at Mon Jun 28 10:43:48 CEST 2010. -------- --- KDE/kdelibs4/kdelibs4.changes 2010-06-18 16:31:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdelibs4/kdelibs4.changes 2010-06-22 14:59:01.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Jun 22 12:58:48 UTC 2010 - llunak@novell.com + +- make hal required, there are way too many things that break + otherwise (bnc#613898) + +------------------------------------------------------------------- +Sun Jun 20 21:13:58 UTC 2010 - cmorve69@yahoo.es + +- remove mimetypes already provided by the system + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- shared-mime-info-060.diff shared-mime-info-070.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.hzQTqD/_old 2010-06-28 10:42:45.000000000 +0200 +++ /var/tmp/diff_new_pack.hzQTqD/_new 2010-06-28 10:42:45.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: alsa-devel aspell-devel cmake cups-devel giflib-devel hicolor-icon-theme BuildRequires: libQtWebKit-devel libattr-devel libpng-devel libqt4-devel libtiff-devel libxslt-devel unzip BuildRequires: bison flex libqca2-devel libsoprano-devel pcre-devel phonon-devel shared-mime-info -BuildRequires: kde4-filesystem strigi strigi-devel update-desktop-files +BuildRequires: kde4-filesystem pkg-config strigi strigi-devel update-desktop-files BuildRequires: OpenEXR-devel automoc4 enchant-devel fam-devel libacl-devel utempter BuildRequires: libattica-devel shared-desktop-ontologies-devel soprano-backend-redland %if %suse_version > 1110 @@ -49,7 +49,7 @@ Summary: KDE Base Libraries Url: http://www.kde.org Version: 4.4.4 -Release: 1 +Release: 2 Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`) Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) Requires: kdelibs4-core = %version @@ -87,6 +87,8 @@ Patch26: khtml-bnc561367.diff Patch27: kinit-su-xauthority.diff Patch28: kdelibs-r1111606-kfiledialog-keyboard.diff +Patch29: shared-mime-info-060.diff +Patch30: shared-mime-info-070.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 1010 %requires_ge libqt4-x11 @@ -170,6 +172,12 @@ %patch26 %patch27 %patch28 +if $(pkg-config --atleast-version=0.60 shared-mime-info); then +%patch29 +fi +if $(pkg-config --atleast-version=0.70 shared-mime-info); then +%patch30 +fi ##KDE44 is this still needed? #%patch21 -p1 # @@ -341,7 +349,7 @@ License: LGPLv2.1+ Group: System/GUI/KDE Summary: KDE Base Libraries -Recommends: hal +Requires: hal %description -n libkde4 This package contains the basic packages of the K Desktop Environment. ++++++ shared-mime-info-060.diff ++++++ Index: mimetypes/kde.xml =================================================================== --- mimetypes/kde.xml.orig +++ mimetypes/kde.xml @@ -170,15 +170,6 @@ Notes: </magic> <glob pattern="*.abc"/> </mime-type> - <mime-type type="application/x-fictionbook"> <!-- fdo #17553, FIXED 0.60 --> - <comment>FictionBook document</comment> - <sub-class-of type="application/xml"/> - <glob pattern="*.fb2"/> - <magic priority="80"> - <match type="string" value="<FictionBook" offset="0:256"/> - </magic> - <root-XML namespaceURI="http://www.gribuser.ru/xml/fictionbook/2.0" localName="FictionBook"/> - </mime-type> <!-- all/ fake mime types --> <mime-type type="all/all"> @@ -362,40 +353,6 @@ Notes: <alias type="application/x-mplayer2"/> <glob pattern="*.wmp"/> </mime-type> - <mime-type type="application/vnd.ms-asf"> <!-- fdo #19671, FIXED 0.60 --> - <comment>Microsoft Media Format</comment> - <sub-class-of type="video/x-ms-wmv"/> - </mime-type> - <mime-type type="application/x-ogg"> <!-- fdo #19671, FIXED 0.60 --> - <comment>Ogg multimedia file</comment> - <sub-class-of type="application/ogg"/> - </mime-type> - <mime-type type="audio/m3u"> <!-- fdo #19671, FIXED 0.60 --> - <comment>MP3 audio</comment> - <sub-class-of type="audio/x-mpegurl"/> - <alias type="audio/x-m3u"/> - </mime-type> - <mime-type type="audio/vorbis"> <!-- fdo #19671, FIXED 0.60 --> - <comment>Vorbis audio</comment> - <sub-class-of type="audio/ogg"/> - <alias type="audio/x-vorbis"/> - </mime-type> - <mime-type type="audio/x-mp2"> <!-- fdo #19671, FIXED 0.60 --> - <comment>MP2 audio</comment> - <sub-class-of type="audio/mp2"/> - </mime-type> - <mime-type type="audio/x-oggflac"> <!-- fdo #19671, FIXED 0.60 --> - <comment>MP2 audio</comment> - <sub-class-of type="audio/x-flac+ogg"/> - </mime-type> - <mime-type type="video/x-ogm"> <!-- fdo #19671, FIXED 0.60 --> - <comment>Ogg/Ogm Video</comment> - <sub-class-of type="video/x-ogm+ogg"/> - </mime-type> - <mime-type type="video/x-theora"> <!-- fdo #19671, FIXED 0.60 --> - <comment>Ogg/Ogm Video</comment> - <sub-class-of type="video/x-theora+ogg"/> - </mime-type> <mime-type type="application/x-kexiproject-shortcut"> <!-- added to shared-mime-info 0.70 --> <comment>shortcut to Kexi project on database server</comment> @@ -420,13 +377,6 @@ Notes: <glob pattern="*.kexic"/> </mime-type> - <!-- Is the actual standard for rdf content encoded in XMl, as opposed to text/rdf: http://www.iana.org/assignments/media-types/application/ --> - <mime-type xmlns="http://www.freedesktop.org/standards/shared-mime-info" type="application/rdf+xml"> <!-- fdo #18088, FIXED 0.60 --> - <comment>RDF/XML document</comment> - <sub-class-of type="application/xml"/> - <glob pattern="*.rdf" /> - <glob pattern="*.rdfs" /> - </mime-type> <!-- http://www4.wiwiss.fu-berlin.de/bizer/TriG/ --> <!-- Used in Nepomuk to encode almost all ontologies --> <mime-type xmlns="http://www.freedesktop.org/standards/shared-mime-info" type="application/x-trig"> <!-- fdo #18089 --> ++++++ shared-mime-info-070.diff ++++++ Index: mimetypes/kde.xml =================================================================== --- mimetypes/kde.xml.orig +++ mimetypes/kde.xml @@ -86,10 +86,6 @@ Notes: <comment>SuperKaramba theme</comment> <glob pattern="*.skz"/> </mime-type> - <mime-type type="application/x-vnd.kde.kexi"> <!-- added to shared-mime-info-0.70 --> - <comment>Kexi project file</comment> - <glob pattern="*.kexi"/> - </mime-type> <mime-type type="application/x-vnd.kde.kplato"> <comment>KPlato project management document</comment> <glob pattern="*.kplato"/> @@ -354,29 +350,6 @@ Notes: <glob pattern="*.wmp"/> </mime-type> - <mime-type type="application/x-kexiproject-shortcut"> <!-- added to shared-mime-info 0.70 --> - <comment>shortcut to Kexi project on database server</comment> - <glob pattern="*.kexis"/> - </mime-type> - <mime-type type="application/x-kexiproject-sqlite"> <!-- added to shared-mime-info 0.70 --> - <comment>Kexi database file-based project</comment> - <glob pattern="*.kexi"/> - </mime-type> - <mime-type type="application/x-kexiproject-sqlite2"> <!-- added to shared-mime-info 0.70 --> - <sub-class-of type="application/x-sqlite2"/> - <comment>Kexi database file-based project</comment> - <glob pattern="*.kexi"/> - </mime-type> - <mime-type type="application/x-kexiproject-sqlite3"> <!-- added to shared-mime-info 0.70 --> - <sub-class-of type="application/x-sqlite3"/> - <comment>Kexi database file-based project</comment> - <glob pattern="*.kexi"/> - </mime-type> - <mime-type type="application/x-kexi-connectiondata"> <!-- added to shared-mime-info 0.70 --> - <comment>data for database server connection</comment> - <glob pattern="*.kexic"/> - </mime-type> - <!-- http://www4.wiwiss.fu-berlin.de/bizer/TriG/ --> <!-- Used in Nepomuk to encode almost all ontologies --> <mime-type xmlns="http://www.freedesktop.org/standards/shared-mime-info" type="application/x-trig"> <!-- fdo #18089 --> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org