Mailinglist Archive: opensuse-commit (1029 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package rhythmbox for openSUSE:Factory
checked in at Wed Jul 6 12:45:53 CEST 2011.



--------
--- GNOME/rhythmbox/rhythmbox.changes   2011-02-14 20:39:33.000000000 +0100
+++ /mounts/work_src_done/STABLE/rhythmbox/rhythmbox.changes    2011-07-04 
11:38:33.000000000 +0200
@@ -1,0 +2,43 @@
+Mon Jul  4 11:30:52 CEST 2011 - vuntz@xxxxxxxxxxxx
+
+- Move to pkgconfig()-style BuildRequires:
+  + Note that the package won't build on old distributions anyway
+    because of the GNOME 3 port, so using pkgconfig()-style doesn't
+    break anything.
+  + Old ones: brasero-devel, dbus-1-glib-devel,
+    gstreamer010-plugins-base-devel, json-glib-devel,
+    libavahi-glib-devel, libgnome-keyring-devel, libgpod-devel,
+    libgudev-1_0-devel, libmtp-devel, libmusicbrainz3-devel,
+    libnotify-devel, libsoup-devel, totem-pl-parser-devel.
+  + New ones: avahi-glib, dbus-glib-1, json-glib-1.0,
+    gnome-keyring-1, gstreamer-0.10, gstreamer-plugins-base-0.10,
+    gudev-1.0, libbrasero-media3, libgpod-1.0, libmtp,
+    libmusicbrainz3, libnotify, libsoup-2.4, libsoup-gnome-2.4,
+    totem-plparser.
+- Change libwebkit-devel BuildRequires to pkgconfig(), to build
+  against the GTK+ 3 version of webkit.
+- Change python-gstreamer-0_10-devel, python-gtk-devel
+  BuildRequires to pkgconfig(pygobject-2.0) as only python-gobject
+  is needed for the GTK+ 3 port.
+- Change python-gstreamer-0_10 Requires to python-gobject, for the
+  same reason.
+- Remove unneeded gcc-c++, libmusicbrainz-devel BuildRequires.
+
+-------------------------------------------------------------------
+Thu Jun  9 13:38:13 UTC 2011 - dimstar@xxxxxxxxxxxx
+
+- Add rhythmbox-port-gtk3.patch: Port rhythmbox to GTK3 and GNOME3
+  infrastructure. This patch brings us to git commit e0e5d06e.
+- Add gnome-common BuildRequires and call to gnome-autogen.sh,
+  needed for the patch.
+- Disable translation-update-upstream for the moment as the patch
+  breaks this.
+- Add pkgconfig() BuildRequires for GNOME 3: gtk+-3.0,
+  libgnome-media-profiles-3.0, libpeas-1.0, libpeas-gtk-1.0.
+- Add gobject-introspection-devel BuildRequires.
+- Remove now non-existing gnome-media-devel BuildRequires.
+- Pass --disable-vala to configure. The plugins are not working
+  on the GNOME 3 platform yet.
+- Replace gconf schema handling with gsettings schema handling.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  rhythmbox-port-gtk3.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ rhythmbox.spec ++++++
--- /var/tmp/diff_new_pack.fm6ejE/_old  2011-07-06 12:42:23.000000000 +0200
+++ /var/tmp/diff_new_pack.fm6ejE/_new  2011-07-06 12:42:23.000000000 +0200
@@ -19,12 +19,15 @@
 
 Name:           rhythmbox
 Version:        0.13.3
-Release:        8
+Release:        9
+# FIXME: reenable vala support later on (it's just a configure option); build 
currently fails because of libpeas (last check: 2011-07-04)
 License:        GPLv2+
 Summary:        GNOME Music Management Application
 Url:            http://www.gnome.org/projects/rhythmbox/
 Group:          Productivity/Multimedia/Sound/Players
 Source:         %{name}-%{version}.tar.bz2
+# PATCH-FEATURE-UPSTREAM rhythmbox-port-gtk3.patch dimstar@xxxxxxxxxxxx -- 
Port to GTK3. Pieces taken from upstream git. This more or less brings the code 
to git commit e0e5d06e.
+Patch0:         rhythmbox-port-gtk3.patch
 %if 0%{suse_version} > 1130
 %define xulrunner_version 20
 %else
@@ -38,50 +41,52 @@
 %endif
 %endif
 %endif
-BuildRequires:  brasero-devel
-BuildRequires:  dbus-1-glib-devel
 BuildRequires:  fdupes
-BuildRequires:  gcc-c++
+# Needed for patch0
+BuildRequires:  gnome-common
 BuildRequires:  gnome-doc-utils-devel
-BuildRequires:  gnome-media-devel
-BuildRequires:  gstreamer010-plugins-base-devel
+BuildRequires:  gobject-introspection-devel
 BuildRequires:  intltool
-BuildRequires:  json-glib-devel
-BuildRequires:  libavahi-glib-devel
 %if 0%{?suse_version} >= 1140
 BuildRequires:  libdmapsharing-devel
 %endif
-%if 0%{?suse_version} >= 1130
-BuildRequires:  libgnome-keyring-devel
-%else
-BuildRequires:  gnome-keyring-devel
-%endif
-BuildRequires:  libgpod-devel
-BuildRequires:  libgudev-1_0-devel
-BuildRequires:  libmtp-devel
-BuildRequires:  libmusicbrainz-devel
-BuildRequires:  libmusicbrainz3-devel
-BuildRequires:  libnotify-devel
-BuildRequires:  libsoup-devel
-BuildRequires:  libwebkit-devel
 BuildRequires:  lirc-devel
 BuildRequires:  mozilla-xulrunner%{xulrunner_version}-devel
-BuildRequires:  python-gstreamer-0_10-devel
-BuildRequires:  python-gtk-devel
-BuildRequires:  totem-pl-parser-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  vala-devel
+BuildRequires:  pkgconfig(avahi-glib)
+BuildRequires:  pkgconfig(dbus-glib-1)
+BuildRequires:  pkgconfig(json-glib-1.0)
+BuildRequires:  pkgconfig(gnome-keyring-1)
+BuildRequires:  pkgconfig(gstreamer-0.10)
+BuildRequires:  pkgconfig(gstreamer-plugins-base-0.10)
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(gudev-1.0)
+BuildRequires:  pkgconfig(libbrasero-media3)
+BuildRequires:  pkgconfig(libgnome-media-profiles-3.0)
+BuildRequires:  pkgconfig(libgpod-1.0)
+BuildRequires:  pkgconfig(libmtp)
+BuildRequires:  pkgconfig(libmusicbrainz3)
+BuildRequires:  pkgconfig(libnotify)
+BuildRequires:  pkgconfig(libpeas-1.0)
+BuildRequires:  pkgconfig(libpeas-gtk-1.0)
+BuildRequires:  pkgconfig(libsoup-2.4)
+BuildRequires:  pkgconfig(libsoup-gnome-2.4)
+BuildRequires:  pkgconfig(pygobject-2.0)
+BuildRequires:  pkgconfig(totem-plparser)
+BuildRequires:  pkgconfig(webkitgtk-3.0)
 Requires:       gstreamer010-plugins-base
 Requires:       gstreamer010-plugins-good
-Requires:       python-gstreamer-0_10
+# For python plugins
+Requires:       python-gobject
 Recommends:     %{name}-lang
 Recommends:     media-player-info
 # Coherence DLNA/UPnP Client plugin
 Recommends:     python-coherence
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %py_requires
-%gconf_schemas_prereq
+%glib2_gsettings_schema_requires
 
 %description
 Music Management application with support for ripping audio-CD's,
@@ -104,9 +109,12 @@
 %lang_package
 %prep
 %setup -q
-translation-update-upstream
+%patch0 -p1
+# Disabled for patch0
+#translation-update-upstream
 
 %build
+NOCONFIGURE=1 gnome-autogen.sh
 export MOZILLA_PLUGINDIR=%{_libdir}/browser-plugins
 %configure\
        --libexecdir=%{_libexecdir}/rhythmbox\
@@ -115,45 +123,38 @@
        --disable-scrollkeeper\
        --enable-lirc\
        --enable-python\
-       --enable-vala
-%__make %{?_smp_mflags}
+        --disable-vala
+
+%__make %{?_smp_mflags} V=1
 
 %install
 %makeinstall
 %suse_update_desktop_file %name Player
 %suse_update_desktop_file rhythmbox-device
 %find_lang %{name} %{?no_lang_C}
-%find_gconf_schemas
-cat %{name}.schemas_list >%{name}.lst
 find %{buildroot} -type f -name "*.la" -delete -print
-# FIXME: No headers provided => no use for development files outside sources:
-rm %{buildroot}%{_libdir}/rhythmbox/plugins/visualizer/rb-visualizer-glue.h
 #%fdupes %{buildroot}
 
 %clean
 rm -rf %{buildroot}
 
-%pre -f %{name}.schemas_pre
-
 %post
 /sbin/ldconfig
 %if 0%{?suse_version} > 1130
+%glib2_gsettings_schema_post
 %desktop_database_post
 %icon_theme_cache_post
 %endif
 
-%posttrans -f %{name}.schemas_posttrans
-
-%preun -f %{name}.schemas_preun
-
 %postun
 /sbin/ldconfig
 %if 0%{?suse_version} > 1130
+%glib2_gsettings_schema_postun
 %desktop_database_postun
 %icon_theme_cache_postun
 %endif
 
-%files -f %{name}.lst
+%files
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog DOCUMENTERS INTERNALS MAINTAINERS 
MAINTAINERS.old NEWS README THANKS
 %dir %{_datadir}/gnome/
@@ -164,13 +165,15 @@
 %dir %{_datadir}/omf/%{name}/
 %doc %{_datadir}/omf/%{name}/%{name}-C.omf
 %{_bindir}/rhythmbox
-%{_bindir}/rhythmbox-client
 %{_datadir}/applications/rhythmbox.desktop
 %{_datadir}/applications/rhythmbox-device.desktop
 %{_datadir}/dbus-1/services/org.gnome.Rhythmbox.service
+%{_datadir}/glib-2.0/schemas/org.gnome.rhythmbox.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/rhythmbox*
 %{_datadir}/icons/hicolor/*/places/music-library.*
 %{_datadir}/rhythmbox/
+%{_libdir}/girepository-1.0/MPID-3.0.typelib
+%{_libdir}/girepository-1.0/RB-3.0.typelib
 %{_libdir}/librhythmbox-core.so.*
 %{_libdir}/browser-plugins/librhythmbox-itms-detection-plugin.*
 %dir %{_libdir}/rhythmbox
@@ -194,17 +197,14 @@
 %{_libdir}/rhythmbox/plugins/mmkeys/
 %{_libdir}/rhythmbox/plugins/mpris/
 %{_libdir}/rhythmbox/plugins/mtpdevice/
+%{_libdir}/rhythmbox/plugins/notification/
 %{_libdir}/rhythmbox/plugins/power-manager/
 %{_libdir}/rhythmbox/plugins/python-console/
 %{_libdir}/rhythmbox/plugins/rb/
 %{_libdir}/rhythmbox/plugins/rblirc/
 %{_libdir}/rhythmbox/plugins/rbzeitgeist/
 %{_libdir}/rhythmbox/plugins/replaygain/
-%{_libdir}/rhythmbox/plugins/sample-vala/
 %{_libdir}/rhythmbox/plugins/sendto/
-%{_libdir}/rhythmbox/plugins/status-icon/
-%{_libdir}/rhythmbox/plugins/upnp_coherence/
-%{_libdir}/rhythmbox/plugins/visualizer/
 %if "%{_libdir}" != "%{_libexecdir}"
 %dir %{_libexecdir}/rhythmbox/
 %endif
@@ -214,10 +214,11 @@
 
 %files devel
 %defattr(-, root, root)
+%{_datadir}/gir-1.0/*.gir
+%doc %{_datadir}/gtk-doc/html/rhythmbox/
 %{_includedir}/rhythmbox/
 %{_libdir}/pkgconfig/rhythmbox.pc
 %{_libdir}/librhythmbox-core.so
-%{_datadir}/gtk-doc/html/rhythmbox/
 
 %files lang -f %{name}.lang
 

++++++ rhythmbox-port-gtk3.patch ++++++
++++ 197165 lines (skipped)


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx