summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/ace/SPIPE_Acceptor.h2
-rw-r--r--ACE/rpmbuild/ace-tao.spec4
3 files changed, 8 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 7b1bd663d9d..68e1eadd733 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 27 09:01:11 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * rpmbuild/ace-tao.spec:
+ Improved this file
+
Tue Apr 26 09:38:05 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* rpmbuild/ace-tao.spec:
diff --git a/ACE/ace/SPIPE_Acceptor.h b/ACE/ace/SPIPE_Acceptor.h
index 74e616c1c9c..6ff2d1c508d 100644
--- a/ACE/ace/SPIPE_Acceptor.h
+++ b/ACE/ace/SPIPE_Acceptor.h
@@ -148,7 +148,7 @@ private:
DWORD pipe_mode_;
// On Windows, the handle maintained in the ACE_IPC_SAP class is the
- // event handle from event_. The pipe handle is useless for telling
+ // event handle from event. The pipe handle is useless for telling
// when a pipe connect is done/ready, and it changes on each pipe
// acceptance, quite unlike other acceptor-type classes in ACE.
// This allows the get_handle()-obtained handle to be used for
diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index 7c5911d6b08..df712c9c60f 100644
--- a/ACE/rpmbuild/ace-tao.spec
+++ b/ACE/rpmbuild/ace-tao.spec
@@ -377,7 +377,7 @@ Summary: ACE_QtReactor for use with Qt library
Version: %{ACEVER}
Group: Development/Libraries/C and C++
Requires: ace = %{ACEVER}
-Requires: qt
+Requires: qt4
%description -n ace-qtreactor
@@ -395,7 +395,7 @@ Version: %{ACEVER}
Group: Development/Libraries/C and C++
Requires: ace-devel = %{ACEVER}
Requires: ace-qtreactor = %{ACEVER}
-Requires: qt-devel
+Requires: qt4-devel
%description -n ace-qtreactor-devel