[spice-gtk] Remove with_gtk3

Marc-André Lureau elmarco at fedoraproject.org
Wed Mar 4 15:15:39 UTC 2015


commit 82f9a535ce22ff075846320af0a1662d51e6ce61
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Wed Mar 4 16:13:41 2015 +0100

    Remove with_gtk3
    
    gtk3 is in fedora for a long while, and the package now requires other
    recent dependencies anyway (not in rhel6: lz4, phodav, libsoup..)

 spice-gtk.spec | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)
---
diff --git a/spice-gtk.spec b/spice-gtk.spec
index 21fd7b4..e6d2fc7 100644
--- a/spice-gtk.spec
+++ b/spice-gtk.spec
@@ -1,8 +1,3 @@
-%define with_gtk3 0
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
-%define with_gtk3 1
-%endif
-
 #define _version_suffix
 
 Name:           spice-gtk
@@ -36,9 +31,8 @@ BuildRequires: usbutils
 BuildRequires: libsoup-devel >= 2.49.91
 BuildRequires: libphodav2-devel
 BuildRequires: lz4-devel
-%if %{with_gtk3}
 BuildRequires: gtk3-devel
-%endif
+
 # FIXME: should ship the generated files..
 BuildRequires: pyparsing
 # keep me to get gendeps magic happen
@@ -83,8 +77,6 @@ spice-client-glib-2.0 is a SPICE client library for GLib2.
 
 Libraries, includes, etc. to compile with the spice-glib-2.0 libraries
 
-
-%if %{with_gtk3}
 %package -n spice-gtk3
 Summary: A GTK3 widget for SPICE clients
 Group: Development/Libraries
@@ -114,7 +106,6 @@ Requires: spice-gtk3-devel%{?_isa} = %{version}-%{release}
 
 %description -n spice-gtk3-vala
 A module allowing use of the spice-gtk-3.0 widget from vala
-%endif
 
 %package python
 Summary: Python bindings for the spice-gtk-2.0 library
@@ -148,10 +139,7 @@ pushd spice-gtk-%{version}
 find . -name '*.stamp' | xargs touch
 popd
 
-%if %{with_gtk3}
 cp -a spice-gtk-%{version} spice-gtk3-%{version}
-%endif
-
 
 %build
 
@@ -167,12 +155,10 @@ cd spice-gtk-%{version}
 make %{?_smp_mflags}
 cd ..
 
-%if %{with_gtk3}
 cd spice-gtk3-%{version}
 %configure $CONFIGURE_ARGS --with-gtk=3.0
 make %{?_smp_mflags}
 cd ..
-%endif
 
 
 %install
@@ -181,11 +167,9 @@ cd spice-gtk-%{version}
 make install DESTDIR=%{buildroot}
 cd ..
 
-%if %{with_gtk3}
 cd spice-gtk3-%{version}
 make install DESTDIR=%{buildroot}
 cd ..
-%endif
 
 rm -f %{buildroot}%{_libdir}/*.a
 rm -f %{buildroot}%{_libdir}/*.la
@@ -207,10 +191,8 @@ rm -rf %{buildroot}%{_datadir}/pkgconfig/spice-protocol.pc
 %post -n spice-glib -p /sbin/ldconfig
 %postun -n spice-glib -p /sbin/ldconfig
 
-%if %{with_gtk3}
 %post -n spice-gtk3 -p /sbin/ldconfig
 %postun -n spice-gtk3 -p /sbin/ldconfig
-%endif
 
 
 %files
@@ -247,7 +229,6 @@ rm -rf %{buildroot}%{_datadir}/pkgconfig/spice-protocol.pc
 %{_datadir}/vala/vapi/spice-protocol.vapi
 %doc %{_datadir}/gtk-doc/html/*
 
-%if %{with_gtk3}
 %files -n spice-gtk3
 %{_libdir}/libspice-client-gtk-3.0.so.*
 %{_libdir}/girepository-1.0/SpiceClientGtk-3.0.typelib
@@ -263,7 +244,6 @@ rm -rf %{buildroot}%{_datadir}/pkgconfig/spice-protocol.pc
 %{_datadir}/vala/vapi/spice-client-glib-2.0.vapi
 %{_datadir}/vala/vapi/spice-client-gtk-3.0.deps
 %{_datadir}/vala/vapi/spice-client-gtk-3.0.vapi
-%endif
 
 %files python
 %{_libdir}/python*/site-packages/SpiceClientGtk.so


More information about the scm-commits mailing list