diff --git a/ChangeLog b/ChangeLog index 387f7d8..bc8ccb2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +* Sun Aug 5 2007 Marc Waeckerlin - mrw-c++-3.2.3 (mrw) + - Spec-file changed for SuSEBuild.org * Sun Aug 5 2007 Marc Waeckerlin - mrw-c++-3.2.2 (mrw) - Added Valgrind files - No redundant checking in makefile for "make release" diff --git a/configure.in b/configure.in index 2121f63..e4800b3 100644 --- a/configure.in +++ b/configure.in @@ -17,7 +17,7 @@ AC_CANONICAL_SYSTEM PACKAGENAME=mrw-c++ m4_define(x_major, 3) m4_define(x_minor, 2) -m4_define(x_least, 2) +m4_define(x_least, 3) # copy M4 to shell MAJOR=x_major diff --git a/mrw-c++.spec.in b/mrw-c++.spec.in index 0c2124d..acf39e9 100644 --- a/mrw-c++.spec.in +++ b/mrw-c++.spec.in @@ -5,11 +5,12 @@ ## $Date$ ## $Author$ ## -## @copy © Marc Wäckerlin +## @copy © Marc Wäckerlin ## @license LGPL, see file COPYING ## # rpmbuild -bb --clean @PACKAGENAME@.spec +BuildRequires: gcc-c++ doxygen graphviz cppunit-devel boost-devel log4cxx-devel freefont te_latex Summary: MRW's C++ Class Library, facilities for modern C++ programming Name: @PACKAGENAME@ Version: @MAJOR@.@MINOR@.@LEAST@ @@ -17,7 +18,7 @@ Release: 1 License: LGPL Group: Development/Libraries/C++ URL: http://marc.waeckerlin.org/mrw-c++/index.html -Source0: @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.tar.gz +Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Prefix: /usr @@ -31,7 +32,13 @@ This package contains only the shared libraries required at runtime. %prep %setup -q -CXXFLAGS="-O3" ./configure --prefix=$RPM_BUILD_ROOT/usr --datadir=$RPM_BUILD_ROOT/usr/share/doc/packages +CXXFLAGS="-O3" ./configure --prefix=$RPM_BUILD_ROOT/usr \ + --datadir=$RPM_BUILD_ROOT/usr/share/doc/packages \ +%ifarch x86_64 + --libdir=/usr/lib64 +%else + --libdir=/usr/lib +%endif %build make @@ -45,6 +52,26 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) +%ifarch x86_64 +/usr/lib64/libmrw.so +/usr/lib64/libmrw.so.@MAJOR@ +/usr/lib64/libmrw.so.@MAJOR@.@MINOR@.@LEAST@ +/usr/lib64/libmrwexcstderr.so +/usr/lib64/libmrwexcstderr.so.@MAJOR@ +/usr/lib64/libmrwexcstderr.so.@MAJOR@.@MINOR@.@LEAST@ +/usr/lib64/libmrwexclog4cxx.so +/usr/lib64/libmrwexclog4cxx.so.@MAJOR@ +/usr/lib64/libmrwexclog4cxx.so.@MAJOR@.@MINOR@.@LEAST@ +/usr/lib64/libmrwautofunctiontracelog4cxx.so +/usr/lib64/libmrwautofunctiontracelog4cxx.so.@MAJOR@ +/usr/lib64/libmrwautofunctiontracelog4cxx.so.@MAJOR@.@MINOR@.@LEAST@ +/usr/lib64/libmrwautofunctiontracestdlog.so +/usr/lib64/libmrwautofunctiontracestdlog.so.@MAJOR@ +/usr/lib64/libmrwautofunctiontracestdlog.so.@MAJOR@.@MINOR@.@LEAST@ +/usr/lib64/libmrwlog4cxxconfiguration.so +/usr/lib64/libmrwlog4cxxconfiguration.so.@MAJOR@ +/usr/lib64/libmrwlog4cxxconfiguration.so.@MAJOR@.@MINOR@.@LEAST@ +%else /usr/lib/libmrw.so /usr/lib/libmrw.so.@MAJOR@ /usr/lib/libmrw.so.@MAJOR@.@MINOR@.@LEAST@ @@ -63,6 +90,7 @@ rm -rf $RPM_BUILD_ROOT /usr/lib/libmrwlog4cxxconfiguration.so /usr/lib/libmrwlog4cxxconfiguration.so.@MAJOR@ /usr/lib/libmrwlog4cxxconfiguration.so.@MAJOR@.@MINOR@.@LEAST@ +%endif /usr/share/doc/packages/@PACKAGENAME@/COPYING /usr/share/doc/packages/@PACKAGENAME@/README /usr/share/doc/packages/@PACKAGENAME@/AUTHORS @@ -82,6 +110,26 @@ This Package contains thread safe libraries. %files mt %defattr(-,root,root,-) +%ifarch x86_64 +/usr/lib64/libmrw-mt.so +/usr/lib64/libmrw-mt.so.@MAJOR@ +/usr/lib64/libmrw-mt.so.@MAJOR@.@MINOR@.@LEAST@ +/usr/lib64/libmrwexcstderr-mt.so +/usr/lib64/libmrwexcstderr-mt.so.@MAJOR@ +/usr/lib64/libmrwexcstderr-mt.so.@MAJOR@.@MINOR@.@LEAST@ +/usr/lib64/libmrwexclog4cxx-mt.so +/usr/lib64/libmrwexclog4cxx-mt.so.@MAJOR@ +/usr/lib64/libmrwexclog4cxx-mt.so.@MAJOR@.@MINOR@.@LEAST@ +/usr/lib64/libmrwautofunctiontracelog4cxx-mt.so +/usr/lib64/libmrwautofunctiontracelog4cxx-mt.so.@MAJOR@ +/usr/lib64/libmrwautofunctiontracelog4cxx-mt.so.@MAJOR@.@MINOR@.@LEAST@ +/usr/lib64/libmrwautofunctiontracestdlog-mt.so +/usr/lib64/libmrwautofunctiontracestdlog-mt.so.@MAJOR@ +/usr/lib64/libmrwautofunctiontracestdlog-mt.so.@MAJOR@.@MINOR@.@LEAST@ +/usr/lib64/libmrwlog4cxxconfiguration-mt.so +/usr/lib64/libmrwlog4cxxconfiguration-mt.so.@MAJOR@ +/usr/lib64/libmrwlog4cxxconfiguration-mt.so.@MAJOR@.@MINOR@.@LEAST@ +%else /usr/lib/libmrw-mt.so /usr/lib/libmrw-mt.so.@MAJOR@ /usr/lib/libmrw-mt.so.@MAJOR@.@MINOR@.@LEAST@ @@ -100,6 +148,7 @@ This Package contains thread safe libraries. /usr/lib/libmrwlog4cxxconfiguration-mt.so /usr/lib/libmrwlog4cxxconfiguration-mt.so.@MAJOR@ /usr/lib/libmrwlog4cxxconfiguration-mt.so.@MAJOR@.@MINOR@.@LEAST@ +%endif %package devel Summary: MRW's C++ Class Library (development files) @@ -115,6 +164,32 @@ This Package contains all files required for developement. %files devel %defattr(-,root,root,-) +%ifarch x86_64 +/usr/lib64/libmrw.a +/usr/lib64/libmrw.la +/usr/lib64/libmrwexcstderr.a +/usr/lib64/libmrwexcstderr.la +/usr/lib64/libmrwexclog4cxx.a +/usr/lib64/libmrwexclog4cxx.la +/usr/lib64/libmrw-mt.a +/usr/lib64/libmrw-mt.la +/usr/lib64/libmrwautofunctiontracelog4cxx-mt.a +/usr/lib64/libmrwautofunctiontracelog4cxx-mt.la +/usr/lib64/libmrwautofunctiontracelog4cxx.a +/usr/lib64/libmrwautofunctiontracelog4cxx.la +/usr/lib64/libmrwautofunctiontracestdlog-mt.a +/usr/lib64/libmrwautofunctiontracestdlog-mt.la +/usr/lib64/libmrwautofunctiontracestdlog.a +/usr/lib64/libmrwautofunctiontracestdlog.la +/usr/lib64/libmrwlog4cxxconfiguration.a +/usr/lib64/libmrwlog4cxxconfiguration.la +/usr/lib64/libmrwexclog4cxx-mt.a +/usr/lib64/libmrwexclog4cxx-mt.la +/usr/lib64/libmrwexcstderr-mt.a +/usr/lib64/libmrwexcstderr-mt.la +/usr/lib64/libmrwlog4cxxconfiguration-mt.a +/usr/lib64/libmrwlog4cxxconfiguration-mt.la +%else /usr/lib/libmrw.a /usr/lib/libmrw.la /usr/lib/libmrwexcstderr.a @@ -139,6 +214,7 @@ This Package contains all files required for developement. /usr/lib/libmrwexcstderr-mt.la /usr/lib/libmrwlog4cxxconfiguration-mt.a /usr/lib/libmrwlog4cxxconfiguration-mt.la +%endif /usr/include /usr/share/doc/packages/@PACKAGENAME@/examples /usr/share/doc/packages/@PACKAGENAME@/doc