Added RPM with minimal dependencies.

2006-09-25 15:12:47 +00:00
parent 9454114278
commit 7338ddc5cf
7 changed files with 102 additions and 8 deletions
--- a/4
+++ b/4
@@ -1,3 +1,7 @@
+* Sat Feb 04 2006 Marc Waeckerlin - mrw-c++-2.3.1 (mrw)
+	- new rpm package mrw-c++-minimal without debug facilities
+	  no dependencies to boost, log4cxx and ltdl libraries
+	  can be used for videorekorder as replacement to full mrw-c++
 * Thu Nov 29 2005 Marc Waeckerlin - mrw-c++-2.3.0 (mrw)
 	- small improvements and corrections in StackTrace
 	- changes for new Doxygen and gcc 4.0.2
--- a/6
+++ b/6
@@ -1,3 +1,9 @@
+2006-02-04
+
+New RPM mrw-c++-minimal with minimal dependencies on other libraries
+(boost, ltdl, log4cxx), but without debugging support, means not stack
+trace, no logging.
+
 2005-04-18

 New feature: Execution of commands is can now be done "in the
--- a/configure.in
+++ b/configure.in
@@ -16,7 +16,7 @@ AC_INIT([mrw/mrw.hpp.in])
 PACKAGENAME=mrw-c++
 m4_define(x_major, 2)
 m4_define(x_minor, 3)
-m4_define(x_least, 0)
+m4_define(x_least, 1)
 AM_INIT_AUTOMAKE(@PACKAGENAME@, @MAJOR@.@MINOR@.@LEAST@, [marc@waeckerlin.org])

 # copy M4 to shell
@@ -171,7 +171,7 @@ AC_SUBST(AM_CPPFLAGS)
 AC_SUBST(LIBS)

 # create output
