Hello community, here is the log from the commit of package gnome-control-center for openSUSE:Factory checked in at 2012-04-12 09:24:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-control-center (Old) and /work/SRC/openSUSE:Factory/.gnome-control-center.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-control-center", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-control-center/gnome-control-center.changes 2012-04-02 11:23:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-control-center.new/gnome-control-center.changes 2012-04-12 09:24:20.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Apr 1 14:15:28 UTC 2012 - [email protected] + +- Change /usr/bin/glxinfo Recommends to Mesa-demo-x Requires. Since + bnc#748373 has been resolved, we can require the real package + again. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-control-center.spec ++++++ --- /var/tmp/diff_new_pack.REz0ti/_old 2012-04-12 09:24:21.000000000 +0200 +++ /var/tmp/diff_new_pack.REz0ti/_new 2012-04-12 09:24:21.000000000 +0200 @@ -23,7 +23,6 @@ Name: gnome-control-center Version: 3.4.0 Release: 0 -# FIXME: change /usr/bin/glxinfo to Recommends to real package name, and to Requires, once we know which package name to use (see bnc#748373) # FIXME: in 12.2 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833) Summary: The GNOME Control Center License: GPL-2.0+ @@ -83,6 +82,8 @@ BuildRequires: pkgconfig(xft) BuildRequires: pkgconfig(xi) >= 1.2 Requires: %{name}-branding = %{version} +# needed for glxinfo, used by System info panel +Requires: Mesa-demo-x # needed for printers panel Requires: cups-pk-helper Requires: gnome-menus @@ -97,11 +98,6 @@ Recommends: apg # the printers panel can use the dbus service Recommends: system-config-printer-dbus-service -# /usr/bin/glxinfo is used by System info panel; we're using a path here since -# the xorg-x11 packaging change brought a mess, and this is not packaged -# anymore for now. It will come back, but we don't know in which package... -# (see bnc#748373) -Recommends: /usr/bin/glxinfo Provides: acme Provides: fontilus Provides: themus @@ -121,9 +117,9 @@ Summary: The GNOME Control Center -- Upstream Definition of Shell Content Group: System/GUI/GNOME Requires: %{name} = %{version} +Supplements: packageand(%{name}:branding-upstream) Provides: %{name}-branding = %{version} Conflicts: otherproviders(%{name}-branding) -Supplements: packageand(%{name}:branding-upstream) BuildArch: noarch #BRAND: This package contains the definitions of the content appearing #BRAND: in the shell (/etc/xdg/menus/gnomecc.menu). @@ -174,12 +170,12 @@ %endif --disable-static\ --disable-maintainer-mode -make %{?jobs:-j%jobs} V=1 +make %{?_smp_mflags} V=1 %install -%makeinstall +%make_install %if 0%{?suse_version} <= 1120 -%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* +rm %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name}-2.0 %{?no_lang_C} @@ -204,10 +200,10 @@ %suse_update_desktop_file gnome-universal-access-panel X-SuSE-ControlCenter-Personal %suse_update_desktop_file gnome-user-accounts-panel X-SuSE-ControlCenter-Personal %suse_update_desktop_file gnome-wacom-panel X-SuSE-ControlCenter-Hardware -%fdupes $RPM_BUILD_ROOT +%fdupes %{buildroot} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post %glib2_gsettings_schema_post -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
