diff --git a/msort-tre.patch b/msort-tre.patch new file mode 100644 index 0000000..8939edb --- /dev/null +++ b/msort-tre.patch @@ -0,0 +1,40 @@ +diff -up msort-8.46/configure.ac.tre msort-8.46/configure.ac +--- msort-8.46/configure.ac.tre 2008-05-28 02:23:13.000000000 +0200 ++++ msort-8.46/configure.ac 2009-12-06 13:43:45.984378670 +0100 +@@ -69,7 +69,7 @@ AC_PROG_CC + AC_PROG_INSTALL + + # Checks for libraries. +-AC_CHECK_LIB([tre], [regwcomp],,[AC_MSG_ERROR([libtre not found. see http://laurikari.net/tre/])]) ++AC_CHECK_LIB([tre], [tre_regwcomp],,[AC_MSG_ERROR([libtre not found. see http://laurikari.net/tre/])]) + + # Checks for header files. + AC_HEADER_STDC +diff -up msort-8.46/configure.tre msort-8.46/configure +--- msort-8.46/configure.tre 2008-05-28 02:23:47.000000000 +0200 ++++ msort-8.46/configure 2009-12-06 13:44:53.027621362 +0100 +@@ -3045,8 +3045,8 @@ test -z "$INSTALL_DATA" && INSTALL_DATA= + # Checks for libraries. + + +-echo "$as_me:$LINENO: checking for regwcomp in -ltre" >&5 +-echo $ECHO_N "checking for regwcomp in -ltre... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking for tre_regwcomp in -ltre" >&5 ++echo $ECHO_N "checking for tre_regwcomp in -ltre... $ECHO_C" >&6 + if test "${ac_cv_lib_tre_regwcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -3065,11 +3065,11 @@ extern "C" + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char regwcomp (); ++char tre_regwcomp (); + int + main () + { +-regwcomp (); ++tre_regwcomp (); + ; + return 0; + } diff --git a/msort.spec b/msort.spec index 0bf8d7b..3c1fc2f 100644 --- a/msort.spec +++ b/msort.spec @@ -1,12 +1,13 @@ Summary: Sort files in sophisticated ways Name: msort Version: 8.46 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3 Group: Applications/Publishing URL: http://billposer.org/Software/msort.html Source0: http://billposer.org/Software/Downloads/%{name}-%{version}.tar.gz -BuildRequires: tre-devel libuninum-devel >= 2.5 libicu-devel gmp-devel +Patch0: %{name}-tre.patch +BuildRequires: tre-devel >= 0.8.0 libuninum-devel >= 2.5 libicu-devel gmp-devel Requires: iwidgets BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -23,6 +24,7 @@ line interface, but may be driven by an optional GUI. %prep %setup -q +%patch0 -p1 -b .tre %build %configure --disable-utf8proc @@ -44,6 +46,9 @@ line interface, but may be driven by an optional GUI. %{_mandir}/man1/msort.1* %changelog +* Sun Dec 06 2009 Dominik Mierzejewski - 8.46-5 +- rebuilt for new tre + * Sat Jul 25 2009 Fedora Release Engineering - 8.46-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild