From e82dfa02fa76556445fde1a3740001062bc2bdb6 Mon Sep 17 00:00:00 2001 From: Jeffrey Wildman Date: Thu, 2 Apr 2015 20:40:06 -0400 Subject: [PATCH] Remove trailing whitespace --- libosinfo.rb | 2 +- libvirt-glib.rb | 14 +++++++------- virt-manager.rb | 36 ++++++++++++++++++------------------ 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/libosinfo.rb b/libosinfo.rb index eb321c3..153553d 100644 --- a/libosinfo.rb +++ b/libosinfo.rb @@ -29,7 +29,7 @@ index 01b764d..22f7d15 100755 +++ b/configure @@ -14694,7 +14694,7 @@ case "$host" in ;; - + *) - NO_UNDEFINED_FLAGS="-Wl,--no-undefined" + NO_UNDEFINED_FLAGS="" diff --git a/libvirt-glib.rb b/libvirt-glib.rb index 2de3c3e..46b52c3 100644 --- a/libvirt-glib.rb +++ b/libvirt-glib.rb @@ -34,9 +34,9 @@ index a9a6591..ca83fca 100644 - -Wl,--version-script=$(srcdir)/libvirt-gconfig.sym \ -version-info $(LIBVIRT_GLIB_VERSION_INFO) +# -Wl,--version-script=$(srcdir)/libvirt-gconfig.sym \ - + BUILT_SOURCES = $(GCONFIG_GENERATED_FILES) - + diff --git a/libvirt-gconfig/Makefile.in b/libvirt-gconfig/Makefile.in index 42e4352..67d7fae 100644 --- a/libvirt-gconfig/Makefile.in @@ -48,7 +48,7 @@ index 42e4352..67d7fae 100644 - -Wl,--version-script=$(srcdir)/libvirt-gconfig.sym \ -version-info $(LIBVIRT_GLIB_VERSION_INFO) +# -Wl,--version-script=$(srcdir)/libvirt-gconfig.sym \ - + BUILT_SOURCES = $(GCONFIG_GENERATED_FILES) CLEANFILES = $(BUILT_SOURCES) $(am__append_2) diff --git a/libvirt-glib/Makefile.am b/libvirt-glib/Makefile.am @@ -62,7 +62,7 @@ index a48cfbb..d865a63 100644 - -Wl,--version-script=$(srcdir)/libvirt-glib.sym \ -version-info $(LIBVIRT_GLIB_VERSION_INFO) +# -Wl,--version-script=$(srcdir)/libvirt-glib.sym \ - + # .libs/libvirt-glib.so is built by libtool as a side-effect of the Makefile # rule for libosvirt-glib.la. However, checking symbols relies on Linux ELF layout diff --git a/libvirt-glib/Makefile.in b/libvirt-glib/Makefile.in @@ -76,7 +76,7 @@ index 3523684..47c4417 100644 - -Wl,--version-script=$(srcdir)/libvirt-glib.sym \ -version-info $(LIBVIRT_GLIB_VERSION_INFO) +# -Wl,--version-script=$(srcdir)/libvirt-glib.sym \ - + INTROSPECTION_GIRS = $(am__append_1) CLEANFILES = $(am__append_2) diff --git a/libvirt-gobject/Makefile.am b/libvirt-gobject/Makefile.am @@ -90,7 +90,7 @@ index 7163c7d..8a379b0 100644 - -Wl,--version-script=$(srcdir)/libvirt-gobject.sym \ -version-info $(LIBVIRT_GLIB_VERSION_INFO) +# -Wl,--version-script=$(srcdir)/libvirt-gobject.sym \ - + libvirt-gobject-enums.c: $(libvirt_gobject_1_0_la_HEADERS) $(AM_V_GEN)glib-mkenums \ diff --git a/libvirt-gobject/Makefile.in b/libvirt-gobject/Makefile.in @@ -104,6 +104,6 @@ index 26e0df6..0ffa15c 100644 - -Wl,--version-script=$(srcdir)/libvirt-gobject.sym \ -version-info $(LIBVIRT_GLIB_VERSION_INFO) +# -Wl,--version-script=$(srcdir)/libvirt-gobject.sym \ - + BUILT_SOURCES = $(GOBJECT_GENERATED_FILES) CLEANFILES = $(BUILT_SOURCES) $(am__append_2) diff --git a/virt-manager.rb b/virt-manager.rb index 91f340e..a9a0a47 100644 --- a/virt-manager.rb +++ b/virt-manager.rb @@ -5,22 +5,22 @@ class VirtManager < Formula depends_on "pkg-config" => :build depends_on "intltool" => :build - + # TODO: don't rely on homebrewed python depends_on :python depends_on "pygobject3" depends_on "gtk+3" depends_on "libvirt-glib" - depends_on "libxml2" => "with-python" + depends_on "libxml2" => "with-python" depends_on "vte3" depends_on "d-bus" - depends_on :x11 + depends_on :x11 depends_on "libosinfo" # TODO: audio depends_on "gtk-vnc" depends_on "spice-gtk" - + depends_on "libvirt" depends_on "hicolor-icon-theme" depends_on "gnome-icon-theme" @@ -136,13 +136,13 @@ index 52c4969..caffea3 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -144,21 +144,21 @@ python setup.py install -O1 --root=$RPM_BUILD_ROOT - + %post /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -/usr/bin/update-desktop-database &> /dev/null || : +/usr/local/bin/update-desktop-database &> /dev/null || : - - + + %postun if [ $1 -eq 0 ] ; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null @@ -153,28 +153,28 @@ index 52c4969..caffea3 100644 fi -/usr/bin/update-desktop-database &> /dev/null || : +/usr/local/bin/update-desktop-database &> /dev/null || : - - + + %posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : +/usr/local/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +/usr/local/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : - - + + %files diff --git a/virt-manager.spec.in b/virt-manager.spec.in index e6991d8..577e5c3 100644 --- a/virt-manager.spec.in +++ b/virt-manager.spec.in @@ -144,21 +144,21 @@ python setup.py install -O1 --root=$RPM_BUILD_ROOT - + %post /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -/usr/bin/update-desktop-database &> /dev/null || : +/usr/local/bin/update-desktop-database &> /dev/null || : - - + + %postun if [ $1 -eq 0 ] ; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null @@ -185,13 +185,13 @@ index e6991d8..577e5c3 100644 fi -/usr/bin/update-desktop-database &> /dev/null || : +/usr/local/bin/update-desktop-database &> /dev/null || : - - + + %posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : +/usr/local/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +/usr/local/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : - - + + %files