diff --git a/.cvsignore b/.cvsignore index 0a4afa9..7834387 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -m17n-lib-1.2.0.tar.gz +m17n-lib-1.3.1.tar.gz diff --git a/m17n-lib-nobuild-examples.patch b/m17n-lib-nobuild-examples.patch new file mode 100644 index 0000000..3c0afca --- /dev/null +++ b/m17n-lib-nobuild-examples.patch @@ -0,0 +1,11 @@ +--- m17n-lib-1.3.1/Makefile.am~ 2005-11-21 16:39:00.000000000 +0900 ++++ m17n-lib-1.3.1/Makefile.am 2006-02-02 16:01:48.000000000 +0900 +@@ -22,7 +22,7 @@ + + ## Process this file with Automake to create Makefile.in + +-SUBDIRS = src example ++SUBDIRS = src + + bin_SCRIPTS = m17n-config + diff --git a/m17n-lib.spec b/m17n-lib.spec index 2c8e22a..fa61cdd 100644 --- a/m17n-lib.spec +++ b/m17n-lib.spec @@ -1,11 +1,11 @@ -# set to 1 to build with OpenType Font support -%define use_otf 0 -# set to 1 to build with anthy support -%define use_anthy 0 +# set to 1 to build with GUI and OpenType Font support +%define with_gui 0 +# set to 1 to build examples (including anthy support) +%define with_examples 0 Name: m17n-lib -Version: 1.2.0 -Release: 2%{?dist} +Version: 1.3.1 +Release: 1%{?dist} Summary: Multilingual text library Group: System Environment/Libraries @@ -15,18 +15,19 @@ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: m17n-db -%if %{use_otf} +%if %{with_gui} BuildRequires: libxml2-devel, xorg-x11-devel BuildRequires: freetype-devel >= 2.0, fribidi-devel, gd-devel >= 2.0 BuildRequires: libotf-devel >= %{libotf_version} %else BuildRequires: autoconf %endif -%if %{use_anthy} +%if %{with_examples} BuildRequires: anthy-devel %endif Requires: m17n-db -Patch1: m17n-lib-1.2.0-core-libs-only.patch +Patch1: m17n-lib-no-gui-headers.patch +Patch2: m17n-lib-nobuild-examples.patch %description m17n-lib is a multilingual text library used primarily to allow @@ -44,14 +45,21 @@ Development files for %{name}. %prep %setup -q -%if ! %{use_otf} -%patch1 -p1 -b .gui -autoreconf +%if ! %{with_gui} +%patch1 -p0 -b .gui +%endif +%if ! %{with_examples} +%patch2 -p1 -b .examples %endif +autoreconf %build -%configure --disable-static +%configure --disable-static \ +%if ! %{with_gui} + --with-gui=no +%endif + make @@ -88,6 +96,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Feb 2 2006 Jens Petersen - 1.3.1-1 +- update to 1.3.1 release + - rename use_otf and use_anthy macros to with_gui and with_examples + - build --with-gui=no and replace m17n-lib-1.2.0-core-libs-only.patch + with m17n-lib-no-gui-headers.patch and m17n-lib-nobuild-examples.patch + * Fri Dec 16 2005 Jens Petersen - 1.2.0-2 - import to Fedora Core - buildrequire autoconf diff --git a/sources b/sources index 8122fbf..6c076d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -215242775c67930e20597b2c7703acef m17n-lib-1.2.0.tar.gz +9a82742760f43d18861b6026b4321093 m17n-lib-1.3.1.tar.gz