Fix with_wayland and with_broadway macros

And exclude the broadwayd man mage when broadway is off
This commit is contained in:
Cosimo Cecchi 2013-03-21 11:50:49 -04:00
parent 3bf52c98af
commit 81b25b53ed

View File

@ -46,7 +46,7 @@ BuildRequires: libXi-devel
BuildRequires: gobject-introspection-devel BuildRequires: gobject-introspection-devel
BuildRequires: colord-devel BuildRequires: colord-devel
BuildRequires: avahi-gobject-devel BuildRequires: avahi-gobject-devel
%if %{with_wayland} %if 0%{?with_wayland}
BuildRequires: libwayland-client-devel BuildRequires: libwayland-client-devel
BuildRequires: libwayland-cursor-devel BuildRequires: libwayland-cursor-devel
BuildRequires: libxkbcommon-devel BuildRequires: libxkbcommon-devel
@ -134,10 +134,10 @@ widget toolkit.
--enable-xcomposite \ --enable-xcomposite \
--enable-xdamage \ --enable-xdamage \
--enable-x11-backend \ --enable-x11-backend \
%if %{with_wayland} %if 0%{?with_wayland}
--enable-wayland-backend \ --enable-wayland-backend \
%endif %endif
%if %{with_broadway} %if 0%{?with_broadway}
--enable-broadway-backend \ --enable-broadway-backend \
%endif %endif
--enable-colord \ --enable-colord \
@ -163,6 +163,10 @@ make install DESTDIR=$RPM_BUILD_ROOT \
rm $RPM_BUILD_ROOT%{_libdir}/*.la rm $RPM_BUILD_ROOT%{_libdir}/*.la
rm $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{bin_version}/*/*.la rm $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{bin_version}/*/*.la
%if !0%{?with_broadway}
rm $RPM_BUILD_ROOT%{_mandir}/man1/broadwayd.1*
%endif
touch $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{bin_version}/immodules.cache touch $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{bin_version}/immodules.cache
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-3.0 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-3.0
@ -224,7 +228,7 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
%exclude %{_mandir}/man1/gtk-update-icon-cache.1.gz %exclude %{_mandir}/man1/gtk-update-icon-cache.1.gz
%{_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml %{_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml %{_datadir}/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml
%if %{with_broadway} %if 0%{?with_broadway}
%{_bindir}/broadwayd %{_bindir}/broadwayd
%{_mandir}/man1/broadwayd.1* %{_mandir}/man1/broadwayd.1*
%endif %endif