SPECS: gnustep-base.spec - updated to 1.13.0 - workaround not to l...

[qboosh]

Author: qboosh                       Date: Thu Dec 28 20:16:28 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 1.13.0
- workaround not to link with gnustep-gui

---- Files affected:
SPECS:
   gnustep-base.spec (1.65 -> 1.66) 

---- Diffs:

================================================================
Index: SPECS/gnustep-base.spec
diff -u SPECS/gnustep-base.spec:1.65 SPECS/gnustep-base.spec:1.66
--- SPECS/gnustep-base.spec:1.65	Mon Nov 13 22:33:01 2006
+++ SPECS/gnustep-base.spec	Thu Dec 28 21:16:23 2006
@@ -6,12 +6,12 @@
 Summary:	GNUstep Base library package
 Summary(pl):	Podstawowa biblioteka GNUstep
 Name:		gnustep-base
-Version:	1.11.2
-Release:	2
+Version:	1.13.0
+Release:	1
 License:	LGPL/GPL
 Group:		Libraries
 Source0:	ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz
-# Source0-md5:	f370c912a6150371df0e1bb63eab50d2
+# Source0-md5:	edd01516ba49915150f030848efc0baf
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Patch0:		%{name}-pass-arguments.patch
@@ -78,7 +78,9 @@
 %patch0 -p1
 
 %build
+# don't assume that GNUstep.sh is imported in environment
 export GNUSTEP_MAKEFILES=%{_prefix}/System/Library/Makefiles
+export GNUSTEP_FLATTENED=yes
 
 # gnustep can use one of 3 ways of getting argc,argv,env:
 # - /proc (default on Linux) - gnustep programs won't run in procless system
@@ -87,21 +89,22 @@
 %configure \
 	--enable-pass-arguments
 
+# fake GUI_MAKE_LOADED to avoid linking with gnustep-gui
 %{__make} \
+	GUI_MAKE_LOADED=yes \
 	messages=yes
 
 %if %{with doc}
 export LD_LIBRARY_PATH=`pwd`/Source/obj
 # requires already installed gnustep-base
-# XXX: GNUSTEP_OBJ_PREFIX=obj is workaround for Tools/DocMakefile
-%{__make} -C Documentation \
-	GNUSTEP_OBJ_PREFIX=obj
+%{__make} -C Documentation
 %{__make} -C Documentation/manual
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 export GNUSTEP_MAKEFILES=%{_prefix}/System/Library/Makefiles
+export GNUSTEP_FLATTENED=yes
 
 %{__make} install \
 	INSTALL_ROOT_DIR=$RPM_BUILD_ROOT \
@@ -127,7 +130,7 @@
 echo 'GMT' > $RPM_BUILD_ROOT%{_prefix}/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/localtime
 
 install -d $RPM_BUILD_ROOT/etc/ld.so.conf.d
-echo '%{_prefix}/System/Library/Libraries/' > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}.conf
+echo '%{_prefix}/System/Library/Libraries' > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -184,24 +187,28 @@
 %dir %{_prefix}/System/Library/Libraries/Resources/gnustep-base
 %{_prefix}/System/Library/Libraries/Resources/gnustep-base/*.plist
 %{_prefix}/System/Library/Libraries/Resources/gnustep-base/English.lproj
+%lang(eo) %{_prefix}/System/Library/Libraries/Resources/gnustep-base/Esperanto.lproj
 %lang(fr) %{_prefix}/System/Library/Libraries/Resources/gnustep-base/French.lproj
 %lang(de) %{_prefix}/System/Library/Libraries/Resources/gnustep-base/German.lproj
 %lang(it) %{_prefix}/System/Library/Libraries/Resources/gnustep-base/Italian.lproj
+%lang(ko) %{_prefix}/System/Library/Libraries/Resources/gnustep-base/Korean.lproj
 %lang(es) %{_prefix}/System/Library/Libraries/Resources/gnustep-base/Spanish.lproj
 %lang(zh_TW) %{_prefix}/System/Library/Libraries/Resources/gnustep-base/TraditionalChinese.lproj
 %dir %{_prefix}/System/Library/Libraries/Resources/gnustep-base/Languages
 %{_prefix}/System/Library/Libraries/Resources/gnustep-base/Languages/Locale.*
 %lang(nl) %{_prefix}/System/Library/Libraries/Resources/gnustep-base/Languages/Dutch
 %{_prefix}/System/Library/Libraries/Resources/gnustep-base/Languages/English
+%lang(eo) %{_prefix}/System/Library/Libraries/Resources/gnustep-base/Languages/Esperanto
 %lang(fr) %{_prefix}/System/Library/Libraries/Resources/gnustep-base/Languages/French
 %lang(de) %{_prefix}/System/Library/Libraries/Resources/gnustep-base/Languages/German
 %lang(hu) %{_prefix}/System/Library/Libraries/Resources/gnustep-base/Languages/Hungarian
 %lang(it) %{_prefix}/System/Library/Libraries/Resources/gnustep-base/Languages/Italian
+%lang(ko) %{_prefix}/System/Library/Libraries/Resources/gnustep-base/Languages/Korean
 %lang(ru) %{_prefix}/System/Library/Libraries/Resources/gnustep-base/Languages/Russian
 %lang(sk) %{_prefix}/System/Library/Libraries/Resources/gnustep-base/Languages/Slovak
 %lang(es) %{_prefix}/System/Library/Libraries/Resources/gnustep-base/Languages/Spanish
 %lang(zh_TW) %{_prefix}/System/Library/Libraries/Resources/gnustep-base/Languages/TraditionalChinese
-%lang(uk) %{_prefix}/System/Library/Libraries/Resources/gnustep-base/Languages/UkraineRussian
+%lang(uk) %{_prefix}/System/Library/Libraries/Resources/gnustep-base/Languages/Ukrainian
 %dir %{_prefix}/System/Library/Libraries/Resources/gnustep-base/NSTimeZones
 %{_prefix}/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/GNUmakefile
 %{_prefix}/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/GNUstep_zones
@@ -217,7 +224,7 @@
 
 # is suid necessary here??? it runs as daemon...
 #%attr(4755,root,root) %{_prefix}/System/Tools/gdomap
-%dir %{_prefix}/System/Tools/
+%dir %{_prefix}/System/Tools
 %attr(755,root,root) %{_prefix}/System/Tools/*
 
 %files devel
@@ -248,6 +255,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.66  2006/12/28 20:16:23  qboosh
+- updated to 1.13.0
+- workaround not to link with gnustep-gui
+
 Revision 1.65  2006/11/13 21:33:01  aredridel
 - flatten directory structure
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnustep-base.spec?r1=1.65&r2=1.66&f=u