rpms/gnustep-base/F-12 gnustep-base.spec,1.1,1.2 sources,1.2,1.3

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/pkgs/rpms/gnustep-base/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31971

Modified Files:
	gnustep-base.spec sources 
Log Message:
New uptream release which fix CVE-2010-1457 and CVS-2010-1620


Index: gnustep-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-base/F-12/gnustep-base.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gnustep-base.spec	27 Sep 2009 18:06:42 -0000	1.1
+++ gnustep-base.spec	13 May 2010 13:28:31 -0000	1.2
@@ -1,9 +1,9 @@
-%global	gsb_vers 1.18
+%global	gsb_vers 1.20
 %global gslibdir %{_libdir}/GNUstep/Libraries
 
 Name:		gnustep-base
 Version:	%{gsb_vers}.0
-Release:	5%{?dist}
+Release:	1xe%{?dist}
 License:	LGPLv2+ and GPLv2+ and GPLv3+
 Group:		Development/Libraries
 Summary:	GNUstep Base library package
@@ -24,6 +24,7 @@ BuildRequires:	gmp-devel
 BuildRequires:	texi2html texinfo-tex
 
 Requires:	gnustep-make
+Conflicts:	libFoundation
 
 %description
 The GNUstep Base Library is a powerful fast library of general-purpose,
@@ -84,6 +85,9 @@ 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
 
 # Rename pl to pllist to fix naming conflict
@@ -93,8 +97,18 @@ rm ${RPM_BUILD_ROOT}%{gslibdir}/%{name}/
 rm -f Examples/.cvsignore
 rm -f Examples/.gdbinit
 
-export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} dtddir=Tools
-make -C Documentation dtddir=../Tools
+# We need a modified GNUstep.conf, because the DTDs are install not
+# on there real destination
+
+sed -e "s|GNUSTEP_SYSTEM_LIBRARY=|GNUSTEP_SYSTEM_LIBRARY=$RPM_BUILD_ROOT|" \
+    -e "s|GNUSTEP_SYSTEM_HEADERS=|GNUSTEP_SYSTEM_HEADERS=$RPM_BUILD_ROOT|" \
+    %{_sysconfdir}/GNUstep/GNUstep.conf >GNUstep.conf
+
+export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
+export GNUSTEP_CONFIG_FILE=$(pwd)/GNUstep.conf
+
+make -C Documentation
+
 make -C Documentation install DESTDIR=${RPM_BUILD_ROOT} \
      GNUSTEP_INSTALLATION_DOMAIN=SYSTEM 
 
@@ -148,6 +162,7 @@ fi
 %{_includedir}/Foundation/
 %{_includedir}/GNUstepBase/
 %{_includedir}/gnustep/
+%{_includedir}/ObjectiveC2/
 %{_libdir}/libgnustep-base.so
 %{_libdir}/GNUstep/Makefiles/Additional/base.make
 %doc Examples
@@ -158,6 +173,18 @@ fi
 %{_datadir}/GNUstep/Documentation/*
 
 %changelog
+* Thu May 13 2010 Jochen Schmitt <Jochen herr-schmitt de> 1.20.0-1xe
+- New upatream release which fix CVE-2010-1457 and CVE-2010-1620 (#591602)
+
+* Mon Nov 30 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.18.0-8
+- Remove strace command
+
+* Thu Nov 26 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.18.0-7
+- Using temp. modified GNUstep.conf to access to DTDs (#539092)
+
+* Thu Nov  5 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.18.0-6
+- Add a conflict agains libFoundation
+
 * Wed Sep 16 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.18.0-5
 - Renove suid-bit on gdomap
 - Create separate doc subpackage


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-base/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Sep 2009 18:06:43 -0000	1.2
+++ sources	13 May 2010 13:28:31 -0000	1.3
@@ -1 +1 @@
-880491e0fc64ab3507887f43faa67572  gnustep-base-1.18.0.tar.gz
+cb099fb8cf960a8dde78d9de7d1b3640  gnustep-base-1.20.0.tar.gz