From 81fd81a4a7ad4c11c31d19b569cffe0dfb1a399f Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Tue, 24 May 2011 11:27:27 +0200 Subject: [PATCH] remove GTK3 support rhel6/epel6 don't have gtk3 --- spice-gtk.spec | 80 ++++---------------------------------------------- 1 file changed, 5 insertions(+), 75 deletions(-) diff --git a/spice-gtk.spec b/spice-gtk.spec index c9631a6..4fb64c2 100644 --- a/spice-gtk.spec +++ b/spice-gtk.spec @@ -4,11 +4,6 @@ %filter_setup } -%define with_gtk3 0 -%if 0%{fedora} >= 15 -%define with_gtk3 1 -%endif - Name: spice-gtk Version: 0.6 Release: 1%{?dist} @@ -30,9 +25,6 @@ BuildRequires: pygtk2-devel python-devel zlib-devel BuildRequires: cyrus-sasl-devel BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc -%if %{with_gtk3} -BuildRequires: gtk3-devel -%endif # Hack because of bz #613466 BuildRequires: libtool @@ -75,29 +67,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 GTK2 widget for SPICE clients -Group: Development/Libraries - -%description -n spice-gtk3 -spice-client-glib-3.0 is a SPICE client library for Gtk3. - -%package -n spice-gtk3-devel -Summary: Development files to build GTK2 applications with spice-gtk-3.0 -Group: Development/Libraries -Requires: spice-gtk3 = %{version}-%{release} -Requires: spice-glib-devel = %{version}-%{release} -Requires: pkgconfig -Requires: gtk3-devel - -%description -n spice-gtk3-devel -spice-client-gtk-3.0 provides a SPICE viewer widget for GTK3. - -Libraries, includes, etc. to compile with the spice-gtk3 libraries -%endif - %package python Summary: Python bindings for the spice-gtk-2.0 library Group: Development/Libraries @@ -118,43 +87,18 @@ spicy is a client to a SPICE desktop server. snappy is a tool to capture screen-shots of a SPICE desktop. %prep -%setup -q -n spice-gtk-%{version} -c -pushd spice-gtk-%{version} +%setup -q %patch0 -p1 -b .controller-includes -popd - -%if %{with_gtk3} -cp -a spice-gtk-%{version} spice-gtk3-%{version} -%endif - %build -cd spice-gtk-%{version} %configure --enable-gtk-doc --with-gtk=2.0 make %{?_smp_mflags} -cd .. - -%if %{with_gtk3} -cd spice-gtk3-%{version} -%configure --with-gtk=3.0 -make %{?_smp_mflags} -cd .. -%endif - %install rm -rf %{buildroot} -%if %{with_gtk3} -cd spice-gtk3-%{version} make install DESTDIR=%{buildroot} -cd .. -%endif - -cd spice-gtk-%{version} -make install DESTDIR=%{buildroot} -cd .. rm -f %{buildroot}%{_libdir}/*.a rm -f %{buildroot}%{_libdir}/*.la @@ -171,10 +115,10 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc spice-gtk-%{version}/AUTHORS -%doc spice-gtk-%{version}/COPYING -%doc spice-gtk-%{version}/README -%doc spice-gtk-%{version}/NEWS +%doc AUTHORS +%doc COPYING +%doc README +%doc NEWS %{_libdir}/libspice-client-gtk-2.0.so.* %{_libdir}/girepository-1.0/SpiceClientGtk-2.0.typelib @@ -203,20 +147,6 @@ rm -rf %{buildroot} %{_datadir}/vala/vapi/spice-protocol.vapi %doc %{_datadir}/gtk-doc/html/* -%if %{with_gtk3} -%files -n spice-gtk3 -%defattr(-,root,root,-) -%{_libdir}/libspice-client-gtk-3.0.so.* -%{_libdir}/girepository-1.0/SpiceClientGtk-3.0.typelib - -%files -n spice-gtk3-devel -%defattr(-,root,root,-) -%{_libdir}/libspice-client-gtk-3.0.so -%{_includedir}/spice-client-gtk-3.0 -%{_libdir}/pkgconfig/spice-client-gtk-3.0.pc -%{_datadir}/gir-1.0/SpiceClientGtk-3.0.gir -%endif - %files python %defattr(-,root,root,-) %{_libdir}/python*/site-packages/SpiceClientGtk.so