rpms/gnustep-base/devel gnustep-base.spec,1.2,1.3

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/pkgs/rpms/gnustep-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24886

Modified Files:
	gnustep-base.spec 
Log Message:
Using temp. modified GNUstep.conf to access to DTDs


Index: gnustep-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-base/devel/gnustep-base.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gnustep-base.spec	5 Nov 2009 19:14:33 -0000	1.2
+++ gnustep-base.spec	30 Nov 2009 16:59:18 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:		gnustep-base
 Version:	%{gsb_vers}.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	LGPLv2+ and GPLv2+ and GPLv3+
 Group:		Development/Libraries
 Summary:	GNUstep Base library package
@@ -85,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
@@ -94,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
+
+strace -f -o ~/strace.txt make -C Documentation
+
 make -C Documentation install DESTDIR=${RPM_BUILD_ROOT} \
      GNUSTEP_INSTALLATION_DOMAIN=SYSTEM 
 
@@ -159,6 +172,9 @@ fi
 %{_datadir}/GNUstep/Documentation/*
 
 %changelog
+* 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