SPECS: gnustep-make.spec - flatten directory structure (simplifies...

aredridel aredridel at pld-linux.org
Mon Nov 13 22:32:34 CET 2006


Author: aredridel                    Date: Mon Nov 13 21:32:34 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- flatten directory structure (simplifies builds, improves directory search
  performance, non-flattened is becoming ill-tested in upstream sources)

---- Files affected:
SPECS:
   gnustep-make.spec (1.63 -> 1.64) 

---- Diffs:

================================================================
Index: SPECS/gnustep-make.spec
diff -u SPECS/gnustep-make.spec:1.63 SPECS/gnustep-make.spec:1.64
--- SPECS/gnustep-make.spec:1.63	Thu Mar  2 17:24:50 2006
+++ SPECS/gnustep-make.spec	Mon Nov 13 22:32:29 2006
@@ -31,13 +31,6 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_prefix		/usr/%{_lib}/GNUstep
-%define		gsos		linux-gnu
-%ifarch %{ix86}
-%define		gscpu		ix86
-%else
-# also s/alpha.*/alpha/, but we use only "alpha" arch for now
-%define		gscpu		%(echo %{_target_cpu} | sed -e 's/amd64/x86_64/;s/ppc/powerpc/')
-%endif
 
 %description
 This package contains the basic tools needed to run GNUstep
@@ -77,7 +70,6 @@
 cp -f /usr/share/automake/config.* .
 %{__autoconf}
 %configure \
-	--disable-flattened \
 	--with-library-combo=gnu-gnu-gnu \
 	--with-tar=tar
 
@@ -196,9 +188,7 @@
 %{_prefix}/System/Library/Makefiles/tar-exclude-list
 %attr(755,root,root) %{_prefix}/System/Library/Makefiles/*.sh
 %attr(755,root,root) %{_prefix}/System/Library/Makefiles/*.csh
-%dir %{_prefix}/System/Library/Makefiles/%{gscpu}
-%dir %{_prefix}/System/Library/Makefiles/%{gscpu}/%{gsos}
-%attr(755,root,root) %{_prefix}/System/Library/Makefiles/%{gscpu}/%{gsos}/which_lib
+%attr(755,root,root) %{_prefix}/System/Library/Makefiles/which_lib
 
 %files devel
 %defattr(644,root,root,755)
@@ -211,7 +201,6 @@
 %{_prefix}/System/Library/Makefiles/*.template
 %{_prefix}/System/Library/Makefiles/Instance
 %{_prefix}/System/Library/Makefiles/Master
-%{_prefix}/System/Library/Makefiles/%{gscpu}/%{gsos}/*.make
 %attr(755,root,root) %{_prefix}/System/Library/Makefiles/install-sh
 %attr(755,root,root) %{_prefix}/System/Library/Makefiles/mkinstalldirs
 
@@ -221,6 +210,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.64  2006/11/13 21:32:29  aredridel
+- flatten directory structure (simplifies builds, improves directory search
+  performance, non-flattened is becoming ill-tested in upstream sources)
+
 Revision 1.63  2006/03/02 16:24:50  baggins
 - behave more
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnustep-make.spec?r1=1.63&r2=1.64&f=u



More information about the pld-cvs-commit mailing list