rpms/gnustep-base/EL-6 gnustep-base-1.18.0-dtd.patch, NONE, 1.1 gnustep-base.spec, 1.3, 1.4 sources, 1.4, 1.5 gnustep-base-1.18-cve-2010-1457.patch, 1.1, NONE gnustep-base-1.18-cve-2010-1620.patch, 1.1, NONE

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/pkgs/rpms/gnustep-base/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19364

Modified Files:
	gnustep-base.spec sources 
Added Files:
	gnustep-base-1.18.0-dtd.patch 
Removed Files:
	gnustep-base-1.18-cve-2010-1457.patch 
	gnustep-base-1.18-cve-2010-1620.patch 
Log Message:
Initial import for EL-6

gnustep-base-1.18.0-dtd.patch:
 GNUmakefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnustep-base-1.18.0-dtd.patch ---
diff -up gnustep-base-1.18.0/Tools/GNUmakefile.dc gnustep-base-1.18.0/Tools/GNUmakefile
--- gnustep-base-1.18.0/Tools/GNUmakefile.dc	2009-11-25 21:01:44.000000000 +0100
+++ gnustep-base-1.18.0/Tools/GNUmakefile	2009-11-25 21:02:12.000000000 +0100
@@ -38,7 +38,7 @@ include ../Version
 include ../config.mak
 
 # DTDs to install
-dtddir = $(GNUSTEP_LIBRARY)/DTDs
+dtddir = $(DESTDIR)/$(GNUSTEP_LIBRARY)/DTDs
 DTD_FILES = plist-0_9.dtd \
 	gsdoc-0_6_5.dtd \
 	gsdoc-0_6_6.dtd \


Index: gnustep-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-base/EL-6/gnustep-base.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gnustep-base.spec	14 May 2010 14:32:40 -0000	1.3
+++ gnustep-base.spec	14 Jul 2010 15:03:16 -0000	1.4
@@ -1,16 +1,14 @@
-%global	gsb_vers 1.18
+%global	gsb_vers 1.20
 %global gslibdir %{_libdir}/GNUstep/Libraries
 
 Name:		gnustep-base
-Version:	%{gsb_vers}.0
-Release:	9%{?dist}
+Version:	%{gsb_vers}.1
+Release:	2%{?dist}
 License:	LGPLv2+ and GPLv2+ and GPLv3+
 Group:		Development/Libraries
 Summary:	GNUstep Base library package
 URL:		http://www.gnustep.org/
 Source:		ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz
-Patch1:		gnustep-base-1.18-cve-2010-1457.patch
-Patch2:		gnustep-base-1.18-cve-2010-1620.patch
 
 BuildRoot:	%{_tmppath}/-%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,7 +18,7 @@ BuildRequires:	gnutls-devel
 BuildRequires:	libxml2-devel libxslt-devel
 BuildRequires:	pkgconfig
 # To avoid issues with x86_64 architectures
-BuildRequires:	gnustep-make >= 2.2.0
+BuildRequires:	gnustep-make >= 2.4.0
 BuildRequires:	avahi-compat-libdns_sd-devel
 BuildRequires:	gmp-devel
 BuildRequires:	texi2html texinfo-tex
@@ -73,8 +71,6 @@ This package contains the documentation 
 
 %prep
 %setup -q
-%patch1 -p1 
-%patch2 -p1
 
 iconv -f iso-8859-1 -t utf-8 ChangeLog.2 -o ChangeLog.2.utf8
 mv ChangeLog.2.utf8 ChangeLog.2
@@ -84,8 +80,7 @@ ffi_include=$(pkg-config --cflags-only-I
 %configure --disable-ffcall --with-ffi-include=$ffi_include \
 	   --with-installation-domain=SYSTEM
 
-# gnustep-base don't likes parallel builds
-make # %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -97,7 +92,7 @@ make install DESTDIR=${RPM_BUILD_ROOT} G
 # Rename pl to pllist to fix naming conflict
 mv ${RPM_BUILD_ROOT}%{_bindir}/pl ${RPM_BUILD_ROOT}%{_bindir}/pllist
 
-rm ${RPM_BUILD_ROOT}%{gslibdir}/%{name}/Versions/%{gsb_vers}/Resources/NSTimeZones/.README.swp
+rm ${RPM_BUILD_ROOT}%{gslibdir}/%{name}/Versions/%{gsb_vers}/Resources/NSTimeZones/.a*
 rm -f Examples/.cvsignore
 rm -f Examples/.gdbinit
 
@@ -166,6 +161,7 @@ fi
 %{_includedir}/Foundation/
 %{_includedir}/GNUstepBase/
 %{_includedir}/gnustep/
+%{_includedir}/ObjectiveC2/
 %{_libdir}/libgnustep-base.so
 %{_libdir}/GNUstep/Makefiles/Additional/base.make
 %doc Examples
@@ -176,8 +172,11 @@ fi
 %{_datadir}/GNUstep/Documentation/*
 
 %changelog
-* Fri May 14 2010 Jochen Schmitt <sJOchen herr-schmitt de> - 1.18.0-9
-- Fallback to 1.18. Backport security patches for #591602
+* Tue Jul  6 2010 Jochen Schmitt <Jochen herr-schmitt de> 1.20.1-2
+- Parallels build for gnustep
+
+* Mon Jun 21 2010 Jochen Schmitt <Jochen herr-schmitt de> 1.20.1-1
+- New upstream release
 
 * Thu May 13 2010 Jochen Schmitt <Jochen herr-schmitt de> 1.20.0-1
 - New upatream release which fix CVE-2010-1457 and CVE-2010-1620 (#591602)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-base/EL-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	14 May 2010 14:32:40 -0000	1.4
+++ sources	14 Jul 2010 15:03:16 -0000	1.5
@@ -1 +1 @@
-880491e0fc64ab3507887f43faa67572  gnustep-base-1.18.0.tar.gz
+8ade7c698159df7a43c7b5052321e4e0  gnustep-base-1.20.1.tar.gz


--- gnustep-base-1.18-cve-2010-1457.patch DELETED ---


--- gnustep-base-1.18-cve-2010-1620.patch DELETED ---