[mingw-gettext: 13/26] Dropped the proxy-libintl pieces
epienbro
epienbro at fedoraproject.org
Tue Mar 6 19:45:23 UTC 2012
commit a8889f35706cec8466794dee2212b10333c82cdf
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Wed Apr 27 17:36:37 2011 +0200
Dropped the proxy-libintl pieces
Dropped the proxy-libintl pieces as the upstream gtk+ win32 maintainers also decided to drop it and it's causing more harm than good
libintl.c | 367 --------------------------------------------------
libintl.h | 70 ----------
mingw32-gettext.spec | 30 +---
3 files changed, 8 insertions(+), 459 deletions(-)
---
diff --git a/mingw32-gettext.spec b/mingw32-gettext.spec
index 869458a..e9eadcb 100644
--- a/mingw32-gettext.spec
+++ b/mingw32-gettext.spec
@@ -6,7 +6,7 @@
Name: mingw32-gettext
Version: 0.17
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: GNU libraries and utilities for producing multi-lingual messages
License: GPLv2+ and LGPLv2+
@@ -15,11 +15,6 @@ URL: http://www.gnu.org/software/gettext/
Source0: http://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# Proxy-libintl
-# See http://www.gtk.org/download-windows.html for more details
-Source1: libintl.c
-Source2: libintl.h
-
Patch0: mingw32-gettext-0.17-gnulib-optarg-symbols.patch
BuildArch: noarch
@@ -60,12 +55,6 @@ Static version of the MinGW Windows Gettext library.
%build
-# Build proxy-libintl manually
-cp %{SOURCE1} .
-cp %{SOURCE2} .
-%{_mingw32_cc} -c libintl.c -o libintl.o -I.
-%{_mingw32_ar} rc libintl.a libintl.o
-
%{_mingw32_configure} \
--disable-java \
--disable-native-java \
@@ -88,13 +77,6 @@ rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/info/dir
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}/man1/
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}/man3/
-# Install the proxy-libintl pieces
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/libintl.la
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/libintl.dll.a
-install -m 0644 libintl.a $RPM_BUILD_ROOT%{_mingw32_libdir}/
-rm -f $RPM_BUILD_ROOT%{_mingw32_includedir}/libintl.h
-install -m 0644 libintl.h $RPM_BUILD_ROOT%{_mingw32_includedir}/
-
%find_lang %{name} --all-name
@@ -138,9 +120,8 @@ rm -rf $RPM_BUILD_ROOT
%{_mingw32_libdir}/libgettextsrc.dll.a
%{_mingw32_libdir}/libgettextsrc.la
-# This isn't really a static library, but a small wrapper library
-# which adds the ability to have a soft dependency on libintl-8.dll
-%{_mingw32_libdir}/libintl.a
+%{_mingw32_libdir}/libintl.dll.a
+%{_mingw32_libdir}/libintl.la
%{_mingw32_docdir}/gettext
%{_mingw32_docdir}/libasprintf/autosprintf_all.html
@@ -155,9 +136,14 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{_mingw32_libdir}/libasprintf.a
%{_mingw32_libdir}/libgettextpo.a
+%{_mingw32_libdir}/libintl.a
%changelog
+* Wed Apr 27 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.17.15
+- Dropped the proxy-libintl pieces as the upstream gtk+ win32 maintainers
+ also decided to drop it and it's causing more harm than good
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the mingw
mailing list