rpms/msort/devel msort-tre.patch,NONE,1.1 msort.spec,1.4,1.5

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/pkgs/rpms/msort/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4047

Modified Files:
	msort.spec 
Added Files:
	msort-tre.patch 
Log Message:
* Sun Dec 06 2009 Dominik Mierzejewski <rpm at greysector.net> - 8.46-5
- rebuilt for new tre


msort-tre.patch:
 configure    |    8 ++++----
 configure.ac |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE msort-tre.patch ---
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;
 }


Index: msort.spec
===================================================================
RCS file: /cvs/pkgs/rpms/msort/devel/msort.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- msort.spec	25 Jul 2009 15:17:05 -0000	1.4
+++ msort.spec	6 Dec 2009 13:53:10 -0000	1.5
@@ -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 
 
 %prep
 %setup -q
+%patch0 -p1 -b .tre
 
 %build
 %configure --disable-utf8proc
@@ -44,6 +46,9 @@ line interface, but may be driven by an 
 %{_mandir}/man1/msort.1*
 
 %changelog
+* Sun Dec 06 2009 Dominik Mierzejewski <rpm at greysector.net> - 8.46-5
+- rebuilt for new tre
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.46-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild