rpm/gnome-settings-daemon
SHA256
1
0
Fork 0
forked from pool/gnome-settings-daemon
Code Pull Requests Activity

Accepting request 293324 from GNOME:Next

Browse Source 
resubmit, typo fixed

OBS-URL: https://build.opensuse.org/request/show/293324
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=215
This commit is contained in:
Dominique Leuenberger 2015-03-30 22:43:19 +00:00 committed by Git OBS Bridge
parent f017a0f81d
commit 685f559a07
2 changed files with 44 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gnome-settings-daemon.changes
View File

@ -1,3 +1,33 @@
-------------------------------------------------------------------
Thu Mar 26 15:23:44 UTC 2015 - dimstar@opensuse.org
- Drop systemd build condition and pkgconfig(libsystemd-login)
BuildRequires: this hasn't been a dependency since version 3.8.
-------------------------------------------------------------------
Thu Mar 26 15:17:53 UTC 2015 - dimstar@opensuse.org
- Change RPM group of -devel package to
"Development/Languages/C and C++".
-------------------------------------------------------------------
Thu Mar 26 15:06:02 UTC 2015 - dimstar@opensuse.org
- No longer pass --enable-systemd, --enable-gconf-bridge and
--with-pnpids to configure: those parameters are not available
anymore.
-------------------------------------------------------------------
Thu Mar 26 13:53:51 UTC 2015 - dimstar@opensuse.org
- Change from simple %defines to %bcond_with/without, as this
allows to be set in prjconf without the need to patch the .spec
files.
+ with_systemd, with_wacom, with_wayland, with_smartcard have
been replaced with their equivalent %bcond_with, resp.
%bcond_without, based on the value that was originally set,
resulting in no change for the build.
-------------------------------------------------------------------
Mon Mar 23 11:50:51 UTC 2015 - dimstar@opensuse.org

39
gnome-settings-daemon.spec
View File

@ -16,22 +16,19 @@
#
# 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 disable wayland components
%bcond_without wayland
# Smart-Card support is disabled in version 3.7.3
%define with_smartcard 1
# Smart-Card support was not available from version 3.7.3 to 3.9.5; allow to easily disable it
%bcond_without smartcard
# Wacom input support
# Wacom input support is not available on all platforms
%ifarch s390 s390x
%define with_wacom 0
%bcond_with wacom
%else
%define with_wacom 1
%bcond_without wacom
%endif
%define with_wayland 1
Name: gnome-settings-daemon
Version: 3.16.0
Release: 0
@ -75,10 +72,7 @@ BuildRequires: pkgconfig(libnotify) >= 0.7.3
BuildRequires: pkgconfig(libpulse) >= 2.0
BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 2.0
BuildRequires: pkgconfig(librsvg-2.0) >= 2.36.2
%if %{with_systemd}
BuildRequires: pkgconfig(libsystemd-login)
%endif
%if %{with_wacom}
%if %{with wacom}
BuildRequires: pkgconfig(libwacom) >= 0.7
BuildRequires: pkgconfig(xorg-wacom)
%endif
@ -112,7 +106,7 @@ splitted from it for a more general use.
%package devel
Summary: Development package for the GNOME settings daemon
Group: System/GUI/GNOME
Group: Development/Languages/C and C++
Requires: %{name} = %{version}
%description devel
@ -136,17 +130,12 @@ translation-update-upstream
%build
autoreconf -f -i
%configure\
%if %{with_systemd}
--enable-systemd \
%endif
%if %{with_wayland}
%if %{with wayland}
--enable-wayland \
%else
--disable-wayland \
%endif
--enable-gconf-bridge \
--disable-static \
--with-pnpids=%{_datadir}/libgnome-desktop-3.0/pnp.ids \
--libexecdir=%{_libexecdir}/gnome-settings-daemon-3.0 \
%{nil}
# work around a racing condition in plugins/common, which does not always build properly using parallel build
@ -184,7 +173,7 @@ rm -rf %{buildroot}
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-printer
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-test-*
# From patch2
#%{_libexecdir}/novell-sysconfig-proxy-helper
#%%{_libexecdir}/novell-sysconfig-proxy-helper
%dir %{_libdir}/gnome-settings-daemon-3.0/
%{_libdir}/gnome-settings-daemon-3.0/libgsd.so
%{_libdir}/gnome-settings-daemon-3.0/*.gnome-settings-plugin
@ -204,7 +193,7 @@ rm -rf %{buildroot}
%{_libdir}/gnome-settings-daemon-3.0/librfkill.so
%{_libdir}/gnome-settings-daemon-3.0/libscreensaver-proxy.so
%{_libdir}/gnome-settings-daemon-3.0/libsharing.so
%if %{with_smartcard}
%if %{with smartcard}
%{_libdir}/gnome-settings-daemon-3.0/libsmartcard.so
%endif
%{_libdir}/gnome-settings-daemon-3.0/libsound.so
@ -224,7 +213,7 @@ rm -rf %{buildroot}
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.power.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml
# From patch2
#%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.proxy.gschema.xml
#%%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.proxy.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.sharing.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.xrandr.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.xsettings.gschema.xml
@ -235,7 +224,7 @@ rm -rf %{buildroot}
%dir %{_datadir}/GConf
%dir %{_datadir}/GConf/gsettings
%{_datadir}/GConf/gsettings/gnome-settings-daemon.convert
%if %{with_wacom}
%if %{with wacom}
%{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.wacom.policy
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-list-wacom
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-wacom-led-helper