pool/gnome-control-center
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 112100 from home:dimstar:branches:GNOME:Factory

Browse Source 
we have a package for glxinfo again

OBS-URL: https://build.opensuse.org/request/show/112100
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=140
This commit is contained in:
Vincent Untz 2012-04-06 15:04:35 +00:00 committed by Git OBS Bridge
parent 7d9dfbc21d
commit 990c75fc55
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnome-control-center.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Apr 1 14:15:28 UTC 2012 - dimstar@opensuse.org
- Change /usr/bin/glxinfo Recommends to Mesa-demo-x Requires. Since
bnc#748373 has been resolved we can require the real package
again.
-------------------------------------------------------------------
Mon Mar 26 17:37:25 UTC 2012 - vuntz@opensuse.org

21
gnome-control-center.spec
View File

@ -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,7 @@ BuildRequires: pkgconfig(xcursor)
BuildRequires: pkgconfig(xft)
BuildRequires: pkgconfig(xi) >= 1.2
Requires: %{name}-branding = %{version}
Requires: Mesa-demo-x
# needed for printers panel
Requires: cups-pk-helper
Requires: gnome-menus
@ -97,11 +97,6 @@ Recommends: %{name}-user-faces
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,10 +116,10 @@ various aspects of your desktop.
Summary: The GNOME Control Center -- Upstream Definition of Shell Content
Group: System/GUI/GNOME
Requires: %{name} = %{version}
Provides: %{name}-branding = %{version}
Conflicts: otherproviders(%{name}-branding)
Supplements: packageand(%{name}:branding-upstream)
Provides: %{name}-branding = %{version}
BuildArch: noarch
Conflicts: otherproviders(%{name}-branding)
#BRAND: This package contains the definitions of the content appearing
#BRAND: in the shell (/etc/xdg/menus/gnomecc.menu).
@ -174,12 +169,12 @@ translation-update-upstream
%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 +199,10 @@ find %{buildroot} -type f -name "*.la" -delete -print
%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