From b481be5cfa489c193f164434dce4acb96beea6c2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 1 Jan 1970 00:00:00 +0000 Subject: [PATCH] Use _smp_mflags and disable static libraries as appropriate. --- boost/mingw32-boost.spec | 7 +++++-- cairomm/mingw32-cairomm.spec | 7 +++++-- fontconfig/mingw32-fontconfig.spec | 7 +++++-- gc/mingw32-gc.spec | 7 +++++-- glibmm24/mingw32-glibmm24.spec | 7 +++++-- gsl/mingw32-gsl.spec | 7 +++++-- gtk-vnc/mingw32-gtk-vnc.spec | 13 +++++++------ gtkmm24/mingw32-gtkmm24.spec | 7 +++++-- jasper/mingw32-jasper.spec | 10 ++++++---- libgcrypt/mingw32-libgcrypt.spec | 13 +++++++------ libglade2/mingw32-libglade2.spec | 7 +++++-- libjpeg/mingw32-libjpeg.spec | 13 +++++++------ libsigc++20/mingw32-libsigc++20.spec | 7 +++++-- libxml2/mingw32-libxml2.spec | 13 ++++++++----- libxslt/mingw32-libxslt.spec | 14 +++++++------- pango/mingw32-pango.spec | 10 +++++++--- pangomm/mingw32-pangomm.spec | 7 +++++-- portablexdr/mingw32-portablexdr.spec | 13 +++++++------ 18 files changed, 106 insertions(+), 63 deletions(-) diff --git a/boost/mingw32-boost.spec b/boost/mingw32-boost.spec index 3e83f69..286ae7d 100644 --- a/boost/mingw32-boost.spec +++ b/boost/mingw32-boost.spec @@ -6,7 +6,7 @@ Name: mingw32-boost Version: 1.34.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows port of Boost C++ Libraries License: Boost @@ -79,7 +79,7 @@ REGEX_FLAGS="--without-icu" rm user-config.jam echo "using gcc : : %{_mingw32_cc} : ;" > user-config.jam -make all +make %{?_smp_mflags} all %install @@ -185,5 +185,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 23 2009 Richard W.M. Jones - 1.34.1-3 +- Use _smp_mflags. + * Sat Oct 24 2008 Richard W.M. Jones - 1.34.1-2 - Initial RPM release. diff --git a/cairomm/mingw32-cairomm.spec b/cairomm/mingw32-cairomm.spec index 1d7d310..9314315 100644 --- a/cairomm/mingw32-cairomm.spec +++ b/cairomm/mingw32-cairomm.spec @@ -6,7 +6,7 @@ Name: mingw32-cairomm Version: 1.6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows C++ API for the cairo graphics library License: LGPLv2+ @@ -39,7 +39,7 @@ Standard Template Library where it makes sense. %build %{_mingw32_configure} --enable-static=no --enable-docs=no -make +make %{?_smp_mflags} %install @@ -61,5 +61,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 23 2009 Richard W.M. Jones - 1.6.2-3 +- Use _smp_mflags. + * Fri Oct 24 2008 Richard W.M. Jones - 1.6.2-2 - Initial RPM release. diff --git a/fontconfig/mingw32-fontconfig.spec b/fontconfig/mingw32-fontconfig.spec index 372d6f1..f79274c 100644 --- a/fontconfig/mingw32-fontconfig.spec +++ b/fontconfig/mingw32-fontconfig.spec @@ -6,7 +6,7 @@ Name: mingw32-fontconfig Version: 2.6.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: MinGW Windows Fontconfig library License: MIT @@ -42,7 +42,7 @@ autoreconf %build PATH="%{_mingw32_bindir}:$PATH" \ %{_mingw32_configure} --with-arch=i686 -make +make %{?_smp_mflags} %install @@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_datadir}/doc/fontconfig %changelog +* Fri Jan 23 2009 Richard W.M. Jones - 2.6.0-6 +- Use _smp_mflags. + * Wed Sep 24 2008 Richard W.M. Jones - 2.6.0-5 - Rename mingw -> mingw32. diff --git a/gc/mingw32-gc.spec b/gc/mingw32-gc.spec index dd271a7..eed98ac 100644 --- a/gc/mingw32-gc.spec +++ b/gc/mingw32-gc.spec @@ -6,7 +6,7 @@ Name: mingw32-gc Version: 7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows port of GC garbage collector for C and C++ License: BSD @@ -73,7 +73,7 @@ autoreconf -i --enable-large-config \ --enable-parallel-mark \ --enable-threads=win32 -make +make %{?_smp_mflags} %install @@ -112,5 +112,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 23 2009 Richard W.M. Jones - 7.1-2 +- Use _smp_mflags. + * Fri Oct 24 2008 Richard W.M. Jones - 7.1-1 - Initial RPM release. diff --git a/glibmm24/mingw32-glibmm24.spec b/glibmm24/mingw32-glibmm24.spec index fdd392b..7cc91d3 100644 --- a/glibmm24/mingw32-glibmm24.spec +++ b/glibmm24/mingw32-glibmm24.spec @@ -6,7 +6,7 @@ Name: mingw32-glibmm24 Version: 2.18.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows C++ interface for GTK2 (a GUI library for X) License: LGPLv2+ @@ -41,7 +41,7 @@ freely combined to quickly create complex user interfaces. %build %{_mingw32_configure} --disable-static -make +make %{?_smp_mflags} %install @@ -78,5 +78,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 23 2009 Richard W.M. Jones - 2.18.1-3 +- Use _smp_mflags. + * Fri Oct 24 2008 Richard W.M. Jones - 2.18.1-2 - Initial RPM release. diff --git a/gsl/mingw32-gsl.spec b/gsl/mingw32-gsl.spec index 70aa849..d32ad53 100644 --- a/gsl/mingw32-gsl.spec +++ b/gsl/mingw32-gsl.spec @@ -6,7 +6,7 @@ Name: mingw32-gsl Version: 1.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows port of the GNU Scientific Library License: LGPLv2+ @@ -46,7 +46,7 @@ mv THANKS.aux THANKS # configure ... CFLAGS="$CFLAGS -fgnu89-inline" # but that destroys the original CFLAGS setting. %{_mingw32_configure} -make +make %{?_smp_mflags} # These ltshwrapper files contain DOS line endings for # unknown reason. Bash chokes on them, so we have to convert @@ -88,5 +88,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 23 2009 Richard W.M. Jones - 1.11-2 +- Use _smp_mflags. + * Fri Oct 24 2008 Richard W.M. Jones - 1.11-1 - Initial RPM release. diff --git a/gtk-vnc/mingw32-gtk-vnc.spec b/gtk-vnc/mingw32-gtk-vnc.spec index 809109c..20c0d82 100644 --- a/gtk-vnc/mingw32-gtk-vnc.spec +++ b/gtk-vnc/mingw32-gtk-vnc.spec @@ -8,7 +8,7 @@ Name: mingw32-gtk-vnc Version: 0.3.8 -Release: 0.2.20081030hg%{?dist} +Release: 0.3.20081030hg%{?dist} Summary: MinGW Windows port of VNC client GTK widget License: LGPLv2+ @@ -59,17 +59,14 @@ autoreconf %build -%{_mingw32_configure} --without-python --with-examples -make +%{_mingw32_configure} --without-python --with-examples --disable-static +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -# Remove static libraries but DON'T remove *.dll.a files. -rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libgtk-vnc-1.0.a - # automake gives gvncviewer a strange name ... mv $RPM_BUILD_ROOT%{_mingw32_bindir}/i686-pc-mingw32-gvncviewer.exe \ $RPM_BUILD_ROOT%{_mingw32_bindir}/gvncviewer.exe \ @@ -90,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 23 2008 Richard W.M. Jones - 0.3.8-0.3.20081030hg +- Use _smp_mflags. +- Disable static library. + * Thu Oct 30 2008 Richard W.M. Jones - 0.3.8-0.2.20081030hg - Add Dan's fd/socket fix for Windows. diff --git a/gtkmm24/mingw32-gtkmm24.spec b/gtkmm24/mingw32-gtkmm24.spec index dd6d4c0..233e1fb 100644 --- a/gtkmm24/mingw32-gtkmm24.spec +++ b/gtkmm24/mingw32-gtkmm24.spec @@ -6,7 +6,7 @@ Name: mingw32-gtkmm24 Version: 2.14.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows C++ interface for GTK2 (a GUI library for X) License: LGPLv2+ @@ -45,7 +45,7 @@ freely combined to quickly create complex user interfaces. %build %{_mingw32_configure} --disable-static --enable-shared --disable-demos -make +make %{?_smp_mflags} %install @@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 23 2009 Richard W.M. Jones - 2.14.1-2 +- Use _smp_mflags. + * Tue Jan 13 2009 Richard W.M. Jones - 2.14.1-2 - Requires pkgconfig. diff --git a/jasper/mingw32-jasper.spec b/jasper/mingw32-jasper.spec index fcbd9c9..ec96d06 100644 --- a/jasper/mingw32-jasper.spec +++ b/jasper/mingw32-jasper.spec @@ -6,7 +6,7 @@ Name: mingw32-jasper Version: 1.900.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: MinGW Windows Jasper library License: JasPer @@ -41,7 +41,7 @@ MinGW Windows Jasper library. %build autoreconf -%{_mingw32_configure} --disable-opengl --enable-libjpeg +%{_mingw32_configure} --disable-opengl --enable-libjpeg --disable-static make @@ -50,8 +50,6 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install mandir=%{_mingw32_mandir} -rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libjasper.a - %clean rm -rf $RPM_BUILD_ROOT @@ -75,6 +73,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 23 2009 Richard W.M. Jones - 1.900.1-6 +- Use _smp_mflags. +- Disable static libraries. + * Wed Sep 24 2008 Richard W.M. Jones - 1.900.1-5 - Rename mingw -> mingw32. diff --git a/libgcrypt/mingw32-libgcrypt.spec b/libgcrypt/mingw32-libgcrypt.spec index b2e42ab..7cd26e2 100644 --- a/libgcrypt/mingw32-libgcrypt.spec +++ b/libgcrypt/mingw32-libgcrypt.spec @@ -6,7 +6,7 @@ Name: mingw32-libgcrypt Version: 1.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows gcrypt encryption library License: LGPLv2+ @@ -35,8 +35,8 @@ MinGW Windows gcrypt encryption library. %build PATH="%{_mingw32_bindir}:$PATH" \ -%{_mingw32_configure} -make +%{_mingw32_configure} --disable-static +make %{?_smp_mflags} %install @@ -44,9 +44,6 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -# Remove the static library. -rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libgcrypt.a - # Remove info pages which duplicate what is in Fedora natively. rm -rf $RPM_BUILD_ROOT%{_mingw32_infodir} @@ -70,6 +67,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 23 2009 Richard W.M. Jones - 1.4.3-3 +- Use _smp_mflags. +- Disable static libraries. + * Wed Sep 24 2008 Richard W.M. Jones - 1.4.3-2 - Rename mingw -> mingw32. diff --git a/libglade2/mingw32-libglade2.spec b/libglade2/mingw32-libglade2.spec index a02e01e..a0d6529 100644 --- a/libglade2/mingw32-libglade2.spec +++ b/libglade2/mingw32-libglade2.spec @@ -6,7 +6,7 @@ Name: mingw32-libglade2 Version: 2.6.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows Libglade2 library License: LGPLv2+ @@ -40,7 +40,7 @@ MinGW Windows Libglade2 library. %build %{_mingw32_configure} --disable-gtk-doc -make +make %{?_smp_mflags} %install @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 23 2009 Richard W.M. Jones - 2.6.3-3 +- Use _smp_mflags. + * Tue Jan 13 2009 Richard W.M. Jones - 2.6.3-2 - Requires pkgconfig. diff --git a/libjpeg/mingw32-libjpeg.spec b/libjpeg/mingw32-libjpeg.spec index 3451817..d42564e 100644 --- a/libjpeg/mingw32-libjpeg.spec +++ b/libjpeg/mingw32-libjpeg.spec @@ -6,7 +6,7 @@ Name: mingw32-libjpeg Version: 6b -Release: 6%{?dist} +Release: 7%{?dist} Summary: MinGW Windows Libjpeg library License: IJG @@ -59,8 +59,8 @@ libtoolize autoconf %build -%{_mingw32_configure} --enable-shared --enable-static -make +%{_mingw32_configure} --enable-shared --disable-static +make %{?_smp_mflags} %install @@ -73,9 +73,6 @@ mkdir -p $RPM_BUILD_ROOT%{_mingw32_mandir}/man1 %{_mingw32_makeinstall} -# Remove static library. -rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libjpeg.a - # Remove manual pages which duplicate Fedora native. rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} @@ -101,6 +98,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 23 2008 Richard W.M. Jones - 6b-7 +- Disable static libraries. +- Use _smp_mflags. + * Thu Nov 20 2008 Richard W.M. Jones - 6b-6 - Don't set libdir in the make step. - Fix path to mandir. diff --git a/libsigc++20/mingw32-libsigc++20.spec b/libsigc++20/mingw32-libsigc++20.spec index 323274e..5be04ab 100644 --- a/libsigc++20/mingw32-libsigc++20.spec +++ b/libsigc++20/mingw32-libsigc++20.spec @@ -6,7 +6,7 @@ Name: mingw32-libsigc++20 Version: 2.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows port of the typesafe signal framework for C++ License: LGPLv2+ @@ -47,7 +47,7 @@ starting with version 1.1.2, uses %name. %build %{_mingw32_configure} --disable-static -make +make %{?_smp_mflags} %install @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 23 2009 Richard W.M. Jones - 2.2.2-3 +- Use _smp_mflags. + * Tue Jan 13 2009 Richard W.M. Jones - 2.2.2-2 - Requires pkgconfig. diff --git a/libxml2/mingw32-libxml2.spec b/libxml2/mingw32-libxml2.spec index c739a18..01ee07b 100644 --- a/libxml2/mingw32-libxml2.spec +++ b/libxml2/mingw32-libxml2.spec @@ -6,7 +6,7 @@ Name: mingw32-libxml2 Version: 2.7.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MinGW Windows libxml2 XML processing library License: MIT @@ -42,8 +42,9 @@ MinGW Windows libxml2 XML processing library. %build -LDFLAGS="-no-undefined" %{_mingw32_configure} --without-python --with-modules -make +LDFLAGS="-no-undefined" \ +%{_mingw32_configure} --without-python --with-modules --disable-static +make %{?_smp_mflags} %install @@ -51,8 +52,6 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libxml2.a - # Remove manpages which duplicate Fedora native. rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} @@ -79,6 +78,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 23 2009 Richard W.M. Jones - 2.7.2-5 +- Use _smp_mflags. +- Disable static libraries. + * Tue Jan 13 2009 Richard W.M. Jones - 2.7.2-4 - Requires pkgconfig. diff --git a/libxslt/mingw32-libxslt.spec b/libxslt/mingw32-libxslt.spec index 06f4c9e..67e105e 100644 --- a/libxslt/mingw32-libxslt.spec +++ b/libxslt/mingw32-libxslt.spec @@ -6,7 +6,7 @@ Name: mingw32-libxslt Version: 1.1.24 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows Library providing the Gnome XSLT engine License: MIT @@ -51,8 +51,8 @@ installed. The xsltproc command is a command line interface to the XSLT engine %build PATH=%{_mingw32_bindir}:$PATH \ -%{_mingw32_configure} --without-python --enable-shared -make +%{_mingw32_configure} --without-python --enable-shared --disable-static +make %{?_smp_mflags} gzip -9 ChangeLog @@ -60,10 +60,6 @@ gzip -9 ChangeLog rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -# Remove static libraries but DON'T remove *.dll.a files. -rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libexslt.a -rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libxslt.a - # Remove doc and man which duplicate stuff already in Fedora native package. rm -r $RPM_BUILD_ROOT%{_mingw32_docdir} rm -r $RPM_BUILD_ROOT%{_mingw32_mandir} @@ -92,5 +88,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 23 2009 Richard W.M. Jones - 1.1.24-3 +- Disable static libraries. +- Use _smp_mflags. + * Sat Oct 25 2008 Richard W.M. Jones - 1.1.24-2 - Initial RPM release. diff --git a/pango/mingw32-pango.spec b/pango/mingw32-pango.spec index 00741f7..4e098d0 100644 --- a/pango/mingw32-pango.spec +++ b/pango/mingw32-pango.spec @@ -6,7 +6,7 @@ Name: mingw32-pango Version: 1.22.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Pango library License: LGPLv2+ @@ -49,8 +49,8 @@ MinGW Windows Pango library. %build # Need to run the correct version of glib-mkenums. PATH=%{_mingw32_bindir}:$PATH \ -%{_mingw32_configure} -make +%{_mingw32_configure} --disable-static +make %{?_smp_mflags} %install @@ -98,6 +98,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 23 2009 Richard W.M. Jones - 1.22.1-2 +- Disable static libraries. +- Use _smp_mflags. + * Fri Oct 24 2008 Richard W.M. Jones - 1.22.1-1 - New upstream version 1.22.1. - BR cairo >= 1.8.0 because of important fixes. diff --git a/pangomm/mingw32-pangomm.spec b/pangomm/mingw32-pangomm.spec index a66508c..3933b12 100644 --- a/pangomm/mingw32-pangomm.spec +++ b/pangomm/mingw32-pangomm.spec @@ -8,7 +8,7 @@ Name: mingw32-pangomm Version: 2.14.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW Windows C++ interface for Pango License: LGPLv2+ @@ -48,7 +48,7 @@ quickly create complex user interfaces. %build %{_mingw32_configure} --disable-static -make +make %{?_smp_mflags} %install @@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 23 2009 Richard W.M. Jones - 2.14.0-4 +- Use _smp_mflags. + * Tue Jan 13 2009 Richard W.M. Jones - 2.14.0-3 - Requires pkgconfig. diff --git a/portablexdr/mingw32-portablexdr.spec b/portablexdr/mingw32-portablexdr.spec index d06cca1..d851a7d 100644 --- a/portablexdr/mingw32-portablexdr.spec +++ b/portablexdr/mingw32-portablexdr.spec @@ -6,7 +6,7 @@ Name: mingw32-portablexdr Version: 4.0.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows PortableXDR XDR / RPC library License: LGPLv2+ @@ -31,8 +31,8 @@ MinGW Windows PortableXDR XDR / RPC library. %build -%{_mingw32_configure} -make +%{_mingw32_configure} --disable-static +make %{?_smp_flags} %install @@ -40,9 +40,6 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -# Remove static library. -rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libportablexdr.a - %clean rm -rf $RPM_BUILD_ROOT @@ -57,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 23 2009 Richard W.M. Jones - 4.0.11-2 +- Disable static libraries. +- Use _smp_flags. + * Wed Oct 15 2008 Richard W.M. Jones - 4.0.11-1 - New upstream version 4.0.11. -- 1.8.3.1