[Extras-wsdlpull-svn] SF.net SVN: extras-wsdlpull:[196] trunk/wsdlpull
Status: Beta
Brought to you by:
denis_arnaud
Menu
▾
▴
[Extras-wsdlpull-svn] SF.net SVN: extras-wsdlpull:[196] trunk/wsdlpull
|
From: <den...@us...> - 2010-07-13 22:52:01
|
Revision: 196
http://extras-wsdlpull.svn.sourceforge.net/extras-wsdlpull/?rev=196&view=rev
Author: denis_arnaud
Date: 2010-07-13 22:51:54 +0000 (Tue, 13 Jul 2010)
Log Message:
-----------
[RPM Packaging] Integrated comments from Patrick Monnerat (bug #502686).
Modified Paths:
--------------
trunk/wsdlpull/Makefile.am
trunk/wsdlpull/configure.in
trunk/wsdlpull/wsdlpull.spec
Modified: trunk/wsdlpull/Makefile.am
===================================================================
--- trunk/wsdlpull/Makefile.am 2010-07-13 22:51:07 UTC (rev 195)
+++ trunk/wsdlpull/Makefile.am 2010-07-13 22:51:54 UTC (rev 196)
@@ -15,7 +15,7 @@
#
###########################################################################
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign dist-bzip2
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure \
src/config-h.in config/stamp-h.in
Modified: trunk/wsdlpull/configure.in
===================================================================
--- trunk/wsdlpull/configure.in 2010-07-13 22:51:07 UTC (rev 195)
+++ trunk/wsdlpull/configure.in 2010-07-13 22:51:54 UTC (rev 196)
@@ -1,10 +1,17 @@
-# Configure file for wsdlpull
+# Process this file with autoconf to produce a configure script
+#-------------------------------------------------------------------
+AC_PREREQ(2.59)
+AC_COPYRIGHT([Copyright (C) 2007-2010 Vivek Krishna <viv...@us...>])
AC_INIT([WSDLPull],[1.23],[viv...@us...],[wsdlpull])
AC_CONFIG_HEADER([src/config.h])
AC_CONFIG_SRCDIR([src/wsdlparser/WsdlParser.cpp])
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE
+#AM_PATH_CPPUNIT(1.10)
+#AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x])
+# Configure file for wsdlpull
+
# Shared library versioning
GENERIC_LIBRARY_VERSION="1:23:0"
# | | |
@@ -21,6 +28,37 @@
# or changed
AC_SUBST(GENERIC_LIBRARY_VERSION)
+# Check for host and disable building a shared library in Windows
+AC_CANONICAL_HOST
+case $host in
+ *-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
+ AC_DISABLE_SHARED
+ AC_ENABLE_STATIC
+ ;;
+ *)
+ AC_ENABLE_SHARED
+ AC_DISABLE_STATIC
+ ;;
+esac
+
+# Checks for programs.
+save_CFLAGS="$CFLAGS"
+save_CXXFLAGS="$CXXFLAGS"
+AC_PROG_CXX
+AC_PROG_CXXCPP
+AC_PROG_CXX
+AC_PROG_CC
+AC_PROG_CPP
+CXXFLAGS="$save_CXXFLAGS"
+CFLAGS="$save_CFLAGS"
+AC_PROG_LN_S
+AC_PROG_INSTALL
+AC_PROG_LIBTOOL
+AC_PROG_MAKE_SET
+
+# Set default language to C++
+AC_LANG([C++])
+
AC_ARG_WITH(log,
[ --with-log compile with logging information on],
AC_DEFINE([LOGGING],,[Whether to compile with logging information])
@@ -39,45 +77,32 @@
fi
AC_SUBST(docdir)
-# Checks for programs.
-AC_PROG_CXX
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_LN_S
-AC_PROG_INSTALL
-AC_PROG_LIBTOOL
-AC_PROG_MAKE_SET
-
-# Checks for header files. Doesnt work correctly may be we need to give the absolute path of the header files!!
-#AC_HEADER_STDC
-#AC_CHECK_HEADERS(string,,AC_MSG_ERROR(STL-string class missing?))
-#AC_CHECK_HEADERS(list,,AC_MSG_ERROR(STL-list class missing?))
-#AC_CHECK_HEADERS(vector,,AC_MSG_ERROR(STL-vector class missing?))
-#AC_CHECK_HEADERS(iostream,,AC_MSG_ERROR(STL-iostream class missing?))
-#AC_CHECK_HEADERS(fstream,,AC_MSG_ERROR(STL-fstream class missing?))
-
-# Checks for the c++ compiler
-AC_LANG_CPLUSPLUS
-
# Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_SIZE_T
-AC_HEADER_TIME
AC_STRUCT_TM
#AC_C_CONST
#AC_C_INLINE
AM_WITH_DMALLOC
-AC_DEFUN([OPT_DISABLE], [
- AC_ARG_ENABLE([opt], AC_HELP_STRING([--disable-opt], [ removes compiler optimization flag for debugging purposes ]),
- [CXXFLAGS="-g -O0 -Wall"
- CFLAGS="-g -O0 -Wall"
-],
- [CXXFLAGS="-O2 -Wall" CFLAGS="-O2 -Wall"])
-])
+# Checks for header files
+AC_HEADER_STDC
+AC_HEADER_TIME
+AC_CHECK_HEADERS([ fstream \
+ iostream \
+ list \
+ vector \
+ string])
-OPT_DISABLE
+# Default compilation flags
+if test -z "${CFLAGS}"; then
+ CFLAGS="-g -Wall"
+fi
+if test -z "${CXXFLAGS}"; then
+ CXXFLAGS="-g -Wall"
+fi
+
AC_CHECK_HEADERS(getopt.h,,AC_MSG_WARN(getopt.h missing))
AC_CHECK_FUNCS(getopt_long,
[AC_DEFINE(HAVE_GETOPT_LONG, 1, long getopt support)],
@@ -165,7 +190,6 @@
- CFLAGS ............ : ${CFLAGS}
- CXXFLAGS .......... : ${CXXFLAGS}
- CPPFLAGS .......... : ${CPPFLAGS}
- - FFLAGS ............ : ${FFLAGS}
- LDFLAGS ........... : ${LDFLAGS}
- LIBS .............. : ${LIBS}
Modified: trunk/wsdlpull/wsdlpull.spec
===================================================================
--- trunk/wsdlpull/wsdlpull.spec 2010-07-13 22:51:07 UTC (rev 195)
+++ trunk/wsdlpull/wsdlpull.spec 2010-07-13 22:51:54 UTC (rev 196)
@@ -6,23 +6,24 @@
#
%global mydocs __tmp_docdir
#
-Summary: C++ Web Services client library
Name: wsdlpull
Version: 1.23
-Release: 2%{?dist}
+Release: 3%{?dist}
+
+Summary: C++ Web Services client library
+
+Group: System Environment/Libraries
License: LGPLv2 and OReilly and MIT
-Group: System Environment/Libraries
URL: http://%{name}.sourceforge.net
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+%{?el5:BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)}
# That patch will be submitted upstream
Patch0: wsdlpull-%{version}-fix-gcc43-compatibility.patch
# That patch will be submitted upstream
Patch1: wsdlpull-%{version}-add-man-pages.patch
# That patch will be submitted upstream
Patch2: wsdlpull-%{version}-fix-gnu-autotools-compatibility.patch
-# Some documentation files are still DOS-formatted
-BuildRequires: dos2unix
%description
%{name} is a C++ web services client library. It includes a WSDL
@@ -69,10 +70,10 @@
%patch1 -p1
# Remove any CVS sub-directory (they should not be delivered with the tar-ball)
-find . -name 'CVS' -print | xargs %{__rm} -rf
+find . -name 'CVS' -print | xargs -r %{__rm} -rf
# Remove any a.out binary (they should not be delivered with the tar-ball)
-find . -name 'a.out' -print | xargs %{__rm} -f
+find . -name 'a.out' -print | xargs -r %{__rm} -f
# Remove the generated HTML documentation (it should not be delivered
# with the tar-ball, as it is generated)
@@ -88,7 +89,7 @@
# Rename the standard documentation files
%{__mv} AUTHORS.txt AUTHORS
-dos2unix AUTHORS
+sed -i -e 's/\r$//' AUTHORS
%{__mv} CHANGES.txt CHANGES
%{__mv} COPYING.txt COPYING
%{__mv} README.txt README
@@ -98,7 +99,7 @@
%build
%configure --disable-static
-make CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags}
+make %{?_smp_mflags}
%install
%{__rm} -rf $RPM_BUILD_ROOT
@@ -130,7 +131,6 @@
%files devel
%defattr(-,root,root,-)
-%doc AUTHORS CHANGES COPYING README
%{_includedir}/schemaparser
%{_includedir}/wsdlparser
%{_includedir}/xmlpull
@@ -143,6 +143,10 @@
%changelog
+* Tue Jul 14 2010 Denis Arnaud <den...@m4...> 1.23-3
+- Integrated Patrick Monnerat's remarks
+ (https://bugzilla.redhat.com/show_bug.cgi?id=502686#c13)
+
* Tue Jul 11 2010 Denis Arnaud <den...@m4...> 1.23-2
- Integrated Patrick Monnerat's remarks
(https://bugzilla.redhat.com/show_bug.cgi?id=502686#c6)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
