Lots of small changes - mainly removing static libraries.

diff --git a/fontconfig/mingw-fontconfig.spec b/fontconfig/mingw-fontconfig.spec
index ae5c7e4..77f75ae 100644 (file)
--- a/fontconfig/mingw-fontconfig.spec
+++ b/fontconfig/mingw-fontconfig.spec
@@ -2,12 +2,12 @@
 
 Name:           mingw-fontconfig
 Version:        2.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows Fontconfig library
 
-License: MIT
-URL: http://fontconfig.org
-Source0: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
+License:        MIT
+URL:            http://fontconfig.org
+Source0:        http://fontconfig.org/release/fontconfig-%{version}.tar.gz
 Group:          Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -37,6 +37,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 rm -f $RPM_BUILD_ROOT/%{_mingw_libdir}/charset.alias
 
+# Remove static library.
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libfontconfig.a
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -49,7 +52,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_bindir}/fc-match.exe
 %{_mingw_bindir}/libfontconfig-1.dll
 %{_mingw_libdir}/fontconfig.def
-%{_mingw_libdir}/libfontconfig.a
 %{_mingw_libdir}/libfontconfig.dll.a
 %{_mingw_libdir}/libfontconfig.la
 %{_mingw_libdir}/pkgconfig/fontconfig.pc
@@ -64,5 +66,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_datadir}/doc/fontconfig
 
 %changelog
-* Tue Sep  9 2008 Daniel P. Berrange <berrange@redhat.com> - 2.18.0-1
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 2.6.0-2
+- Remove static library.
+
+* Tue Sep  9 2008 Daniel P. Berrange <berrange@redhat.com> - 2.6.0-1
 - Initial RPM release

diff --git a/freetype/mingw-freetype.spec b/freetype/mingw-freetype.spec
index 8936c63..d51c5d3 100644 (file)
--- a/freetype/mingw-freetype.spec
+++ b/freetype/mingw-freetype.spec
@@ -2,12 +2,12 @@
 
 Name:           mingw-freetype
 Version:        2.3.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows Freetype library
 
-License: FTL or GPLv2+
-URL: http://www.freetype.org
-Source:  freetype-%{version}.tar.bz2
+License:        FTL or GPLv2+
+URL:            http://www.freetype.org
+Source:         http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.bz2
 Group:          Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -35,6 +35,9 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libfreetype.a
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -45,12 +48,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_bindir}/libfreetype-6.dll
 %{_mingw_includedir}/freetype2
 %{_mingw_includedir}/ft2build.h
-%{_mingw_libdir}/libfreetype.a
 %{_mingw_libdir}/libfreetype.dll.a
 %{_mingw_libdir}/libfreetype.la
 %{_mingw_libdir}/pkgconfig/freetype2.pc
 %{_mingw_datadir}/aclocal/freetype2.m4
 
 %changelog
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 2.3.7-2
+- Fix source URL.
+- Remove static libraries.
+
 * Tue Sep  9 2008 Daniel P. Berrange <berrange@redhat.com> - 2.3.7-1
 - Initial RPM release

diff --git a/gettext/mingw-gettext.spec b/gettext/mingw-gettext.spec
index 52d4608..35a1368 100644 (file)
--- a/gettext/mingw-gettext.spec
+++ b/gettext/mingw-gettext.spec
@@ -2,7 +2,7 @@
 
 Name:      mingw-gettext
 Version:   0.17
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   GNU libraries and utilities for producing multi-lingual messages
 
 License:   GPLv2+ and LGPLv2+
@@ -42,6 +42,12 @@ rm -f $RPM_BUILD_ROOT%{_mingw_datadir}/locale/locale.alias
 rm -f $RPM_BUILD_ROOT%{_mingw_libdir}/charset.alias
 rm -f $RPM_BUILD_ROOT%{_mingw_datadir}/info/dir
 
+# Remove static libraries.
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libasprintf.a
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libgettextpo.a
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libintl.a
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -68,21 +74,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %{_mingw_libdir}/gettext
 
-%{_mingw_libdir}/libasprintf.a
 %{_mingw_libdir}/libasprintf.dll.a
 %{_mingw_libdir}/libasprintf.la
 
 %{_mingw_libdir}/libgettextlib.dll.a
 %{_mingw_libdir}/libgettextlib.la
 
-%{_mingw_libdir}/libgettextpo.a
 %{_mingw_libdir}/libgettextpo.dll.a
 %{_mingw_libdir}/libgettextpo.la
 
 %{_mingw_libdir}/libgettextsrc.dll.a
 %{_mingw_libdir}/libgettextsrc.la
 
-%{_mingw_libdir}/libintl.a
 %{_mingw_libdir}/libintl.dll.a
 %{_mingw_libdir}/libintl.la
 
@@ -121,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 0.17-3
+- Remove static libraries.
+
 * Thu Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 0.17-2
 - Use RPM macros from mingw-filesystem.
 

diff --git a/libjpeg/configure.in b/libjpeg/libjpeg-configure.in
similarity index 100%
rename from libjpeg/configure.in
rename to libjpeg/libjpeg-configure.in

diff --git a/libjpeg/mingw-libjpeg.spec b/libjpeg/mingw-libjpeg.spec
index 749370b..fc50282 100644 (file)
--- a/libjpeg/mingw-libjpeg.spec
+++ b/libjpeg/mingw-libjpeg.spec
@@ -2,31 +2,31 @@
 
 Name:           mingw-libjpeg
 Version:        6b
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows Libjpeg library
 
-License: IJG
-URL: http://www.ijg.org/
+License:        IJG
+URL:            http://www.ijg.org/
 Group:          Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.bz2
-Source1: configure.in
+Source0:        ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v%{version}.tar.gz
+Source1:        libjpeg-configure.in
 
-Patch1: jpeg-c++.patch
-Patch4: libjpeg-cflags.patch
-Patch5: libjpeg-buf-oflo.patch
-Patch6: libjpeg-autoconf.patch
+Patch1:         jpeg-c++.patch
+Patch4:         libjpeg-cflags.patch
+Patch5:         libjpeg-buf-oflo.patch
+Patch6:         libjpeg-autoconf.patch
 
-Patch100: jpeg-mingw.patch
+Patch100:       jpeg-mingw.patch
 
 BuildArch:      noarch
 
 BuildRequires:  mingw-filesystem >= 19
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
-BuildRequires: mingw-libpng
-BuildRequires: mingw-zlib
-BuildRequires: autoconf, libtool
+BuildRequires:  mingw-libpng
+BuildRequires:  mingw-zlib
+BuildRequires:  autoconf, libtool
 
 %description
 MinGW Windows Libjpeg library.
