summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2013-03-21 11:50:49 -0400
committerCosimo Cecchi <cosimoc@gnome.org>2013-03-21 11:54:34 -0400
commit81b25b53edd18ccfcf09ddb47f7669bf4ff6b5a4 (patch)
tree9f794655e18941e75028b6a26a22c5ec383c979d
parent Update to 3.7.14 (diff)
downloadgtk3-classic-build-gtk3-81b25b53edd18ccfcf09ddb47f7669bf4ff6b5a4.tar.gz
gtk3-classic-build-gtk3-81b25b53edd18ccfcf09ddb47f7669bf4ff6b5a4.tar.bz2
gtk3-classic-build-gtk3-81b25b53edd18ccfcf09ddb47f7669bf4ff6b5a4.zip
Fix with_wayland and with_broadway macros
And exclude the broadwayd man mage when broadway is off
-rw-r--r--gtk3.spec12
1 files changed, 8 insertions, 4 deletions
diff --git a/gtk3.spec b/gtk3.spec
index bca0914..0e83928 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -46,7 +46,7 @@ BuildRequires: libXi-devel
BuildRequires: gobject-introspection-devel
BuildRequires: colord-devel
BuildRequires: avahi-gobject-devel
-%if %{with_wayland}
+%if 0%{?with_wayland}
BuildRequires: libwayland-client-devel
BuildRequires: libwayland-cursor-devel
BuildRequires: libxkbcommon-devel
@@ -134,10 +134,10 @@ widget toolkit.
--enable-xcomposite \
--enable-xdamage \
--enable-x11-backend \
-%if %{with_wayland}
+%if 0%{?with_wayland}
--enable-wayland-backend \
%endif
-%if %{with_broadway}
+%if 0%{?with_broadway}
--enable-broadway-backend \
%endif
--enable-colord \
@@ -163,6 +163,10 @@ make install DESTDIR=$RPM_BUILD_ROOT \
rm $RPM_BUILD_ROOT%{_libdir}/*.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
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
%{_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml
-%if %{with_broadway}
+%if 0%{?with_broadway}
%{_bindir}/broadwayd
%{_mandir}/man1/broadwayd.1*
%endif
bgstack15