diff options
| -rw-r--r-- | cygwin-gettext.spec | 197 | ||||
| -rw-r--r-- | gettext-0.18.1.1-no-woe32dll.patch | 31 |
2 files changed, 157 insertions, 71 deletions
diff --git a/cygwin-gettext.spec b/cygwin-gettext.spec index 3a97acf..574e727 100644 --- a/cygwin-gettext.spec +++ b/cygwin-gettext.spec @@ -1,19 +1,13 @@ -%define __strip %{_cygwin_strip} -%define __objdump %{_cygwin_objdump} -%define _use_internal_dependency_generator 0 -%define __find_requires %{_cygwin_findrequires} -%define __find_provides %{_cygwin_findprovides} -%define __debug_install_post %{_cygwin_debug_install_post} +%{?cygwin_package_header} Name: cygwin-gettext Version: 0.18.1.1 -Release: 2 +Release: 3 Summary: GNU libraries and utilities for producing multi-lingual messages License: GPLv2+ and LGPLv2+ Group: Development/Libraries URL: http://www.gnu.org/software/gettext/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Source0: http://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.gz @@ -21,35 +15,62 @@ Patch0: gettext-0.18.1.1-autopoint-V.patch Patch1: gettext-0.18.1.1-locale.patch Patch2: gettext-0.18.1.1-reloc.patch Patch3: gettext-0.18.1.1-cygwin-error_h.patch +Patch4: gettext-0.18.1.1-no-woe32dll.patch + +BuildRequires: cygwin32-filesystem >= 10 +BuildRequires: cygwin32-gcc +BuildRequires: cygwin32-gcc-c++ +BuildRequires: cygwin32-binutils +BuildRequires: cygwin32 +BuildRequires: cygwin32-libiconv + +BuildRequires: cygwin64-filesystem >= 10 +BuildRequires: cygwin64-gcc +BuildRequires: cygwin64-gcc-c++ +BuildRequires: cygwin64-binutils +BuildRequires: cygwin64 +BuildRequires: cygwin64-libiconv -BuildRequires: cygwin-filesystem -BuildRequires: cygwin -BuildRequires: cygwin-gcc -BuildRequires: cygwin-gcc-c++ -BuildRequires: cygwin-binutils -BuildRequires: cygwin-libiconv +%description +Gettext libraries for Cygwin toolchains. -# Possible extra BRs. These are used if available, but -# not required just for building. -#BuildRequires: cygwin-libxml2 -#BuildRequires: cygwin-expat -#BuildRequires: cygwin-glib2 +%package -n cygwin32-gettext +Summary: Gettext libraries for Cygwin32 toolchain +Group: Development/Libraries +Provides: %{name} = %{version}-%{release} +Obsoletes: %{name} < %{version}-%{release} +%description -n cygwin32-gettext +Gettext library for the Cygwin i686 toolchain. -%description -Cygwin Gettext library +%package -n cygwin32-gettext-static +Summary: Static version of the Cygwin32 Gettext library +Group: Development/Libraries +Requires: cygwin32-gettext = %{version}-%{release} +Requires: cygwin32-libiconv-static +Provides: %{name}-static = %{version}-%{release} +Obsoletes: %{name}-static < %{version}-%{release} +%description -n cygwin32-gettext-static +Static version of the Gettext library for the Cygwin i686 toolchain. -%package static -Summary: Static version of the Cygwin Gettext library -Requires: %{name} = %{version}-%{release} +%package -n cygwin64-gettext +Summary: Gettext libraries for Cygwin64 toolchain Group: Development/Libraries -%description static -Static version of the Cygwin Gettext library. +%description -n cygwin64-gettext +Gettext library for the Cygwin x86_64 toolchain. + +%package -n cygwin64-gettext-static +Summary: Static version of the Cygwin64 Gettext library +Group: Development/Libraries +Requires: cygwin64-gettext = %{version}-%{release} +Requires: cygwin64-libiconv-static +%description -n cygwin64-gettext-static +Static version of the Gettext library for the Cygwin x86_64 toolchain. -%{?_cygwin_debug_package} +%{?cygwin_debug_package} %prep @@ -58,6 +79,7 @@ Static version of the Cygwin Gettext library. %patch1 -p2 %patch2 -p2 %patch3 -p2 +%patch4 -p2 rm -f m4/libtool.m4 gettext-tools/gnulib-m4/openmp.m4 touch m4/libtool.m4 gettext-tools/gnulib-m4/openmp.m4 @@ -70,7 +92,7 @@ libtoolize --copy --force # are broken when cross-compiling and tries replacing them, eventually leading # to compile errors in gettext-tools. The correct values below are based on # comparison with a Cygwin-native build. -%{_cygwin_configure} \ +%cygwin_configure \ --disable-java \ --disable-native-java \ --disable-csharp \ @@ -119,66 +141,99 @@ libtoolize --copy --force gl_cv_have_weak=no \ gt_cv_int_divbyzero_sigfpe=yes -make %{?_smp_mflags} +%cygwin_make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT +%cygwin_make install DESTDIR=$RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install -rm -f $RPM_BUILD_ROOT%{_cygwin_datadir}/locale/locale.alias -rm -f $RPM_BUILD_ROOT%{_cygwin_libdir}/charset.alias +# Runtime data files +rm -f $RPM_BUILD_ROOT%{cygwin32_datadir}/locale/locale.alias +rm -f $RPM_BUILD_ROOT%{cygwin32_libdir}/charset.alias + +rm -f $RPM_BUILD_ROOT%{cygwin64_datadir}/locale/locale.alias +rm -f $RPM_BUILD_ROOT%{cygwin64_libdir}/charset.alias # This documentation is available in base gettext-devel. -rm -rf $RPM_BUILD_ROOT%{_cygwin_docdir} -rm -rf $RPM_BUILD_ROOT%{_cygwin_infodir} -rm -rf $RPM_BUILD_ROOT%{_cygwin_mandir}/man1/ -rm -rf $RPM_BUILD_ROOT%{_cygwin_mandir}/man3/ +rm -rf $RPM_BUILD_ROOT%{cygwin32_docdir} +rm -rf $RPM_BUILD_ROOT%{cygwin32_infodir} +rm -rf $RPM_BUILD_ROOT%{cygwin32_mandir} + +rm -rf $RPM_BUILD_ROOT%{cygwin64_docdir} +rm -rf $RPM_BUILD_ROOT%{cygwin64_infodir} +rm -rf $RPM_BUILD_ROOT%{cygwin64_mandir} # Remove unnecessary Cygwin native binaries and their dependencies -rm -f $RPM_BUILD_ROOT%{_cygwin_bindir}/*.exe -rm -f $RPM_BUILD_ROOT%{_cygwin_bindir}/gettext.sh -rm -f $RPM_BUILD_ROOT%{_cygwin_bindir}/cyggettextlib-*.dll -rm -f $RPM_BUILD_ROOT%{_cygwin_bindir}/cyggettextsrc-*.dll -rm -f $RPM_BUILD_ROOT%{_cygwin_libdir}/libgettextlib.* -rm -f $RPM_BUILD_ROOT%{_cygwin_libdir}/libgettextsrc.* -rm -fr $RPM_BUILD_ROOT%{_cygwin_libdir}/gettext/ +rm -f $RPM_BUILD_ROOT%{cygwin32_bindir}/*.exe +rm -f $RPM_BUILD_ROOT%{cygwin32_bindir}/gettext.sh +rm -f $RPM_BUILD_ROOT%{cygwin32_bindir}/cyggettextlib-*.dll +rm -f $RPM_BUILD_ROOT%{cygwin32_bindir}/cyggettextsrc-*.dll +rm -f $RPM_BUILD_ROOT%{cygwin32_libdir}/libgettextlib.* +rm -f $RPM_BUILD_ROOT%{cygwin32_libdir}/libgettextsrc.* +rm -fr $RPM_BUILD_ROOT%{cygwin32_libdir}/gettext/ + +rm -f $RPM_BUILD_ROOT%{cygwin64_bindir}/*.exe +rm -f $RPM_BUILD_ROOT%{cygwin64_bindir}/gettext.sh +rm -f $RPM_BUILD_ROOT%{cygwin64_bindir}/cyggettextlib-*.dll +rm -f $RPM_BUILD_ROOT%{cygwin64_bindir}/cyggettextsrc-*.dll +rm -f $RPM_BUILD_ROOT%{cygwin64_libdir}/libgettextlib.* +rm -f $RPM_BUILD_ROOT%{cygwin64_libdir}/libgettextsrc.* +rm -fr $RPM_BUILD_ROOT%{cygwin64_libdir}/gettext/ # We intentionally don't ship *.la files -rm -f $RPM_BUILD_ROOT%{_cygwin_libdir}/*.la - -%find_lang %{name} --all-name +find $RPM_BUILD_ROOT -name '*.la' -delete +%cygwin_find_lang gettext --all-name -%clean -rm -rf $RPM_BUILD_ROOT - -%files -f %{name}.lang -%defattr(-,root,root,-) +%files -n cygwin32-gettext -f cygwin32-gettext.lang +%doc COPYING +%{cygwin32_bindir}/autopoint +%{cygwin32_bindir}/gettextize +%{cygwin32_bindir}/cygasprintf-0.dll +%{cygwin32_bindir}/cyggettextpo-0.dll +%{cygwin32_bindir}/cygintl-8.dll +%{cygwin32_includedir}/autosprintf.h +%{cygwin32_includedir}/gettext-po.h +%{cygwin32_includedir}/libintl.h +%{cygwin32_libdir}/libasprintf.dll.a +%{cygwin32_libdir}/libgettextpo.dll.a +%{cygwin32_libdir}/libintl.dll.a +%{cygwin32_datadir}/aclocal/*m4 +%{cygwin32_datadir}/gettext/ + +%files -n cygwin32-gettext-static +%{cygwin32_libdir}/libasprintf.a +%{cygwin32_libdir}/libgettextpo.a +%{cygwin32_libdir}/libintl.a + +%files -n cygwin64-gettext -f cygwin64-gettext.lang %doc COPYING -%{_cygwin_bindir}/autopoint -%{_cygwin_bindir}/gettextize -%{_cygwin_bindir}/cygasprintf-0.dll -%{_cygwin_bindir}/cyggettextpo-0.dll -%{_cygwin_bindir}/cygintl-8.dll -%{_cygwin_includedir}/autosprintf.h -%{_cygwin_includedir}/gettext-po.h -%{_cygwin_includedir}/libintl.h -%{_cygwin_libdir}/libasprintf.dll.a -%{_cygwin_libdir}/libgettextpo.dll.a -%{_cygwin_libdir}/libintl.dll.a -%{_cygwin_datadir}/aclocal/*m4 -%{_cygwin_datadir}/gettext/ - -%files static -%defattr(-,root,root,-) -%{_cygwin_libdir}/libasprintf.a -%{_cygwin_libdir}/libgettextpo.a -%{_cygwin_libdir}/libintl.a +%{cygwin64_bindir}/autopoint +%{cygwin64_bindir}/gettextize +%{cygwin64_bindir}/cygasprintf-0.dll +%{cygwin64_bindir}/cyggettextpo-0.dll +%{cygwin64_bindir}/cygintl-8.dll +%{cygwin64_includedir}/autosprintf.h +%{cygwin64_includedir}/gettext-po.h +%{cygwin64_includedir}/libintl.h +%{cygwin64_libdir}/libasprintf.dll.a +%{cygwin64_libdir}/libgettextpo.dll.a +%{cygwin64_libdir}/libintl.dll.a +%{cygwin64_datadir}/aclocal/*m4 +%{cygwin64_datadir}/gettext/ + +%files -n cygwin64-gettext-static +%{cygwin64_libdir}/libasprintf.a +%{cygwin64_libdir}/libgettextpo.a +%{cygwin64_libdir}/libintl.a %changelog +* Sun Jun 30 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 0.18.1.1-3 +- Rebuild for new Cygwin packaging scheme. +- Add cygwin64 support. + * Thu Jan 24 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 0.18.1.1-2 - Remove bogus printf symbols from libintl. - Set correct config.cache values for more AC_TRY_RUNs. diff --git a/gettext-0.18.1.1-no-woe32dll.patch b/gettext-0.18.1.1-no-woe32dll.patch new file mode 100644 index 0000000..575e309 --- /dev/null +++ b/gettext-0.18.1.1-no-woe32dll.patch @@ -0,0 +1,31 @@ +--- origsrc/gettext-0.18.1.1/gettext-tools/configure.ac 2010-06-06 15:04:04.000000000 -0500 ++++ src/gettext-0.18.1.1/gettext-tools/configure.ac 2013-03-07 22:13:24.525723500 -0600 +@@ -108,7 +108,7 @@ AC_SUBST([LTNOUNDEF]) + dnl On mingw and Cygwin, we can activate special Makefile rules which add + dnl version information to the shared libraries and executables. + case "$host_os" in +- mingw* | cygwin*) is_woe32=yes ;; ++ mingw*) is_woe32=yes ;; + *) is_woe32=no ;; + esac + AM_CONDITIONAL([WOE32], [test $is_woe32 = yes]) +@@ -211,7 +211,7 @@ dnl must arrange to define the auxili + dnl exported variables _also_ in the static library. + if test "$enable_shared" = yes; then + case "$host_os" in +- mingw* | cygwin*) is_woe32dll=yes ;; ++ mingw*) is_woe32dll=yes ;; + *) is_woe32dll=no ;; + esac + else +--- origsrc/gettext-0.18.1.1/m4/woe32-dll.m4 2010-06-06 07:49:58.000000000 -0500 ++++ src/gettext-0.18.1.1/m4/woe32-dll.m4 2013-03-07 23:33:34.183820200 -0600 +@@ -29,7 +29,7 @@ AC_DEFUN([gl_WOE32_DLL], + [ + AC_REQUIRE([AC_CANONICAL_HOST]) + case "$host_os" in +- mingw* | cygwin*) ++ mingw*) + AC_MSG_CHECKING([for auto-import of symbols]) + AC_CACHE_VAL([gl_cv_ld_autoimport], [ + gl_save_LDFLAGS="$LDFLAGS" |