rpms/m17n-lib/FC-4 m17n-lib-nobuild-examples.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 m17n-lib.spec, 1.2, 1.3 sources, 1.2, 1.3 m17n-lib-1.2.0-core-libs-only.patch, 1.1, NONE
Jens Petersen (petersen)
fedora-extras-commits at redhat.com
Fri Mar 10 14:00:17 UTC 2006
- Previous message (by thread): rpms/m17n-lib/devel README, NONE, 1.1 Makefile, 1.1, NONE m17n-lib-1.2.0-core-libs-only.patch, 1.1, NONE m17n-lib.spec, 1.2, NONE sources, 1.2, NONE
- Next message (by thread): rpms/rssowl/devel rssowl.script,1.3,1.4 rssowl.spec,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: petersen
Update of /cvs/extras/rpms/m17n-lib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21279
Modified Files:
.cvsignore m17n-lib.spec sources
Added Files:
m17n-lib-nobuild-examples.patch
Removed Files:
m17n-lib-1.2.0-core-libs-only.patch
Log Message:
sync with Core:
- update to 1.3.3 minor bugfix release
* Fri Feb 10 2006 Jens Petersen <petersen at redhat.com> - 1.3.2-1
- update to 1.3.2 bugfix release
- m17n-lib-no-gui-headers.patch is now upstream
* Thu Feb 2 2006 Jens Petersen <petersen at redhat.com> - 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 <petersen at redhat.com> - 1.2.0-2
- buildrequire autoconf
m17n-lib-nobuild-examples.patch:
--- NEW FILE m17n-lib-nobuild-examples.patch ---
--- 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
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/m17n-lib/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 11 Nov 2005 04:53:15 -0000 1.2
+++ .cvsignore 10 Mar 2006 14:00:17 -0000 1.3
@@ -1 +1 @@
-m17n-lib-1.2.0.tar.gz
+m17n-lib-1.3.3.tar.gz
Index: m17n-lib.spec
===================================================================
RCS file: /cvs/extras/rpms/m17n-lib/FC-4/m17n-lib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- m17n-lib.spec 15 Nov 2005 02:39:22 -0000 1.2
+++ m17n-lib.spec 10 Mar 2006 14:00:17 -0000 1.3
@@ -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: 1%{?dist}
+Version: 1.3.3
+Release: 0%{?dist}
Summary: Multilingual text library
Group: System Environment/Libraries
@@ -15,16 +15,18 @@
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
+Patch2: m17n-lib-nobuild-examples.patch
%description
m17n-lib is a multilingual text library used primarily to allow
@@ -42,14 +44,20 @@
%prep
%setup -q
-%if ! %{use_otf}
-%patch1 -p1 -b .gui
-autoreconf
+%if ! %{with_examples}
+%patch2 -p1 -b .examples
%endif
+# patch2 touches Makefile.am
+autoreconf
%build
-%configure --disable-static
+%configure --disable-static \
+%if ! %{with_gui}
+ --with-gui=no
+%else
+ %{nil}
+%endif
make
@@ -86,6 +94,22 @@
%changelog
+* Thu Mar 2 2006 Jens Petersen <petersen at redhat.com> - 1.3.3-0%{?dist}
+- update to 1.3.3 minor bugfix release
+
+* Fri Feb 10 2006 Jens Petersen <petersen at redhat.com> - 1.3.2-1
+- update to 1.3.2 bugfix release
+ - m17n-lib-no-gui-headers.patch is now upstream
+
+* Thu Feb 2 2006 Jens Petersen <petersen at redhat.com> - 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 <petersen at redhat.com> - 1.2.0-2
+- buildrequire autoconf
+
* Thu Nov 10 2005 Jens Petersen <petersen at redhat.com> - 1.2.0-1
- do not build static lib and .la files (Warren Togami)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/m17n-lib/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 11 Nov 2005 04:53:15 -0000 1.2
+++ sources 10 Mar 2006 14:00:17 -0000 1.3
@@ -1 +1 @@
-215242775c67930e20597b2c7703acef m17n-lib-1.2.0.tar.gz
+f07f9fb93506db439567f774290e4dd6 m17n-lib-1.3.3.tar.gz
--- m17n-lib-1.2.0-core-libs-only.patch DELETED ---
- Previous message (by thread): rpms/m17n-lib/devel README, NONE, 1.1 Makefile, 1.1, NONE m17n-lib-1.2.0-core-libs-only.patch, 1.1, NONE m17n-lib.spec, 1.2, NONE sources, 1.2, NONE
- Next message (by thread): rpms/rssowl/devel rssowl.script,1.3,1.4 rssowl.spec,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list