diff --git a/ocaml-gettext.spec b/ocaml-gettext.spec index 5b75e2a..a6c1401 100644 --- a/ocaml-gettext.spec +++ b/ocaml-gettext.spec @@ -3,7 +3,7 @@ Name: ocaml-gettext Version: 0.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCaml library for i18n Group: Development/Libraries @@ -25,19 +25,11 @@ BuildRequires: libxml2 BuildRequires: chrpath BuildRequires: autoconf -# When https://bugzilla.redhat.com/show_bug.cgi?id=438486 is fixed -# we can remove the ifarch ppc64 stuff in this file. In the meantime -# we have to build without camomile on ppc64. -%ifnarch ppc64 BuildRequires: ocaml-camomile-devel >= 0.8.1 BuildRequires: ocaml-camomile-data -%endif -# ocaml-gettext program needs camomile data files, but only if it was -# compiled with camomile (hence not on ppc64 - see above). BZ 446919. -%ifnarch ppc64 +# ocaml-gettext program needs camomile data files Requires: ocaml-camomile-data -%endif %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree @@ -70,7 +62,6 @@ The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. -%ifnarch ppc64 %package camomile Summary: Parts of %{name} which depend on Camomile Group: Development/Libraries @@ -92,7 +83,6 @@ Requires: %{name}-devel = %{version}-%{release} The %{name}-camomile-devel package contains libraries and signature files for developing applications that use %{name}-camomile. -%endif %prep @@ -103,20 +93,14 @@ signature files for developing applications that use CFLAGS="$RPM_OPT_FLAGS" \ ./configure \ --libdir=%{_libdir} \ -%ifarch ppc64 - --disable-camomile \ -%else --enable-test \ -%endif --with-docbook-stylesheet=/usr/share/sgml/docbook/xsl-stylesheets make all %check -%ifnarch ppc64 pushd test ../_build/bin/test popd -%endif %install @@ -134,9 +118,7 @@ find _build -name '*.o' -exec rm {} \; ocamlfind install gettext _build/lib/gettext/* ocamlfind install gettext-stub _build/lib/gettext-stub/* -%ifnarch ppc64 ocamlfind install gettext-camomile _build/lib/gettext-camomile/* -%endif install -m 0755 _build/bin/ocaml-gettext $RPM_BUILD_ROOT%{_bindir}/ install -m 0755 _build/bin/ocaml-xgettext $RPM_BUILD_ROOT%{_bindir}/ @@ -188,7 +170,6 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/ocaml-xgettext -%ifnarch ppc64 %files camomile %defattr(-,root,root,-) %doc COPYING @@ -210,10 +191,13 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/ocaml/gettext-camomile/*.cmx %endif %{_libdir}/ocaml/gettext-camomile/*.mli -%endif %changelog +* Sat May 19 2012 Richard W.M. Jones - 0.3.4-2 +- Bump release and rebuild for new OCaml on ARM. +- Enable ppc64 support for camomile. + * Fri Jan 6 2012 Richard W.M. Jones - 0.3.4-1 - New upstream version 0.3.4. - Remove patch, now upstream.