rpms/mingw32-pango/EL-5 mingw32-pango.spec,1.3,1.4

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-pango/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8576

Modified Files:
	mingw32-pango.spec 
Log Message:
Try forcing autotools install.


Index: mingw32-pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/EL-5/mingw32-pango.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mingw32-pango.spec	10 Mar 2009 23:21:20 -0000	1.3
+++ mingw32-pango.spec	11 Mar 2009 10:23:38 -0000	1.4
@@ -6,7 +6,7 @@
 
 Name:           mingw32-pango
 Version:        1.23.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows Pango library
 
 License:        LGPLv2+
@@ -26,6 +26,8 @@
 # wine %{_mingw32_bindir}/pango-querymodules.exe > pango.modules
 Source1:        pango.modules
 
+Patch1000:      pango_enable_static_build.patch
+
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 23
@@ -57,14 +59,29 @@
 MinGW Windows Pango library.
 
 
+%package static
+Summary:        Static version of the MinGW Windows Pango library
+Requires:       %{name} = %{version}-%{release}
+Group:          Development/Libraries
+
+%description static
+Static version of the MinGW Windows Pango library.
+
+
 %prep
 %setup -q -n pango-%{version}
+%patch1000
+
+# Regenerate the configure script
+aclocal
+autoreconf --force --install
+libtoolize
 
 
 %build
 # Need to run the correct version of glib-mkenums.
 PATH=%{_mingw32_bindir}:$PATH \
-%{_mingw32_configure} --disable-static --enable-shared
+%{_mingw32_configure} --enable-static --enable-shared
 make %{?_smp_mflags}
 
 
@@ -153,9 +170,29 @@
 %{_mingw32_sysconfdir}/pango/
 
 
+%files static
+%defattr(-,root,root,-)
+%{_mingw32_libdir}/libpango-1.0.a
+%{_mingw32_libdir}/libpangocairo-1.0.a
+%{_mingw32_libdir}/libpangoft2-1.0.a
+%{_mingw32_libdir}/libpangowin32-1.0.a
+%{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.a
+%{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.a
+%{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.a
+%{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.a
+%{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.a
+%{_mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.a
+%{_mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.a
+%{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.a
+%{_mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.a
+%{_mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.a
+%{_mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.a
+%{_mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.a
+  
+
 %changelog
-* Tue Mar 10 2009 Richard W.M. Jones <rjones at redhat.com> - 1.23.0-2
-- Disable static build (in EL-5).  Rerunning autotools fails.
+* Wed Mar 11 2009 Richard W.M. Jones <rjones at redhat.com> - 1.23.0-3
+- Try forcing autotools install.
 
 * Mon Mar  9 2009 Richard W.M. Jones <rjones at redhat.com> - 1.23.0-1
 - Remove man page which duplicates what is in base Fedora.