Mailinglist Archive: opensuse-commit (857 mails)
| < Previous | Next > |
commit doc++
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 13 Nov 2007 20:46:05 +0100
- Message-id: <20071113194606.005606781B8@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package doc++
checked in at Tue Nov 13 20:46:05 CET 2007.
--------
--- doc++/doc++.changes 2007-03-30 02:27:31.000000000 +0200
+++ /mounts/work_src_done/STABLE/doc++/doc++.changes 2007-11-13
17:18:06.054545000 +0100
@@ -1,0 +2,9 @@
+Tue Nov 13 17:02:59 CET 2007 - mrueckert@xxxxxxx
+
+- added doc++-4.3.10_gcc43.patch:
+ added missing includes and "using namespace" statements
+- added doc++-4.3.10_missing_cxxflags.patch:
+ dont overwrite external CXXFLAGS
+- minor specfile cleanup
+
+-------------------------------------------------------------------
New:
----
doc++-4.3.10_gcc43.patch
doc++-4.3.10_missing_cxxflags.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ doc++.spec ++++++
--- /var/tmp/diff_new_pack.r29101/_old 2007-11-13 20:45:48.000000000 +0100
+++ /var/tmp/diff_new_pack.r29101/_new 2007-11-13 20:45:48.000000000 +0100
@@ -14,12 +14,14 @@
BuildRequires: bison flex gcc-c++
Summary: Documentation System for C, C++, IDL, and Java
Version: 3.4.10
-Release: 46
-License: GNU General Public License (GPL)
+Release: 81
+License: GPL v2 or later
Group: Development/Tools/Doc Generators
Source:
ftp://metalab.unc.edu/pub/Linux/apps/doctools/doc++-%{version}.tar.bz2
Patch: doc++-3.4.10-flex.patch
-URL: http://docpp.sourceforge.net/
+Patch1: doc++-4.3.10_gcc43.patch
+Patch2: doc++-4.3.10_missing_cxxflags.patch
+Url: http://docpp.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -44,28 +46,35 @@
%prep
%setup -q
%patch
+%patch1
+%patch2
%build
-CXXFLAGS="$RPM_OPT_FLAGS" %configure
+%configure
make
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/usr/share/locale/locale.alias
+rm %{buildroot}%{_datadir}/locale/locale.alias
+rm doc/manual/Makefile*
+%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
-%files
+%files -f %{name}.lang
%defattr(-,root,root)
%doc COPYING CREDITS NEWS PLATFORMS README REPORTING-BUGS doc/manual
doc/doc++.conf doc/docxx-br.sty doc/docxx-fr.sty doc/docxx-ja.sty
doc/docxx-ro.sty doc/docxx.sty
-/usr/bin/doc++
-/usr/bin/docify
-/usr/bin/promote
-%{_datadir}/locale/*/*/*
-
+%{_bindir}/doc++
+%{_bindir}/docify
+%{_bindir}/promote
%changelog
+* Tue Nov 13 2007 - mrueckert@xxxxxxx
+- added doc++-4.3.10_gcc43.patch:
+ added missing includes and "using namespace" statements
+- added doc++-4.3.10_missing_cxxflags.patch:
+ dont overwrite external CXXFLAGS
+- minor specfile cleanup
* Fri Mar 30 2007 - ro@xxxxxxx
- added flex,bison to buildreq
* Wed Jan 25 2006 - mls@xxxxxxx
++++++ doc++-4.3.10_gcc43.patch ++++++
Index: src/comment.ll
===================================================================
--- src/comment.ll.orig 2000-06-24 18:50:23.000000000 +0200
+++ src/comment.ll 2007-11-13 16:35:29.852769513 +0100
@@ -24,7 +24,7 @@
#include <assert.h>
#include <ctype.h>
-#include <iostream.h>
+#include <iostream>
#include <stdarg.h>
#include <stdio.h>
Index: src/cpp.ll
===================================================================
--- src/cpp.ll.orig 2002-05-09 08:11:14.000000000 +0200
+++ src/cpp.ll 2007-11-13 16:35:29.892771920 +0100
@@ -26,7 +26,7 @@
#include <assert.h>
#include <ctype.h>
-#include <iostream.h>
+#include <iostream>
#include <stdarg.h>
#include <stdio.h>
Index: src/datahashtable.h
===================================================================
--- src/datahashtable.h.orig 2000-08-27 21:44:34.000000000 +0200
+++ src/datahashtable.h 2007-11-13 16:49:50.084533725 +0100
@@ -26,9 +26,11 @@
#define _DATAHASHTABLE_H
#include <assert.h>
-#include <iostream.h>
+#include <iostream>
#include <stdlib.h>
+using namespace std;
+
#include "McDArray.h"
/* This should be a private subclass of #DataHashTable#. However, since cfront
Index: src/doc.ll
===================================================================
--- src/doc.ll.orig 2000-09-17 21:41:17.000000000 +0200
+++ src/doc.ll 2007-11-13 16:35:29.964776253 +0100
@@ -23,8 +23,8 @@
%{
#include <assert.h>
-#include <fstream.h>
-#include <iostream.h>
+#include <fstream>
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Index: src/doc2dbsgml.ll
===================================================================
--- src/doc2dbsgml.ll.orig 2002-05-09 08:11:14.000000000 +0200
+++ src/doc2dbsgml.ll 2007-11-13 16:48:01.017970855 +0100
@@ -22,12 +22,13 @@
%{
#include <assert.h>
-#include <fstream.h>
-#include <iostream.h>
+#include <iostream>
+#include <fstream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+using namespace std;
#include "classgraph.h"
#include "doc.h"
Index: src/doc2dbxml.ll
===================================================================
--- src/doc2dbxml.ll.orig 2002-05-09 08:11:14.000000000 +0200
+++ src/doc2dbxml.ll 2007-11-13 16:48:05.562244298 +0100
@@ -25,12 +25,14 @@
%{
#include <assert.h>
-#include <fstream.h>
-#include <iostream.h>
+#include <iostream>
+#include <fstream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+using namespace std;
+
#include "classgraph.h"
#include "doc.h"
Index: src/doc2tex.ll
===================================================================
--- src/doc2tex.ll.orig 2000-11-05 17:21:16.000000000 +0100
+++ src/doc2tex.ll 2007-11-13 16:47:55.325628329 +0100
@@ -23,13 +23,15 @@
%{
#include <assert.h>
-#include <fstream.h>
-#include <iostream.h>
+#include <iostream>
+#include <fstream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
+using namespace std;
+
#include "classgraph.h"
#include "doc.h"
Index: src/equate.cc
===================================================================
--- src/equate.cc.orig 2002-05-02 21:13:10.000000000 +0200
+++ src/equate.cc 2007-11-13 16:35:29.984777457 +0100
@@ -23,9 +23,9 @@
#include "config.h"
-#include <fstream.h>
+#include <fstream>
#include <getopt.h>
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include <string.h>
Index: src/html.cc
===================================================================
--- src/html.cc.orig 2001-02-17 07:34:49.000000000 +0100
+++ src/html.cc 2007-11-13 16:35:30.044781067 +0100
@@ -31,7 +31,7 @@
#include <direct.h>
#endif
#include <errno.h>
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Index: src/java.ll
===================================================================
--- src/java.ll.orig 2001-11-25 18:04:12.000000000 +0100
+++ src/java.ll 2007-11-13 16:35:30.064782271 +0100
@@ -26,7 +26,7 @@
#include <assert.h>
#include <ctype.h>
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include "doc.h"
Index: src/nametable.cc
===================================================================
--- src/nametable.cc.orig 2000-04-08 23:11:54.000000000 +0200
+++ src/nametable.cc 2007-11-13 16:35:30.188789733 +0100
@@ -22,7 +22,7 @@
*/
#include <assert.h>
-#include <iostream.h>
+#include <iostream>
#include <stdlib.h>
#include <string.h>
Index: src/nametable.h
===================================================================
--- src/nametable.h.orig 2000-04-08 23:11:56.000000000 +0200
+++ src/nametable.h 2007-11-13 16:50:40.483566369 +0100
@@ -25,7 +25,9 @@
#define _NAME_TABLE_H
#include <assert.h>
-#include <iostream.h>
+#include <iostream>
+
+using namespace std;
#include "datahashtable.h"
Index: src/php.ll
===================================================================
--- src/php.ll.orig 2001-02-16 23:34:47.000000000 +0100
+++ src/php.ll 2007-11-13 16:35:30.208790937 +0100
@@ -23,7 +23,7 @@
%{
#include <assert.h>
#include <ctype.h>
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include "doc.h"
Index: src/tex2gif.cc
===================================================================
--- src/tex2gif.cc.orig 2001-08-07 20:55:40.000000000 +0200
+++ src/tex2gif.cc 2007-11-13 16:48:37.720179342 +0100
@@ -21,11 +21,13 @@
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
#include <stdio.h>
#include <string.h>
+using namespace std;
+
#ifdef __BORLANDC__
#include <dir.h>
#elif defined(__VISUALC__) || defined(__WATCOMC__)
Index: src/main.cc
===================================================================
--- src/main.cc.orig 2007-11-13 14:59:20.000000000 +0100
+++ src/main.cc 2007-11-13 16:48:27.919589610 +0100
@@ -25,11 +25,14 @@
#include "config.h"
#include <assert.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
#include <getopt.h>
#include <locale.h>
#include <stdio.h>
+using namespace std;
+
#include "McDirectory.h"
#include "McString.h"
#include "doc.h"
++++++ doc++-4.3.10_missing_cxxflags.patch ++++++
Index: configure
===================================================================
--- configure.orig 2002-12-22 16:39:27.000000000 +0100
+++ configure 2007-11-13 17:13:58.883704452 +0100
@@ -4764,7 +4764,7 @@ fi
done
-CXXFLAGS=""
+CXXFLAGS="${CXXFLAGS}"
# Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then
@@ -4774,7 +4774,7 @@ cat >>confdefs.h <<\_ACEOF
#define DEBUG 1
_ACEOF
- CXXFLAGS="-g"
+ CXXFLAGS="${CXXFLAGS} -g"
fi;
Index: configure.in
===================================================================
--- configure.in.orig 2002-12-22 16:37:30.000000000 +0100
+++ configure.in 2007-11-13 17:14:26.609369189 +0100
@@ -35,13 +35,13 @@ dnl Checks for library functions.
AC_CHECK_FUNCS(getopt_long strdup strstr)
dnl Set compiler flags
-CXXFLAGS=""
+CXXFLAGS="${CXXFLAGS}"
dnl Checks if we are going to enable debugging
AC_ARG_ENABLE(debug,
[ --enable-debug Turn on debugging],
AC_DEFINE(DEBUG, 1, Define if you want to generate debugging informations)
- CXXFLAGS="-g"
+ CXXFLAGS="${CXXFLAGS} -g"
)
dnl Checks for gettext
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |