rpms/hyphen/F-9 hyphen-2.3.1-noencoding.patch, NONE, 1.1 hyphen.spec, 1.4, 1.5
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Wed May 28 12:16:33 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/hyphen/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11168
Modified Files:
hyphen.spec
Added Files:
hyphen-2.3.1-noencoding.patch
Log Message:
Resolves: rhbz#448555 conflict with hunspell cs_util
hyphen-2.3.1-noencoding.patch:
--- NEW FILE hyphen-2.3.1-noencoding.patch ---
diff -ru hyphen-2.3.1.orig/Makefile.am hyphen-2.3.1/Makefile.am
--- hyphen-2.3.1.orig/Makefile.am 2008-05-28 12:50:33.000000000 +0100
+++ hyphen-2.3.1/Makefile.am 2008-05-28 12:54:09.000000000 +0100
@@ -1,14 +1,14 @@
SUBDIRS= doc tests
lib_LTLIBRARIES = libhyphen.la
-libhyphen_la_SOURCES = csutil.c hnjalloc.c hyphen.c
+libhyphen_la_SOURCES = hnjalloc.c hyphen.c
libhyphen_la_LDFLAGS = -version-info 1:0:1
include_HEADERS = hyphen.h
noinst_HEADERS = csutil.h hnjalloc.h
noinst_PROGRAMS = substrings example
-substrings_SOURCES = substrings.c
-example_SOURCES = example.c
+substrings_SOURCES = substrings.c csutil.c
+example_SOURCES = example.c csutil.c
example_LDADD = libhyphen.la
bin_SCRIPTS = substrings.pl
Index: hyphen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen/F-9/hyphen.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hyphen.spec 19 Feb 2008 08:48:40 -0000 1.4
+++ hyphen.spec 28 May 2008 12:15:55 -0000 1.5
@@ -1,13 +1,14 @@
Name: hyphen
Summary: A text hyphenation library
Version: 2.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Source: http://downloads.sourceforge.net/hunspell/hyphen-%{version}.tar.gz
Group: System Environment/Libraries
URL: http://hunspell.sf.net
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv2+ or MPLv1.1
-BuildRequires: perl, patch
+BuildRequires: perl, patch, autoconf
+Patch0: hyphen-2.3.1-noencoding.patch
%description
Hyphen is a library for high quality hyphenation and justification.
@@ -30,8 +31,10 @@
%prep
%setup -q
+%patch0 -p1 -b .noencoding.patch
%build
+autoreconf
%configure --disable-static
make %{?_smp_mflags}
@@ -72,6 +75,9 @@
%{_bindir}/substrings.pl
%changelog
+* Wed May 28 2008 Caolan McNamara <caolanm at redhat.com> - 2.3.1-2
+- Resolves: rhbz#448555 conflict with hunspell cs_util
+
* Tue Feb 19 2008 Caolan McNamara <caolanm at redhat.com> - 2.3.1-1
- latest version
More information about the fedora-extras-commits
mailing list