[gnustep-base] Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
Jochen Schmitt
s4504kr at fedoraproject.org
Fri Nov 30 20:47:43 UTC 2012
commit a5335b89bf3dbe2bb06f5edbb6fdde614b0b7ac5
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Fri Nov 30 21:47:34 2012 +0100
Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
gnustep-base-1.24.0-xml.patch | 17 +++++++++++++++++
gnustep-base.spec | 9 +++------
2 files changed, 20 insertions(+), 6 deletions(-)
---
diff --git a/gnustep-base-1.24.0-xml.patch b/gnustep-base-1.24.0-xml.patch
new file mode 100644
index 0000000..6f664a2
--- /dev/null
+++ b/gnustep-base-1.24.0-xml.patch
@@ -0,0 +1,17 @@
+diff -up gnustep-base-1.24.0/Source/Additions/GSXML.m.xmlbak gnustep-base-1.24.0/Source/Additions/GSXML.m
+--- gnustep-base-1.24.0/Source/Additions/GSXML.m.xmlbak 2012-11-30 20:38:09.030094574 +0100
++++ gnustep-base-1.24.0/Source/Additions/GSXML.m 2012-11-30 20:57:38.535312199 +0100
+ #import "Foundation/NSRunLoop.h"
+ #import "Foundation/NSString.h"
+@@ -984,7 +984,11 @@ static NSMapTable *nodeNames = 0;
+ 1,
+ "utf-8");
+ xmlOutputBufferFlush(buf);
++#if LIBXML_VERSION < 20900
+ string = UTF8StrLen(buf->buffer->content, buf->buffer->use);
++#else
++ string = UTF8StrLen(xmlBufContent(buf->buffer), xmlBufUse(buf->buffer));
++#endif
+ xmlOutputBufferClose(buf);
+ }
+ return string;
diff --git a/gnustep-base.spec b/gnustep-base.spec
index 8f954c0..f76b2df 100644
--- a/gnustep-base.spec
+++ b/gnustep-base.spec
@@ -10,7 +10,8 @@ Summary: GNUstep Base library package
URL: http://www.gnustep.org/
Source: ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/-%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Patch was extracted from the nightly build 20121130
+Patch1: gnustep-base-1.24.0-xml.patch
BuildRequires: gcc-objc
BuildRequires: libffi-devel
@@ -71,6 +72,7 @@ This package contains the documentation for %{name}
%prep
%setup -q
+%patch1 -p1 -b .xmlbak
iconv -f iso-8859-1 -t utf-8 ChangeLog.2 -o ChangeLog.2.utf8
mv ChangeLog.2.utf8 ChangeLog.2
@@ -83,8 +85,6 @@ ffi_include=$(pkg-config --cflags-only-I libffi | sed -e 's/^\-\I//')
make %{?_smp_mflags}
%install
-rm -rf ${RPM_BUILD_ROOT}
-
# mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/GNUstep/DTDs/
make install DESTDIR=${RPM_BUILD_ROOT} GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
@@ -110,9 +110,6 @@ make -C Documentation
make -C Documentation install DESTDIR=${RPM_BUILD_ROOT} \
GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
%post -p /sbin/ldconfig
%post doc
More information about the scm-commits
mailing list