@@ -73,6 +73,9 @@ make prefix=$RPM_BUILD_ROOT%{_mingw_prefix} install
 # Work around the broken makefiles...
 mv $RPM_BUILD_ROOT%{_mingw_prefix}/man/man1/*.1 $RPM_BUILD_ROOT%{_mingw_mandir}/man1
 
+# Remove static library.
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libjpeg.a
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -90,7 +93,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_includedir}/jerror.h
 %{_mingw_includedir}/jmorecfg.h
 %{_mingw_includedir}/jpeglib.h
-%{_mingw_libdir}/libjpeg.a
 %{_mingw_libdir}/libjpeg.dll.a
 %{_mingw_libdir}/libjpeg.la
 %{_mingw_mandir}/man1/cjpeg.1*
@@ -100,5 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_mandir}/man1/wrjpgcom.1*
 
 %changelog
-* Tue Sep  9 2008 Daniel P. Berrange <berrange@redhat.com> - 2.18.0-1
+* Wed Sep 10 2008 Daniel P. Berrange <berrange@redhat.com> - 6b-2
+- Rename configure.in with a prefix.
+- Remove static library.
+
+* Tue Sep  9 2008 Daniel P. Berrange <berrange@redhat.com> - 6b-1
 - Initial RPM release

diff --git a/libpng/mingw-libpng.spec b/libpng/mingw-libpng.spec
index 8407bc9..64b13a5 100644 (file)
--- a/libpng/mingw-libpng.spec
+++ b/libpng/mingw-libpng.spec
@@ -2,12 +2,12 @@
 
 Name:           mingw-libpng
 Version:        1.2.31
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows Libpng library
 
-License: zlib
-URL: http://www.libpng.org/pub/png/
-Source0: ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.bz2
+License:        zlib
+URL:            http://www.libpng.org/pub/png/
+Source0:        ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.bz2
 Group:          Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -17,6 +17,7 @@ BuildRequires:  mingw-filesystem >= 19
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 
+
 %description
 MinGW Windows Libpng library.
 
@@ -34,6 +35,9 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libpng.a
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -47,7 +51,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_includedir}/libpng12
 %{_mingw_includedir}/png.h
 %{_mingw_includedir}/pngconf.h
-%{_mingw_libdir}/libpng.a
 %{_mingw_libdir}/libpng.dll.a
 %{_mingw_libdir}/libpng.la
 %{_mingw_libdir}/libpng12.a
@@ -60,5 +63,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_mandir}/man5/png.5*
 
 %changelog
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.31-2
+- Remove static library.
+
 * Tue Sep  9 2008 Daniel P. Berrange <berrange@redhat.com> - 1.2.31-1
 - Initial RPM release

diff --git a/pixman/mingw-pixman.spec b/pixman/mingw-pixman.spec
index c358180..334ada2 100644 (file)
--- a/pixman/mingw-pixman.spec
+++ b/pixman/mingw-pixman.spec
@@ -2,7 +2,7 @@
 
 Name:           mingw-pixman
 Version:        0.11.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows Pixman library
 
 License:        MIT
@@ -36,6 +36,8 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
+rm $RPM_BUILD_ROOT/%{_mingw_libdir}/libpixman-1.a
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -44,11 +46,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_mingw_bindir}/libpixman-1-0.dll
 %{_mingw_includedir}/pixman-1
-%{_mingw_libdir}/libpixman-1.a
 %{_mingw_libdir}/libpixman-1.dll.a
 %{_mingw_libdir}/libpixman-1.la
 %{_mingw_libdir}/pkgconfig/pixman-1.pc
 
 %changelog
-* Tue Sep  9 2008 Daniel P. Berrange <berrange@redhat.com> - 2.18.0-1
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 0.11.10-2
+- Remove static library.
+
+* Tue Sep  9 2008 Daniel P. Berrange <berrange@redhat.com> - 0.11.10-1
 - Initial RPM release

diff --git a/zlib/mingw-zlib.spec b/zlib/mingw-zlib.spec
index 213f228..3874cb2 100644 (file)
--- a/zlib/mingw-zlib.spec
+++ b/zlib/mingw-zlib.spec
@@ -2,7 +2,7 @@
 
 Name:           mingw-zlib
 Version:        1.2.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        MinGW Windows zlib compression library
 
 License:        zlib
@@ -65,6 +65,9 @@ mv $RPM_BUILD_ROOT%{_mingw_libdir}/libz.dll \
 mv $RPM_BUILD_ROOT%{_mingw_libdir}/libzdll.a \
    $RPM_BUILD_ROOT%{_mingw_libdir}/libz.dll.a
 
+# Remove static library.
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libz.a
+
 %__install zlib.3 $RPM_BUILD_ROOT%{_mingw_mandir}/man3
 
 
@@ -76,13 +79,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_mingw_includedir}/zconf.h
 %{_mingw_includedir}/zlib.h
-%{_mingw_libdir}/libz.a
 %{_mingw_libdir}/libz.dll.a
 %{_mingw_bindir}/libz.dll
 %{_mingw_mandir}/man3/zlib.3
 
 
 %changelog
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-6
+- Remove static library.
+
 * Fri Sep  5 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-5
 - Fix misnamed file: zlibdll.a -> zlib.dll.a
 - Explicitly provide mingw(zlib1.dll).