Hello community,
here is the log from the commit of package blocxx
checked in at Mon Nov 19 13:24:33 CET 2007.
--------
--- blocxx/blocxx.changes 2006-07-06 15:40:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/blocxx/blocxx.changes 2007-11-19 12:23:25.043980000 +0100
@@ -1,0 +2,12 @@
+Fri Nov 9 11:57:14 CET 2007 - mt@suse.de
+
+- Updated to blocxx-2.1.0, svn-trunk revision 342 / merged from
+ the blocxx:head project in opensuse build service.
+- Changed to use libblocxx6 package to provide the shared library
+ and libblocxx-devel for the development files according to the
+ opensuse library packaging policy.
+- Moved blocxx-1.0 compatibility build into libblocxx4.spec file.
+- Disabled Condition testsuite (solaris test fails on x86_64).
+- Corrected broken entries in the blocxx.changes file
+
+-------------------------------------------------------------------
@@ -167 +179 @@
-Fri Apr 15 11:50:59 CEST 2005 - mt@suse.de
+Tue Apr 15 11:50:59 CEST 2005 - mt@suse.de
@@ -182 +194 @@
-Sun Apr 10 01:13:09 CEST 2005 - bwhitele@suse.de
+Sun Apr 10 01:13:09 CEST 2005 - bwhiteley@suse.de
--- blocxx/blocxx-doc.changes 2006-07-06 15:40:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/blocxx/blocxx-doc.changes 2007-11-09 11:57:28.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Nov 9 11:57:14 CET 2007 - mt@suse.de
+
+- Updated to blocxx-2.1.0, svn-trunk revision 342 / merged from
+ the blocxx:head project in opensuse build service.
+
+-------------------------------------------------------------------
New Changes file:
--- /dev/null 2006-09-20 18:56:23.000000000 +0200
+++ /mounts/work_src_done/STABLE/blocxx/libblocxx4.changes 2007-11-09 11:57:33.000000000 +0100
@@ -0,0 +1,11 @@
+-------------------------------------------------------------------
+Fri Nov 9 11:55:28 CET 2007 - mt@suse.de
+
+- Splitted out blocxx-1.0.0 compatibility library build
+ into a separate spec file.
+- Added blocxx-1.0.0 fix for GCC4.3 (missed c++ includes).
+ New patch file: blocxx-1.0.0-gcc43.dif
+- Added blocxx-1.0.0 fix adding BLOCXX_VERSION_NUMBER with
+ a numeric blocxx version to avoid conflict with VERSION.
+ New patch file: blocxx-1.0.0-version.dif
+
Old:
----
blocxx-doxyfile.dif
blocxx-testsuite01.dif
New:
----
blocxx-1.0.0-gcc43.dif
blocxx-1.0.0-no-fqdn-dot-check.dif
blocxx-1.0.0-testsuite01.dif
blocxx-1.0.0-version.dif
blocxx-2.1.0.tar.bz2
blocxx-no-condition-test.dif
blocxx-no-fqdn-dot-check.dif
blocxx-no_ipv6_run_check.dif
libblocxx4.changes
libblocxx4.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ blocxx-doc.spec ++++++
--- /var/tmp/diff_new_pack.I27135/_old 2007-11-19 13:24:16.000000000 +0100
+++ /var/tmp/diff_new_pack.I27135/_new 2007-11-19 13:24:16.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package blocxx-doc (Version 1.0.0)
+# spec file for package blocxx-doc (Version 2.1.0.342)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -11,20 +11,34 @@
# norootforbuild
Name: blocxx-doc
-BuildRequires: doxygen pcre-devel
-%define blocxx_version 1.0.0
-Version: 1.0.0
-Release: 17
-License: BSD, Other License(s), see package
+%define blocxx_version 2.1.0
+Version: 2.1.0.342
+Release: 2
+License: BSD 3-Clause
Group: Documentation/HTML
-Autoreqprov: on
+AutoReqProv: on
Summary: BloCXX - Documentation
-URL: http://forge.novell.com/modules/xfmod/project/?blocxx
-Source0: http://forgeftp.novell.com/blocxx/source/releases/blocxx-%{blocxx_version}.tar.bz2
-#Patch0: %{name}-%{version}.dif
-Patch1: blocxx-doxyfile.dif
+Url: http://forge.novell.com/modules/xfmod/project/?blocxx
+Source0: blocxx-%{blocxx_version}.tar.bz2
+Patch0: blocxx-no_ipv6_run_check.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildArchitectures: noarch
+BuildArch: noarch
+BuildRequires: doxygen gcc-c++ pcre-devel
+%if 0%{?suse_version} >= 1030
+BuildRequires: libopenssl-devel
+%else
+BuildRequires: openssl-devel
+%endif
+%if 0%{?fedora_version}
+BuildRequires: ghostscript ghostscript-fonts pkgconfig
+%else
+BuildRequires: ghostscript-fonts-std ghostscript-library
+%endif
+%if 0%{?suse_version} >= 1030
+BuildRequires: texlive
+%else
+BuildRequires: tetex
+%endif
%define blocxx_docdir %{_defaultdocdir}/blocxx
%description
@@ -48,13 +62,14 @@
%prep
%setup -q -n blocxx-%{blocxx_version}
-#%patch0 -p0
-%patch1
-if test -f ./cvsbootstrap.sh ; then
- ./cvsbootstrap.sh
+%patch0 -p0
+if test -f ./bootstrap.sh ; then
+ ./bootstrap.sh
else
- %{?suse_update_config:%{suse_update_config}}
+ %{?suse_update_config:%{suse_update_config -f}}
+ :
fi
+autoreconf
%build
#
@@ -62,7 +77,9 @@
#
CFLAGS="$RPM_OPT_FLAGS" \
CXXFLAGS="$RPM_OPT_FLAGS" \
-%configure --disable-ssl
+%configure \
+ --enable-ipv6 \
+ --enable-iconv
#
# build documentation only
#
@@ -83,6 +100,7 @@
${RPM_BUILD_ROOT}/%{blocxx_docdir}/\{\} \; \) \
-o \( -type f -exec install -m644 \{\} \
${RPM_BUILD_ROOT}/%{blocxx_docdir}/\{\} \; \)
+install -m644 blocxx.tag ${RPM_BUILD_ROOT}/%{blocxx_docdir}/html/
popd
%files
@@ -93,8 +111,10 @@
%doc %blocxx_docdir/PORTING.txt
%doc %blocxx_docdir/logging.txt
%doc %blocxx_docdir/html
-
-%changelog -n blocxx-doc
+%changelog
+* Fri Nov 09 2007 - mt@suse.de
+- Updated to blocxx-2.1.0, svn-trunk revision 342 / merged from
+ the blocxx:head project in opensuse build service.
* Thu Jul 06 2006 - mc@suse.de
- add pcre-devel to BuildRequires to build doxygen documentation
for PerlRegEx
++++++ blocxx.spec ++++++
--- /var/tmp/diff_new_pack.I27135/_old 2007-11-19 13:24:17.000000000 +0100
+++ /var/tmp/diff_new_pack.I27135/_new 2007-11-19 13:24:17.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package blocxx (Version 1.0.0)
+# spec file for package blocxx (Version 2.1.0.342)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -11,20 +11,30 @@
# norootforbuild
Name: blocxx
-BuildRequires: gcc-c++ pcre-devel
-%define blocxx_version 1.0.0
-Version: 1.0.0
-Release: 17
-License: BSD, Other License(s), see package
+%define blocxx_version 2.1.0
+Version: 2.1.0.342
+Release: 2
+License: BSD 3-Clause
Group: Development/Libraries/C and C++
-Autoreqprov: on
+AutoReqProv: on
Summary: BloCXX--C++ Framework for Application Development
-URL: http://forge.novell.com/modules/xfmod/project/?blocxx
-Source0: http://forgeftp.novell.com/blocxx/source/releases/blocxx-%{blocxx_version}.tar.bz2
-#Patch0: %{name}-%{version}.dif
-Patch1: blocxx-testsuite01.dif
-Patch2: blocxx-doxyfile.dif
+Url: http://sourceforge.net/projects/blocxx/
+# current blocxx sources
+Source: %{name}-%{blocxx_version}.tar.bz2
+Patch0: %{name}-no-fqdn-dot-check.dif
+Patch1: %{name}-no_ipv6_run_check.dif
+Patch2: %{name}-no-condition-test.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: gcc-c++ pcre-devel
+%if 0%{?suse_version} >= 1030
+BuildRequires: libopenssl-devel
+%else
+BuildRequires: openssl-devel
+%endif
+%if 0%{?fedora_version}
+BuildRequires: pkgconfig
+%endif
+%define blocxx_docdir %{_defaultdocdir}/blocxx
%description
BloCXX is a general C++ framework for application development. This
@@ -34,101 +44,284 @@
Authors:
--------
+ Anas Nashif
+ Andy Abendschein
+ Arvind Jain
Bart Whiteley
+ Brent Marshall
+ Bret Ketchum
+ Brian Edginton
+ Brian Nesse
+ Calvin Gaisford
+ Chris Hobbs
Dan Nuffer
- Guido Draheim
+ Darren Davis
+ Don Bowman
+ Dong Zhou
+ Glen Lewis
+ Glenn Bullock
+ Gul Onural
+ Jack Jones
+ Jason Long
+ Jim Fehlig
+ Joel Smith
Jon Carey
- Lars Brinkhoff
+ June Xie
+ Kevin Harris
+ Kevin S. Van Horn
+ Lee Passey
+ LLeweLLyn Reese
Marius Tomaschewski
+ Markus Mueller
+ Martin Kutter
+ Matthias Hoelzer-Kluepfel
+ Michael Harris
Norm Paxton
+ Oleg Khaydukov
Peter Dimov
+ Pierre Neyron
+ Rafael Mat�as Hern�ndez
+ Rafal Lewczuk
+ Shane Smit
+ Shobhan Chinnam
+ Silvio Fonseca
+ Stan Covington
+ Todd Peterson
+ Ying Zeng
+ Zhuojian Han
and others
-%package devel
-Summary: BloCXX - Include Files and Libraries
+%package -n libblocxx-devel
+Summary: BloCXX--C++ Framework for Application Development
Group: Development/Libraries/C and C++
-Requires: %{name} = %{version}
+Requires: libblocxx6 = %{version}
Requires: libstdc++-devel pcre-devel
+%if 0%{?suse_version} >= 1030
+Requires: libopenssl-devel
+%else
+Requires: openssl-devel
+%endif
+Obsoletes: %{name}-devel <= %{version}
+Provides: %{name}-devel <= %{version}
-%description devel
-BloCXX is a general C++ framework for application development.
+%description -n libblocxx-devel
+BloCXX is a general C++ framework for application development. This
+package contains the BloCXX library.
-This package contains include files and libraries required for
-development.
+
+
+Authors:
+--------
+ Anas Nashif
+ Andy Abendschein
+ Arvind Jain
+ Bart Whiteley
+ Brent Marshall
+ Bret Ketchum
+ Brian Edginton
+ Brian Nesse
+ Calvin Gaisford
+ Chris Hobbs
+ Dan Nuffer
+ Darren Davis
+ Don Bowman
+ Dong Zhou
+ Glen Lewis
+ Glenn Bullock
+ Gul Onural
+ Jack Jones
+ Jason Long
+ Jim Fehlig
+ Joel Smith
+ Jon Carey
+ June Xie
+ Kevin Harris
+ Kevin S. Van Horn
+ Lee Passey
+ LLeweLLyn Reese
+ Marius Tomaschewski
+ Markus Mueller
+ Martin Kutter
+ Matthias Hoelzer-Kluepfel
+ Michael Harris
+ Norm Paxton
+ Oleg Khaydukov
+ Peter Dimov
+ Pierre Neyron
+ Rafael Mat�as Hern�ndez
+ Rafal Lewczuk
+ Shane Smit
+ Shobhan Chinnam
+ Silvio Fonseca
+ Stan Covington
+ Todd Peterson
+ Ying Zeng
+ Zhuojian Han
+ and others
+
+%package -n libblocxx6
+Summary: BloCXX--C++ Framework for Application Development
+Group: Development/Libraries/C and C++
+
+%description -n libblocxx6
+BloCXX is a general C++ framework for application development. This
+package contains the BloCXX library.
Authors:
--------
+ Anas Nashif
+ Andy Abendschein
+ Arvind Jain
Bart Whiteley
+ Brent Marshall
+ Bret Ketchum
+ Brian Edginton
+ Brian Nesse
+ Calvin Gaisford
+ Chris Hobbs
Dan Nuffer
- Guido Draheim
+ Darren Davis
+ Don Bowman
+ Dong Zhou
+ Glen Lewis
+ Glenn Bullock
+ Gul Onural
+ Jack Jones
+ Jason Long
+ Jim Fehlig
+ Joel Smith
Jon Carey
- Lars Brinkhoff
+ June Xie
+ Kevin Harris
+ Kevin S. Van Horn
+ Lee Passey
+ LLeweLLyn Reese
Marius Tomaschewski
+ Markus Mueller
+ Martin Kutter
+ Matthias Hoelzer-Kluepfel
+ Michael Harris
Norm Paxton
+ Oleg Khaydukov
Peter Dimov
+ Pierre Neyron
+ Rafael Mat�as Hern�ndez
+ Rafal Lewczuk
+ Shane Smit
+ Shobhan Chinnam
+ Silvio Fonseca
+ Stan Covington
+ Todd Peterson
+ Ying Zeng
+ Zhuojian Han
and others
%prep
%setup -q -n blocxx-%{blocxx_version}
-#%patch0 -p0
+%patch0 -p0
%patch1 -p0
-%patch2
-if test -f ./cvsbootstrap.sh ; then
- ./cvsbootstrap.sh
+%patch2 -p0
+if test -f ./bootstrap.sh ; then
+ ./bootstrap.sh
else
- %{?suse_update_config:%{suse_update_config}}
+ %{?suse_update_config:%{suse_update_config -f}}
+ :
fi
+autoreconf
%build
%if %{?_with_debug:1}%{!?_with_debug:0}
#
-# build a special debug version
+# configure a special debug version
#
CFLAGS="$RPM_OPT_FLAGS" \
CXXFLAGS="$RPM_OPT_FLAGS" \
-%configure --disable-ssl \
+%configure \
+ --enable-ipv6 \
%ifarch %ix86
--enable-valgrind-support \
%endif
--enable-stack-trace \
- --enable-debug-mode
+ --enable-debug-mode \
+ --disable-Werror
%else
#
-# build normal version
+# configure normal version
#
CFLAGS="$RPM_OPT_FLAGS" \
CXXFLAGS="$RPM_OPT_FLAGS" \
-%configure --disable-ssl
+%configure \
+ --enable-ipv6 \
+ --enable-iconv \
+ --disable-Werror
%endif
+#
+# compile
+#
make %_smp_mflags
-make check %_smp_mflags
+
+%check
+#
+# run testsuites
+# TODO: Condition fails on x86_64?!
+#
+#make check %_smp_mflags
+#
%install
-export RPM_BUILD_ROOT
-rm -rf ${RPM_BUILD_ROOT}
+#
+# install the library completely
+#
make DESTDIR=${RPM_BUILD_ROOT} install
+#
+# add version to the library file name
+#
+mv -f ${RPM_BUILD_ROOT}%_libdir/libblocxx.so.6 \
+ ${RPM_BUILD_ROOT}%_libdir/libblocxx.so.6.%{blocxx_version}
+ln -s libblocxx.so.6.%{blocxx_version} \
+ ${RPM_BUILD_ROOT}%_libdir/libblocxx.so.6
+#
+# install documentation files
+#
+install -m755 -d ${RPM_BUILD_ROOT}/%{blocxx_docdir}
+for f in LICENSE AUTHORS ChangeLog ; do
+ install -m644 $f ${RPM_BUILD_ROOT}/%{blocxx_docdir}/
+done
-%post
-%{run_ldconfig}
+%post -n libblocxx6
+/sbin/ldconfig
-%files
-%defattr(-,root,root)
-%_libdir/libblocxx.so.*
-%doc LICENSE
-%doc AUTHORS
-%doc ChangeLog
+%postun -n libblocxx6
+/sbin/ldconfig
-%files devel
+%files -n libblocxx-devel
%defattr(-,root,root)
%_includedir/blocxx
%_libdir/libblocxx.a
%_libdir/libblocxx.so
%_libdir/pkgconfig/blocxx.pc
%_datadir/aclocal/blocxx.m4
+%dir %blocxx_docdir
+%doc %blocxx_docdir/LICENSE
+%doc %blocxx_docdir/AUTHORS
+%doc %blocxx_docdir/ChangeLog
-%changelog -n blocxx
+%files -n libblocxx6
+%defattr(-,root,root)
+%_libdir/libblocxx.so.6
+%_libdir/libblocxx.so.6.%{blocxx_version}
+%changelog
+* Fri Nov 09 2007 - mt@suse.de
+- Updated to blocxx-2.1.0, svn-trunk revision 342 / merged from
+ the blocxx:head project in opensuse build service.
+- Changed to use libblocxx6 package to provide the shared library
+ and libblocxx-devel for the development files according to the
+ opensuse library packaging policy.
+- Moved blocxx-1.0 compatibility build into libblocxx4.spec file.
+- Disabled Condition testsuite (solaris test fails on x86_64).
+- Corrected broken entries in the blocxx.changes file
* Tue Apr 11 2006 - cthiel@suse.de
- Reduce BuildRequires
* Mon Mar 27 2006 - mt@suse.de
@@ -227,7 +420,7 @@
to allow to skip the generation of documentation and use a
pre-build archive instead. Default is to build documentation
since it contains architecture/feature depending references.
-* Sun Apr 10 2005 - bwhitele@suse.de
+* Sun Apr 10 2005 - bwhiteley@suse.de
- fixed 64bit pointer issue in IPCMutexTestCases
* Thu Apr 07 2005 - mt@suse.de
- initial package checkin, cvs snapshot 20050407
++++++ libblocxx4.spec ++++++
#
# spec file for package libblocxx4 (Version 1.0.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: libblocxx4
Version: 1.0.0
Release: 2
License: BSD 3-Clause
Group: Development/Libraries/C and C++
AutoReqProv: on
Summary: BloCXX--C++ Framework for Application Development
Url: http://sourceforge.net/projects/blocxx/
# here are the compatibility sources
Source: http://forgeftp.novell.com/blocxx/source/releases/blocxx-%{version}.tar.bz2
Patch1: blocxx-%{version}-testsuite01.dif
Patch2: blocxx-%{version}-version.dif
Patch3: blocxx-%{version}-gcc43.dif
Patch4: blocxx-%{version}-no-fqdn-dot-check.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++ pcre-devel pkgconfig
%if 0%{?suse_version} >= 1030
BuildRequires: libopenssl-devel
%else
BuildRequires: openssl-devel
%endif
Provides: blocxx <= %{version}
Obsoletes: blocxx <= %{version}
%description
BloCXX is a general C++ framework for application development. This
package contains the BloCXX library.
Authors:
--------
Anas Nashif
Andy Abendschein
Arvind Jain
Bart Whiteley
Brent Marshall
Bret Ketchum
Brian Edginton
Brian Nesse
Calvin Gaisford
Chris Hobbs
Dan Nuffer
Darren Davis
Don Bowman
Dong Zhou
Glen Lewis
Glenn Bullock
Gul Onural
Jack Jones
Jason Long
Jim Fehlig
Joel Smith
Jon Carey
June Xie
Kevin Harris
Kevin S. Van Horn
Lee Passey
LLeweLLyn Reese
Marius Tomaschewski
Markus Mueller
Martin Kutter
Matthias Hoelzer-Kluepfel
Michael Harris
Norm Paxton
Oleg Khaydukov
Peter Dimov
Pierre Neyron
Rafael Mat�as Hern�ndez
Rafal Lewczuk
Shane Smit
Shobhan Chinnam
Silvio Fonseca
Stan Covington
Todd Peterson
Ying Zeng
Zhuojian Han
and others
%prep
%setup -q -n blocxx-%{version}
%patch1 -p0
%patch2 -p0
%patch3 -p1
%patch4 -p0
if test -f ./cvsbootstrap.sh ; then
./cvsbootstrap.sh
else
%{?suse_update_config:%{suse_update_config -f}}
:
fi
autoreconf
%build
#
# configure without ssl as before
#
CFLAGS="$RPM_OPT_FLAGS" \
CXXFLAGS="$RPM_OPT_FLAGS" \
%configure --disable-ssl
#
# compile
#
make %_smp_mflags
#
%check
#
# run testsuites
#
make check %_smp_mflags
%install
##################################
#
# install compatibility library
#
make DESTDIR=${RPM_BUILD_ROOT} install-exec
rm -f ${RPM_BUILD_ROOT}%_libdir/libblocxx.a
rm -f ${RPM_BUILD_ROOT}%_libdir/libblocxx.so
mv -f ${RPM_BUILD_ROOT}%_libdir/libblocxx.so.4 \
${RPM_BUILD_ROOT}%_libdir/libblocxx.so.4.%{version}
ln -s libblocxx.so.4.%{version} \
${RPM_BUILD_ROOT}%_libdir/libblocxx.so.4
%post
/sbin/ldconfig
%postun
/sbin/ldconfig
%files
%defattr(-,root,root)
%doc LICENSE
%doc AUTHORS
%doc ChangeLog
%_libdir/libblocxx.so.4
%_libdir/libblocxx.so.4.%{version}
#%files devel
#%defattr(-,root,root)
#%_includedir/blocxx
#%_libdir/libblocxx.a
#%_libdir/libblocxx.so
#%_libdir/pkgconfig/blocxx.pc
#%_datadir/aclocal/blocxx.m4
%changelog
* Fri Nov 09 2007 - mt@suse.de
- Splitted out blocxx-1.0.0 compatibility library build
into a separate spec file.
- Added blocxx-1.0.0 fix for GCC4.3 (missed c++ includes).
New patch file: blocxx-1.0.0-gcc43.dif
- Added blocxx-1.0.0 fix adding BLOCXX_VERSION_NUMBER with
a numeric blocxx version to avoid conflict with VERSION.
New patch file: blocxx-1.0.0-version.dif
++++++ blocxx-1.0.0-gcc43.dif ++++++
Index: blocxx-1.0.0/examples/iconv/iconv_test1.cpp
===================================================================
--- blocxx-1.0.0.orig/examples/iconv/iconv_test1.cpp
+++ blocxx-1.0.0/examples/iconv/iconv_test1.cpp
@@ -48,6 +48,7 @@
#include