-AC_CONFIG_FILES([makefile mrw-c++.spec
+AC_CONFIG_FILES([makefile mrw-c++.spec mrw-c++-minimal.spec
                 mrw/makefile mrw/doxyfile mrw/mrw.hpp mrw/version.cpp])
 AC_OUTPUT

--- a/makefile.am
+++ b/makefile.am
@@ -35,7 +35,8 @@ infosdir = ${pkgdatadir}
 infos_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog \
             @PACKAGENAME@.spec

-RPMS = /usr/src/packages/RPMS/i586/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm \
+RPMS = /usr/src/packages/RPMS/i586/@PACKAGENAME@-minimal-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm \
+     /usr/src/packages/RPMS/i586/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm \
     /usr/src/packages/RPMS/i586/@PACKAGENAME@-mt-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm \
     /usr/src/packages/RPMS/i586/@PACKAGENAME@-devel-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm \
     /usr/src/packages/SRPMS/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.src.rpm
@@ -51,6 +52,7 @@ tag: distcheck
 rpm: dist
 	cp @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.tar.gz /usr/src/packages/SOURCES/
 	rpmbuild -ba --clean @PACKAGENAME@.spec
+	rpmbuild -ba --clean @PACKAGENAME@-minimal.spec

 webserver: rpm
 	ssh root@waeckerlin.org bash -c \
--- a/mrw-c++-minimal.spec.in
+++ b/mrw-c++-minimal.spec.in
@@ -0,0 +1,71 @@
+## @file
+##
+## $Id$
+##
+## $Date$
+## $Author$
+##
+## @copy &copy; Marc W&auml;ckerlin
+## @license LGPL, see file <a href="license.html">COPYING</a>
+##
+
+# rpmbuild -bb --clean @PACKAGENAME@.spec
+Summary: MRW's C++ Class Library, facilities for modern C++ programming
+Name: @PACKAGENAME@-minimal
+Version: @MAJOR@.@MINOR@.@LEAST@
+Release: 1
+License: LGPL
+Group: Development/Libraries/C++
+URL: http://marc.waeckerlin.org/mrw-c++/index.html
+Source0: @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Prefix: /usr
+
+Summary: MRW's C++ Class Library (minimal release, no debugging features)
+Group: Development/Libraries/C++
+Provides: @PACKAGENAME@
+
+%description
+@README@
+
+This package contains only the shared libraries required at runtime,
+linked with minimal feature, no logging, no stacktrace, no development
+support at all. This package can be used e.g. for the videorekorder at
+http://marc.waeckerlin.org/videorekorder/index.html
+
+%prep
+%setup -q
+CXXFLAGS="-O3" ./configure --prefix=$RPM_BUILD_ROOT/usr --datadir=$RPM_BUILD_ROOT/usr/share/doc/packages --disable-threads --disable-autofntrace --disable-log4cxx --disable-ltdl --disable-stacktrace
+
+%build
+make
+
+%install
+make install
+find "$RPM_BUILD_ROOT" -name '*.la' | xargs perl -pi -e 's#'"${RPM_BUILD_ROOT//+/\\+}"'##g'
+rm -r $RPM_BUILD_ROOT/usr/include/mrw
+rmdir $RPM_BUILD_ROOT/usr/include
+rm $RPM_BUILD_ROOT/usr/lib/libmrw-mt*
+rm $RPM_BUILD_ROOT/usr/lib/libmrw.la
+rm $RPM_BUILD_ROOT/usr/lib/libmrw.a
+rm $RPM_BUILD_ROOT/usr/share/doc/packages/@PACKAGENAME@/INSTALL
+rm -r $RPM_BUILD_ROOT/usr/share/doc/packages/@PACKAGENAME@/doc
+rm $RPM_BUILD_ROOT/usr/share/doc/packages/@PACKAGENAME@/mrw-c++.spec
+rm -r $RPM_BUILD_ROOT/usr/share/doc/packages/@PACKAGENAME@/examples
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+/usr/lib/libmrw.so
+/usr/lib/libmrw.so.@MAJOR@
+/usr/lib/libmrw.so.@MAJOR@.@MINOR@.@LEAST@
+/usr/share/doc/packages/@PACKAGENAME@/COPYING
+/usr/share/doc/packages/@PACKAGENAME@/README
+/usr/share/doc/packages/@PACKAGENAME@/AUTHORS
+/usr/share/doc/packages/@PACKAGENAME@/NEWS
+/usr/share/doc/packages/@PACKAGENAME@/ChangeLog
+
+%changelog
+@CHANGE_LOG@
--- a/mrw/makefile.am
+++ b/mrw/makefile.am
@@ -95,7 +95,8 @@ if HAVE_THREADS
 if HAVE_BOOST_THREAD
  libmrw_mt_la_SOURCES = ${libmrw_la_SOURCES}
  libmrw_mt_la_CXXFLAGS = @THREADS@
-  libmrw_mt_la_LDFLAGS = ${libmrw_la_LDFLAGS} @THREADS@
+  libmrw_mt_la_LDFLAGS = ${libmrw_la_LDFLAGS} -version-info @LIB_VERSION@ \
+                         @THREADS@
  libmrw_mt_la_LIBADD  = ${libmrw_la_LIBADD} @BOOST_THREAD_LIB@
 endif
 endif
--- a/mrw/mrw.hpp.in
+++ b/mrw/mrw.hpp.in
@@ -65,14 +65,24 @@
           - runs better on: either Linux or Solaris
     - Binary
        - Binary RPM Packages (built on i586/SuSE):
+           - http://marc.waeckerlin.org/@PACKAGENAME@/@PACKAGENAME@-minimal-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm
+              - Minimal runtime package without debugging support.
+                Does not depend on boost and log4cxx and ltdl.
+                To be used
+                e.g. with http://marc.waeckerlin.org/videorekorder
+              - Installation:<br />
+                <code>rpm -Uvh @PACKAGENAME@-minimal-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm</code>
           - http://marc.waeckerlin.org/@PACKAGENAME@/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm
-              - Installation:<br>
+              - Full runtime library, no multithreading.
+              - Installation:<br />
                <code>rpm -Uvh @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm</code>
           - http://marc.waeckerlin.org/@PACKAGENAME@/@PACKAGENAME@-mt-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm
-              - Installation:<br>
+              - Full runtime library, with multithreading support.
+              - Installation:<br />
                <code>rpm -Uvh @PACKAGENAME@-mt-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm</code>
           - http://marc.waeckerlin.org/@PACKAGENAME@/@PACKAGENAME@-devel-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm
-              - Installation:<br>
+              - The package for developers.
+              - Installation:<br />
                <code>rpm -Uvh @PACKAGENAME@-devel-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm</code>
     - Source
        - Requirements to build from source:
@@ -92,7 +102,7 @@
                  -# <code>./configure && make all install</code>
        - Source RPM Packages:
           - http://marc.waeckerlin.org/@PACKAGENAME@/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.src.rpm
-              - Installation:<br>
+              - Installation:<br />
                <code>sudo rpmbuild --rebuild @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.src.rpm</code>

    Download this documentation in PDF: