rpms/abiword/devel abiword-plugins-2.6.8-rindex.patch, NONE, 1.1 abiword.spec, 1.74, 1.75
Marc Maurer
uwog at fedoraproject.org
Mon Mar 9 17:07:20 UTC 2009
- Previous message: rpms/perl-Parse-BACKPAN-Packages/F-9 import.log, NONE, 1.1 perl-Parse-BACKPAN-Packages.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/sssd/devel import.log, NONE, 1.1 sssd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: uwog
Update of /cvs/pkgs/rpms/abiword/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8449
Modified Files:
abiword.spec
Added Files:
abiword-plugins-2.6.8-rindex.patch
Log Message:
Build fix
abiword-plugins-2.6.8-rindex.patch:
--- NEW FILE abiword-plugins-2.6.8-rindex.patch ---
diff -u -r abiword-plugins-2.6.8.orig/tools/abicommand/xp/AbiCommand.cpp abiword-plugins-2.6.8/tools/abicommand/xp/AbiCommand.cpp
--- abiword-plugins-2.6.8.orig/tools/abicommand/xp/AbiCommand.cpp 2007-10-11 22:05:55.000000000 +0200
+++ abiword-plugins-2.6.8/tools/abicommand/xp/AbiCommand.cpp 2009-03-09 16:59:14.000000000 +0100
@@ -551,7 +551,7 @@
UT_UTF8String *pCom1 =
const_cast < UT_UTF8String * >(static_cast < const UT_UTF8String * >(pToks->getNthItem (1)));
printf(" Filename %s \n",pCom1->utf8_str());
- char *suffix = rindex (pCom1->utf8_str (), '.');
+ const char *suffix = static_cast<const char*>(rindex (pCom1->utf8_str (), '.'));
if (suffix != NULL)
{
Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- abiword.spec 9 Mar 2009 15:02:35 -0000 1.74
+++ abiword.spec 9 Mar 2009 17:06:50 -0000 1.75
@@ -7,7 +7,7 @@
Summary: The AbiWord word processor
Name: abiword
Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
Group: Applications/Editors
License: GPLv2+
@@ -30,6 +30,7 @@
Patch1: abiword-2.6.4-desktop.patch
Patch2: abiword-2.6.0-boolean.patch
Patch3: abiword-plugins-2.6.0-boolean.patch
+Patch4: abiword-plugins-2.6.8-rindex.patch
%if %{olpc_build}
Patch100: abiword-2.6.4-defaultfont.patch
Patch101: abiword-2.6.4-draghandles.patch
@@ -93,6 +94,7 @@
# setup abiword-plugins
%setup -q -T -b 1 -n abiword-plugins-%{version}
%patch3 -p1 -b .boolean
+%patch4 -p1 -b .rindex
# setup abiword extras
%setup -q -T -b 2 -n abiword-extras-%{version}
@@ -214,6 +216,9 @@
%{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
%changelog
+* Mon Mar 09 2009 Marc Maurer <uwog at abisource.com> - 1:2.6.8-2
+- Make g++ 4.4 and rindex friends again
+
* Mon Mar 09 2009 Marc Maurer <uwog at abisource.com> - 1:2.6.8-1
- New upstream release
- Previous message: rpms/perl-Parse-BACKPAN-Packages/F-9 import.log, NONE, 1.1 perl-Parse-BACKPAN-Packages.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/sssd/devel import.log, NONE, 1.1 sssd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list