SPECS: gnustep-base.spec - flatten directory structure

[aredridel]

Author: aredridel                    Date: Mon Nov 13 21:33:06 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- flatten directory structure

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

---- Diffs:

================================================================
Index: SPECS/gnustep-base.spec
diff -u SPECS/gnustep-base.spec:1.64 SPECS/gnustep-base.spec:1.65
--- SPECS/gnustep-base.spec:1.64	Tue Jan 31 00:34:57 2006
+++ SPECS/gnustep-base.spec	Mon Nov 13 22:33:01 2006
@@ -37,15 +37,6 @@
 
 %define         _prefix         /usr/%{_lib}/GNUstep
 
-%define		libcombo	gnu-gnu-gnu
-%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
 The GNUstep Base Library is a library of general-purpose,
 non-graphical Objective C objects. For example, it includes classes
@@ -88,7 +79,6 @@
 
 %build
 export GNUSTEP_MAKEFILES=%{_prefix}/System/Library/Makefiles
-export GNUSTEP_TARGET_DIR=%{gscpu}/linux-gnu
 
 # gnustep can use one of 3 ways of getting argc,argv,env:
 # - /proc (default on Linux) - gnustep programs won't run in procless system
@@ -112,7 +102,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 export GNUSTEP_MAKEFILES=%{_prefix}/System/Library/Makefiles
-export GNUSTEP_TARGET_DIR=%{gscpu}/linux-gnu
 
 %{__make} install \
 	INSTALL_ROOT_DIR=$RPM_BUILD_ROOT \
@@ -129,7 +118,7 @@
 %endif
 
 install -d $RPM_BUILD_ROOT%{_initrddir}
-sed -e "s!@TOOLSARCHDIR@!%{_prefix}/System/Tools/%{gscpu}/%{gsos}!" %{SOURCE1} \
+sed -e "s!@TOOLSARCHDIR@!%{_prefix}/System/Tools/!" %{SOURCE1} \
 	> $RPM_BUILD_ROOT%{_initrddir}/gnustep
 
 install -d $RPM_BUILD_ROOT/etc/sysconfig
@@ -138,7 +127,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/%{gscpu}/%{gsos}/%{libcombo}' > $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
@@ -163,7 +152,7 @@
 %postun -p /sbin/ldconfig
 
 %triggerpostun -- %{name} < 1.11.0-1.1
-sed -i -e "/^%(echo %{_prefix}/Libraries/%{gscpu}/%{gsos}/%{libcombo} | sed -e 's,/,\\/,g')$/d" /etc/ld.so.conf
+sed -i -e "/^%(echo %{_prefix}/Libraries/ | sed -e 's,/,\\/,g')$/d" /etc/ld.so.conf
 
 %files
 %defattr(644,root,root,755)
@@ -173,8 +162,8 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/gnustep
 
 %dir %{_prefix}/System/Library/Bundles/SSL.bundle
+%attr(755,root,root) %{_prefix}/System/Library/Bundles/SSL.bundle/SSL
 %{_prefix}/System/Library/Bundles/SSL.bundle/Resources
-%attr(755,root,root) %{_prefix}/System/Library/Bundles/SSL.bundle/%{gscpu}
 
 %docdir %{_prefix}/System/Library/Documentation
 %if %{with doc}
@@ -224,15 +213,12 @@
 %{_prefix}/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/*.plist
 %config(noreplace) %verify(not md5 mtime size) %{_prefix}/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/localtime
 
-%attr(755,root,root) %{_prefix}/System/Library/Libraries/%{gscpu}/%{gsos}/%{libcombo}/lib*.so.*
+%attr(755,root,root) %{_prefix}/System/Library/Libraries/lib*.so.*
 
-%dir %{_prefix}/System/Tools/%{gscpu}
-%dir %{_prefix}/System/Tools/%{gscpu}/%{gsos}
 # is suid necessary here??? it runs as daemon...
-#%attr(4755,root,root) %{_prefix}/System/Tools/%{gscpu}/%{gsos}/gdomap
-%attr(755,root,root) %{_prefix}/System/Tools/%{gscpu}/%{gsos}/gdomap
-%dir %{_prefix}/System/Tools/%{gscpu}/%{gsos}/%{libcombo}
-%attr(755,root,root) %{_prefix}/System/Tools/%{gscpu}/%{gsos}/%{libcombo}/*
+#%attr(4755,root,root) %{_prefix}/System/Tools/gdomap
+%dir %{_prefix}/System/Tools/
+%attr(755,root,root) %{_prefix}/System/Tools/*
 
 %files devel
 %defattr(644,root,root,755)
@@ -247,12 +233,12 @@
 %{_prefix}/System/Library/Documentation/info/*.info*
 %endif
 
-%{_prefix}/System/Library/Headers/%{libcombo}/Foundation
-%{_prefix}/System/Library/Headers/%{libcombo}/GNUstepBase
-%{_prefix}/System/Library/Headers/%{libcombo}/gnustep
-%{_prefix}/System/Library/Headers/%{libcombo}/%{gscpu}/%{gsos}/*.h
+%{_prefix}/System/Library/Headers/Foundation
+%{_prefix}/System/Library/Headers/GNUstepBase
+%{_prefix}/System/Library/Headers/gnustep
+%{_prefix}/System/Library/Headers/*.h
 
-%{_prefix}/System/Library/Libraries/%{gscpu}/%{gsos}/%{libcombo}/lib*.so
+%{_prefix}/System/Library/Libraries/lib*.so
 %dir %{_prefix}/System/Library/Makefiles/Additional
 %{_prefix}/System/Library/Makefiles/Additional/base.make
 
@@ -262,6 +248,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.65  2006/11/13 21:33:01  aredridel
+- flatten directory structure
+
 Revision 1.64  2006/01/30 23:34:57  baggins
 - release 2
 - use sysconfig for init script
================================================================

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