added -static packages to specfiles

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxBase.spec b/wxBase.spec
index 938201a416f445a555e0f80cd5131eecf20ebf2f..25e9234dd44217bd8a02a568a9fb459e8c173dad 100644 (file)
--- a/wxBase.spec
+++ b/wxBase.spec
@@ -27,14 +27,20 @@ the following platforms: Win32, generic Unix (Linux, FreeBSD, Solaris, HP-UX,
 %package devel
 Summary: wxBase headers needed for developping with wxBase
 Group: Development/Libraries
-Requires: wxBase
+Requires: wxBase = %{ver}
 
 %description devel
 Header files for wxBase. You need them to develop programs using wxBase.
 
+%package static
+Summary: wxBase static libraries
+Group: Development/Libraries
+
+%description static
+Static libraries for wxBase. You need them if you want to link statically against wxBase.
+
 %prep
 %setup -n wxBase-%{ver}
-./configure --prefix=%{pref} --enable-soname --disable-gui --disable-std_iostreams
 
 %build
 if [ "$SMP" != "" ]; then
@@ -42,12 +48,25 @@ if [ "$SMP" != "" ]; then
 else
   export MAKE="make"
 fi
-$MAKE
+
 (cd locale; make allmo)
 
+mkdir obj-shared
+cd obj-shared
+../configure --prefix=%{pref} --enable-soname --disable-gui --disable-std_iostreams
+$MAKE
+cd ..
+
+mkdir obj-static
+cd obj-static
+../configure --prefix=%{pref} --disable-shared --disable-gui --disable-std_iostreams
+$MAKE
+cd ..
+
 %install
 rm -rf $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT%{pref} install
+(cd obj-static ; make prefix=$RPM_BUILD_ROOT%{pref} install)
+(cd obj-shared ; make prefix=$RPM_BUILD_ROOT%{pref} install)
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -89,3 +108,6 @@ fi
 %{_libdir}/wx/*
 %{_bindir}/wxbase-%{ver2}-config
 
+%files static
+%defattr (-,root,root)
+%{_libdir}/lib*.a

diff --git a/wxGTK.spec b/wxGTK.spec
index f8fc676fca9e674cabb27ab17a72aa035594feb6..90fc4568b1911f20375b76d6e727729e9df76c53 100644 (file)
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -33,22 +33,28 @@ Motif/LessTif, MS Windows, Mac) from the same source code.
 %package devel
 Summary: The GTK+ 1.2 port of the wxWindows library
 Group: X11/Libraries
-Requires: wxGTK
+Requires: wxGTK = %{ver}
 
 %description devel
 Header files for wxGTK, the GTK+ 1.2 port of the wxWindows library.
 
 %package gl
-Summary: The GTK+ 1.2 port of the wxWindows library, OpenGl add-on.
+Summary: The GTK+ 1.2 port of the wxWindows library, OpenGL add-on.
 Group: X11/Libraries
-Requires: wxGTK
+Requires: wxGTK = %{ver}
 
 %description gl
-OpenGl add-on library for wxGTK, the GTK+ 1.2 port of the wxWindows library.
+OpenGL add-on library for wxGTK, the GTK+ 1.2 port of the wxWindows library.
+
+%package static
+Summary: wxGTK static libraries
+Group: Development/Libraries
+
+%description static
+Static libraries for wxGTK. You need them if you want to link statically against wxGTK.
 
 %prep
 %setup -n wxGTK-%{ver}
-./configure --prefix=%{pref} --enable-soname --with-odbc --with-opengl
 
 %build
 if [ "$SMP" != "" ]; then
@@ -56,12 +62,25 @@ if [ "$SMP" != "" ]; then
 else
   export MAKE="make"
 fi
+
+(cd locale; make allmo)
+
+mkdir obj-shared
+cd obj-shared
+../configure --prefix=%{pref} --enable-soname --with-odbc --with-opengl
+$MAKE
+cd ..
+
+mkdir obj-static
+cd obj-static
+../configure --prefix=%{pref} --disable-shared --with-odbc --with-opengl
 $MAKE
-(cd locale ; make allmo)
+cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT%{pref} install
+(cd obj-static; make prefix=$RPM_BUILD_ROOT%{pref} install)
+(cd obj-shared; make prefix=$RPM_BUILD_ROOT%{pref} install)
 
 %post
 /sbin/ldconfig
@@ -113,3 +132,6 @@ fi
 %defattr(-,root,root)
 %{_libdir}/libwx_gtk_gl*
 
+%files static
+%defattr (-,root,root)
+%{_libdir}/lib*.a