[ModemManager/f15] Patch out uses of openpty in the testcases

Daniel Williams dcbw at fedoraproject.org
Wed Jul 6 22:58:29 UTC 2011


commit d316b93b61590df00a8702cb24e6f3c4577c2534
Author: Dan Williams <dcbw at redhat.com>
Date:   Wed Jul 6 18:01:41 2011 -0500

    Patch out uses of openpty in the testcases

 ModemManager.spec            |    5 +++--
 blah.patch                   |   16 ----------------
 buildsys-hates-openpty.patch |   12 ++++++++++++
 3 files changed, 15 insertions(+), 18 deletions(-)
---
diff --git a/ModemManager.spec b/ModemManager.spec
index 3a18f92..1a410c8 100644
--- a/ModemManager.spec
+++ b/ModemManager.spec
@@ -28,7 +28,7 @@ BuildRequires: automake autoconf intltool libtool
 # for xsltproc
 BuildRequires: libxslt
 
-Patch0: blah.patch
+Patch0: buildsys-hates-openpty.patch
 
 # HACK patch to workaround FTBFS on sparc, type mismatch where
 # suseconds_t is int -- Rex
@@ -40,11 +40,12 @@ modems, including mobile broadband (3G) devices.
 
 %prep
 %setup -q
-%patch0 -p1 -b .blah
+%patch0 -p1 -b .pty
 %patch1 -p1 -b .hack_sparc_werror.patch
 
 %build
 
+autoreconf -i
 %configure \
 	--enable-more-warnings=yes \
 	--with-udev-base-dir=/lib/udev \
diff --git a/buildsys-hates-openpty.patch b/buildsys-hates-openpty.patch
new file mode 100644
index 0000000..39a4292
--- /dev/null
+++ b/buildsys-hates-openpty.patch
@@ -0,0 +1,12 @@
+diff -up ModemManager-0.4.998/src/tests/Makefile.am.foo ModemManager-0.4.998/src/tests/Makefile.am
+--- ModemManager-0.4.998/src/tests/Makefile.am.foo	2011-07-06 17:59:53.711343366 -0500
++++ ModemManager-0.4.998/src/tests/Makefile.am	2011-07-06 18:00:08.971152593 -0500
+@@ -45,7 +45,6 @@ if WITH_TESTS
+ check-local: test-modem-helpers
+ 	$(abs_builddir)/test-modem-helpers
+ 	$(abs_builddir)/test-charsets
+-	$(abs_builddir)/test-qcdm-serial-port
+ 
+ endif
+ 
+


More information about the scm-commits mailing list