From e2f09193f438d783d3be6b26023bb6ebf9f90789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Thu, 7 Oct 2004 13:41:16 +0000
Subject: [PATCH] devel in the same spec file

---
 configure.in    |  5 ++++-
 makefile.am     |  8 ++++---
 mrw-c++.spec.in | 55 +++++++++++++++++++++++++++++++++++++++----------
 3 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/configure.in b/configure.in
index 4435ec4..a6e789c 100644
--- a/configure.in
+++ b/configure.in
@@ -9,6 +9,9 @@
 ## @license LGPL, see file <a href="license.html">COPYING</a>
 ##
 ## $Log$
+## Revision 1.11  2004/10/07 13:41:16  marc
+## devel in the same spec file
+##
 ## Revision 1.10  2004/10/07 07:02:30  marc
 ## better naming for major minor and least (one is a keyword)
 ## PEDANTIC is now a AM variable
@@ -124,7 +127,7 @@ AC_SUBST(AM_CXXFLAGS)
 AC_SUBST(AM_CPPFLAGS)
 
 # create output
-AC_CONFIG_FILES([makefile mrw-c++.spec mrw-c++-devel.spec
+AC_CONFIG_FILES([makefile mrw-c++.spec
                  mrw/makefile mrw/doxyfile mrw/mrw.hpp mrw/version.cpp])
 AC_OUTPUT
 
diff --git a/makefile.am b/makefile.am
index 7a3123a..1729e40 100644
--- a/makefile.am
+++ b/makefile.am
@@ -9,6 +9,9 @@
 ## @license LGPL, see file <a href="license.html">COPYING</a>
 ##
 ## $Log$
+## Revision 1.9  2004/10/07 13:41:16  marc
+## devel in the same spec file
+##
 ## Revision 1.8  2004/09/09 20:09:06  marc
 ## library versioning now works how i want it
 ##
@@ -39,7 +42,7 @@ nobase_include_HEADERS = mrw/auto.hpp mrw/unistd.hpp \
 		  mrw/exec.hpp mrw/arg.hpp mrw/smartpointer.hpp
 infosdir = ${pkgdatadir}
 infos_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog \
-             @PACKAGENAME@.spec @PACKAGENAME@-devel.spec
+             @PACKAGENAME@.spec
 
 RPMS = /usr/src/packages/RPMS/i586/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm \
      /usr/src/packages/RPMS/i586/@PACKAGENAME@-devel-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm
@@ -53,9 +56,8 @@ tag:
 	cvs tag -FR REL_@PACKAGENAME@-@MAJOR@-@MINOR@-@LEAST@ .
 
 rpm: dist
-	cp @PACKAGENAME@-@MAJOR@.@MINOR@-@LEAST@.tar.gz /usr/src/packages/SOURCES/
+	cp @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.tar.gz /usr/src/packages/SOURCES/
 	rpmbuild -bb --clean @PACKAGENAME@.spec
-	rpmbuild -bb --clean @PACKAGENAME@-devel.spec
 
 webserver: check tag all check dist rpm
 	ssh root@waeckerlin.org bash -c \
diff --git a/mrw-c++.spec.in b/mrw-c++.spec.in
index 058982c..62fce01 100644
--- a/mrw-c++.spec.in
+++ b/mrw-c++.spec.in
@@ -9,6 +9,9 @@
 ## @license LGPL, see file <a href="license.html">COPYING</a>
 ##
 ## $Log$
+## Revision 1.4  2004/10/07 13:41:16  marc
+## devel in the same spec file
+##
 ## Revision 1.3  2004/09/09 20:09:06  marc
 ## library versioning now works how i want it
 ##
@@ -34,13 +37,13 @@ Release: 1
 License: LGPL
 Group: Development/Libraries/C++
 URL: http://marc.waeckerlin.org/mrw-c++/index.html
-Source0: %{name}-%{version}.tar.gz
+Source0: @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 Prefix: /usr
 
-Requires: gcc-c++ >= 3.0
-Requires: binutils
+#Requires: gcc-c++ >= 3.0
+#Requires: binutils
 
 %description
 @README@
@@ -49,26 +52,56 @@ This package contains only the shared libraries required at runtime.
 
 %prep
 %setup -q
-./configure --prefix=$RPM_BUILD_ROOT/usr
+./configure --prefix=$RPM_BUILD_ROOT/usr --datadir=$RPM_BUILD_ROOT/usr/share/doc/packages
 
 %build
 make check
 
 %install
 make install
-rm -rf $RPM_BUILD_ROOT/usr/share/mrw-c++
-rm -rf $RPM_BUILD_ROOT/usr/include/mrw
-rm -rf $RPM_BUILD_ROOT/usr/lib/libmrw*.la
-rm -rf $RPM_BUILD_ROOT/usr/lib/libmrw*.a
-rmdir $RPM_BUILD_ROOT/usr/include
-rmdir $RPM_BUILD_ROOT/usr/share
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-/usr
+/usr/lib/libmrw.so
+/usr/lib/libmrw.so.@MAJOR@
+/usr/lib/libmrw.so.@MAJOR@.@MINOR@.@LEAST@
+/usr/lib/libmrwexcstderr.so
+/usr/lib/libmrwexcstderr.so.@MAJOR@
+/usr/lib/libmrwexcstderr.so.@MAJOR@.@MINOR@.@LEAST@
+/usr/lib/libmrwexclog4cxx.so
+/usr/lib/libmrwexclog4cxx.so.@MAJOR@
+/usr/lib/libmrwexclog4cxx.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
+
+%package devel
+Summary: MRW's C++ Class Library, facilities for ease and quality (development files)
+Group: Development/Libraries/C++
+
+%description devel
+@README@
+
+This Package contains all files required for developement.
+
+%files devel
+%defattr(-,root,root,-)
+/usr/lib/libmrw.a
+/usr/lib/libmrw.la
+/usr/lib/libmrwexcstderr.a
+/usr/lib/libmrwexcstderr.la
+/usr/lib/libmrwexclog4cxx.a
+/usr/lib/libmrwexclog4cxx.la
+/usr/include
+/usr/share/doc/packages/@PACKAGENAME@/examples
+/usr/share/doc/packages/@PACKAGENAME@/doc
+/usr/share/doc/packages/@PACKAGENAME@/@PACKAGENAME@.spec
+/usr/share/doc/packages/@PACKAGENAME@/INSTALL
 
 %changelog
 @CHANGE_LOG@