rpms/libwvstreams/devel libwvstreams.spec, 1.48, 1.49 wvstreams-4.6.1-make.patch, 1.3, 1.4

[Ondrej Vasik]

Author: ovasik

Update of /cvs/pkgs/rpms/libwvstreams/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31229

Modified Files:
	libwvstreams.spec wvstreams-4.6.1-make.patch 
Log Message:
fix wvstreams-4.6.1-make.patch to work correctly with with_dbus option


Index: libwvstreams.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libwvstreams/devel/libwvstreams.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- libwvstreams.spec	13 Jan 2010 14:58:19 -0000	1.48
+++ libwvstreams.spec	13 Jan 2010 16:30:20 -0000	1.49
@@ -95,7 +95,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Tue Jan 12 2010 Ondrej Vasik <ovasik at redhat.com> - 4.6.1-2
 - Merge review changes: added few comments, do not use "-fpermissive"
-  for COPTS, use parallel build
+  for COPTS, use parallel build (#226061)
 
 * Thu Nov 12 2009 Ondrej Vasik <ovasik at redhat.com> - 4.6.1-1
 - new upstream release 4.6.1

wvstreams-4.6.1-make.patch:
 Makefile   |    5 +++++
 wvrules.mk |   24 ++++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)

Index: wvstreams-4.6.1-make.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libwvstreams/devel/wvstreams-4.6.1-make.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- wvstreams-4.6.1-make.patch	13 Jan 2010 14:12:00 -0000	1.3
+++ wvstreams-4.6.1-make.patch	13 Jan 2010 16:30:20 -0000	1.4
@@ -1,12 +1,16 @@
 diff --git a/Makefile b/Makefile
-index 72c8bef..7e7f85c 100644
+index 72c8bef..26cb6df 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -235,6 +235,7 @@ TARGETS_A = $(filter %.a,$(TARGETS))
+@@ -235,6 +235,11 @@ TARGETS_A = $(filter %.a,$(TARGETS))
  all: config.mk $(filter-out $(WV_EXCLUDES), $(TARGETS))
  
  TESTS += wvtestmain
-+$(TESTS): $(LIBWVSTREAMS)
++TESTS_DEPS = $(LIBWVSTREAMS)
++ifneq ("$(with_dbus)", "no")
++  TESTS_DEPS += libwvdbus.so
++endif
++$(TESTS): $(TESTS_DEPS)
  
  REAL_TESTS = $(filter-out $(TEST_SKIP_OBJS), $(TESTS))
  $(addsuffix .o,$(REAL_TESTS)):