diff --git a/ratbox-services-1.2.1-oldflex.patch b/ratbox-services-1.2.1-oldflex.patch new file mode 100644 index 0000000..574c79a --- /dev/null +++ b/ratbox-services-1.2.1-oldflex.patch @@ -0,0 +1,11 @@ +diff -up ratbox-services-1.2.1/src/lexer.l~ ratbox-services-1.2.1/src/lexer.l +--- ratbox-services-1.2.1/src/lexer.l~ 2004-09-25 18:25:25.000000000 +0300 ++++ ratbox-services-1.2.1/src/lexer.l 2013-02-23 21:55:38.513708448 +0200 +@@ -44,7 +44,6 @@ int yylex(void); + int yyget_lineno(void); + FILE *yyget_in(void); + FILE *yyget_out(void); +-int yyget_leng(void); + char *yyget_text(void); + void yyset_lineno(int line_number); + void yyset_in(FILE * in_str); diff --git a/ratbox-services.spec b/ratbox-services.spec index ec735ad..e22edd8 100644 --- a/ratbox-services.spec +++ b/ratbox-services.spec @@ -1,6 +1,6 @@ Name: ratbox-services Version: 1.2.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Service package for ircd-ratbox Group: System Environment/Daemons @@ -11,9 +11,11 @@ Source1: ratbox-services.init Source2: ratbox-services.conf Source3: ratbox-services.logrotate Patch0: ratbox-services-1.2.1-dbpath.patch +Patch1: ratbox-services-1.2.1-oldflex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison, flex, mysql-devel, sqlite-devel, postgresql-devel +BuildRequires: pcre-devel Requires: MTA, ircd-ratbox Requires(post): /sbin/chkconfig @@ -26,7 +28,7 @@ scratch for use with ircd-ratbox. It is highly configurable, with nearly all options being set in a config that can be rehashed rather than set at compile time. It also uses the SQLite database backend, which works as a database interface -to a normal file, meaning no seperate database software must be running. +to a normal file, meaning no separate database software must be running. %package devel Summary: Devel package for ircd-ratbox service @@ -39,6 +41,7 @@ Headers for ratbox-services, service package for ircd-ratbox. %prep %setup -q %patch0 -p1 -b .dbpath +%patch1 -p1 -b .oldflex cat << \EOF > %{name}-req #!/bin/sh @@ -111,6 +114,11 @@ fi %{_includedir}/*.h %changelog +* Sat Feb 23 2013 Ville Skyttä - 1.2.1-8 +- Fix F-19 FTBFS due to old flex parser skeleton code (#914427). +- Build with system PCRE instead of a bundled copy. +- Fix bogus date in %%changelog. + * Thu Feb 14 2013 Fedora Release Engineering - 1.2.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild @@ -129,5 +137,5 @@ fi * Wed Feb 25 2009 Fedora Release Engineering - 1.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Wed Aug 28 2008 Marek Mahut - 1.2.1-1 +* Thu Aug 28 2008 Marek Mahut - 1.2.1-1 - Initial package build