From fe097e695a3f889302f35ec3ab96a59cf02a2dc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Tue, 10 Jul 2012 11:33:08 +0000 Subject: [PATCH] cleanedup spec; refs #2 --- mrw-c++.spec.in | 163 +++--------------------------------------------- 1 file changed, 9 insertions(+), 154 deletions(-) diff --git a/mrw-c++.spec.in b/mrw-c++.spec.in index 0912202..4f26594 100644 --- a/mrw-c++.spec.in +++ b/mrw-c++.spec.in @@ -42,13 +42,7 @@ This package contains only the shared libraries required at runtime. CXXFLAGS="-O3" ./configure --prefix=/usr \ --datadir=/usr/share/doc/packages \ --enable-doxygen \ - --libdir=/usr/lib -# -#%ifarch x86_64 -# --libdir=/usr/lib64 -#%else -# --libdir=/usr/lib -#%endif + --libdir=/usr/%_lib %build make @@ -61,109 +55,18 @@ 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@ -/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/lib/libmrwautofunctiontracelog4cxx.so -#/usr/lib/libmrwautofunctiontracelog4cxx.so.@MAJOR@ -#/usr/lib/libmrwautofunctiontracelog4cxx.so.@MAJOR@.@MINOR@.@LEAST@ -/usr/lib/libmrwautofunctiontracestdlog.so -/usr/lib/libmrwautofunctiontracestdlog.so.@MAJOR@ -/usr/lib/libmrwautofunctiontracestdlog.so.@MAJOR@.@MINOR@.@LEAST@ -#/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/%_lib/*.so.* +%doc /usr/share/doc/packages/@PACKAGENAME@/AUTHORS -/usr/share/doc/packages/@PACKAGENAME@/NEWS +/usr/share/doc/packages/@PACKAGENAME@/COPYING /usr/share/doc/packages/@PACKAGENAME@/ChangeLog - -%package mt -Summary: MRW's C++ Class Library (thread safe extensions) -Group: Development/Libraries/C++ -Requires: @PACKAGENAME@ = @MAJOR@.@MINOR@.@LEAST@ -Requires: boost - -%description mt -@README@ - -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@ -/usr/lib/libmrwexcstderr-mt.so -/usr/lib/libmrwexcstderr-mt.so.@MAJOR@ -/usr/lib/libmrwexcstderr-mt.so.@MAJOR@.@MINOR@.@LEAST@ -#/usr/lib/libmrwexclog4cxx-mt.so -#/usr/lib/libmrwexclog4cxx-mt.so.@MAJOR@ -#/usr/lib/libmrwexclog4cxx-mt.so.@MAJOR@.@MINOR@.@LEAST@ -#/usr/lib/libmrwautofunctiontracelog4cxx-mt.so -#/usr/lib/libmrwautofunctiontracelog4cxx-mt.so.@MAJOR@ -#/usr/lib/libmrwautofunctiontracelog4cxx-mt.so.@MAJOR@.@MINOR@.@LEAST@ -/usr/lib/libmrwautofunctiontracestdlog-mt.so -/usr/lib/libmrwautofunctiontracestdlog-mt.so.@MAJOR@ -/usr/lib/libmrwautofunctiontracestdlog-mt.so.@MAJOR@.@MINOR@.@LEAST@ -#/usr/lib/libmrwlog4cxxconfiguration-mt.so -#/usr/lib/libmrwlog4cxxconfiguration-mt.so.@MAJOR@ -#/usr/lib/libmrwlog4cxxconfiguration-mt.so.@MAJOR@.@MINOR@.@LEAST@ -#%endif +/usr/share/doc/packages/@PACKAGENAME@/NEWS +/usr/share/doc/packages/@PACKAGENAME@/README %package devel Summary: MRW's C++ Class Library (development files) Group: Development/Libraries/C++ Requires: @PACKAGENAME@ = @MAJOR@.@MINOR@.@LEAST@ -Requires: @PACKAGENAME@-mt = @MAJOR@.@MINOR@.@LEAST@ Requires: gcc-c++ >= 3.0 %description devel @@ -173,57 +76,9 @@ 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 -/usr/lib/libmrwexcstderr.la -#/usr/lib/libmrwexclog4cxx.a -#/usr/lib/libmrwexclog4cxx.la -/usr/lib/libmrw-mt.a -/usr/lib/libmrw-mt.la -#/usr/lib/libmrwautofunctiontracelog4cxx-mt.a -#/usr/lib/libmrwautofunctiontracelog4cxx-mt.la -#/usr/lib/libmrwautofunctiontracelog4cxx.a -#/usr/lib/libmrwautofunctiontracelog4cxx.la -/usr/lib/libmrwautofunctiontracestdlog-mt.a -/usr/lib/libmrwautofunctiontracestdlog-mt.la -/usr/lib/libmrwautofunctiontracestdlog.a -/usr/lib/libmrwautofunctiontracestdlog.la -#/usr/lib/libmrwlog4cxxconfiguration.a -#/usr/lib/libmrwlog4cxxconfiguration.la -#/usr/lib/libmrwexclog4cxx-mt.a -#/usr/lib/libmrwexclog4cxx-mt.la -/usr/lib/libmrwexcstderr-mt.a -/usr/lib/libmrwexcstderr-mt.la -#/usr/lib/libmrwlog4cxxconfiguration-mt.a -#/usr/lib/libmrwlog4cxxconfiguration-mt.la -#%endif +/usr/%_lib/*.so +/usr/%_lib/*.a +/usr/lib/*.la /usr/include /usr/share/doc/packages/@PACKAGENAME@/examples /usr/share/doc/packages/@PACKAGENAME@/doc