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

Accepting request 199114 from home:Zaitor:branches:GNOME:Factory

Browse Source 
Drop obsolete --enable-systemd and renable translation-update-upsteam.

OBS-URL: https://build.opensuse.org/request/show/199114
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=211
This commit is contained in:
Dominique Leuenberger 2013-09-15 10:24:52 +00:00 committed by Git OBS Bridge
parent 2b8e7c77f8
commit 1957ed2d17
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnome-control-center.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sun Sep 15 08:04:14 UTC 2013 - zaitor@opensuse.org
- Stop passing --enable-systemd to %configure, as it is not
recognized anymore, and clean spec file of previous needed
with_systemd macro and %if with_systemd statments.
- Reenable translation-update-upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 4 06:43:59 UTC 2013 - dimstar@opensuse.org Wed Sep 4 06:43:59 UTC 2013 - dimstar@opensuse.org

11
gnome-control-center.spec
View File

@ -16,10 +16,6 @@
# #
# We cannot enable systemd support right now, as it is exclusive and means we
# lose ConsoleKit support (bad for sysvinit)
%define with_systemd 1
# Allow to enable/disable ibus, as GNOME is rather strict on new versions. # Allow to enable/disable ibus, as GNOME is rather strict on new versions.
%define with_ibus 1 %define with_ibus 1
@ -80,9 +76,7 @@ BuildRequires: pkgconfig(libnm-gtk) >= 0.9.8
BuildRequires: pkgconfig(libpulse) >= 2.0 BuildRequires: pkgconfig(libpulse) >= 2.0
BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 2.0 BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 2.0
BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libsoup-2.4)
%if %{with_systemd}
BuildRequires: pkgconfig(libsystemd-login) BuildRequires: pkgconfig(libsystemd-login)
%endif
BuildRequires: pkgconfig(libwacom) >= 0.7 BuildRequires: pkgconfig(libwacom) >= 0.7
BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(mm-glib) >= 0.7 BuildRequires: pkgconfig(mm-glib) >= 0.7
@ -151,7 +145,7 @@ various aspects of your desktop.
%lang_package %lang_package
%prep %prep
%setup -q %setup -q
#ranslation-update-upstream translation-update-upstream
%patch0 -p1 %patch0 -p1
#NEEDS-REBASE #NEEDS-REBASE
#patch14 -p1 #patch14 -p1
@ -161,9 +155,6 @@ various aspects of your desktop.
ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh
%configure --with-pic\ %configure --with-pic\
%if %{with_systemd}
--enable-systemd\
%endif
--disable-static\ --disable-static\
--disable-maintainer-mode\ --disable-maintainer-mode\
%if %{with_ibus} %if %{with_ibus}