[gnustep-make] Make gnustep-filesystem acht dependent

[Jochen Schmitt]

commit 43c9fffb063f4234634e657f7a5e74af53637b5a
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Thu Apr 4 19:44:43 2013 +0200

    Make gnustep-filesystem acht dependent

 gnustep-make.spec |   24 ++++++++++--------------
 macros.gnustep    |   30 +++++++++++++++++++++---------
 2 files changed, 31 insertions(+), 23 deletions(-)
---
diff --git a/gnustep-make.spec b/gnustep-make.spec
index 87b9ff0..bfb5895 100644
--- a/gnustep-make.spec
+++ b/gnustep-make.spec
@@ -2,7 +2,7 @@
 
 Name:           gnustep-make
 Version:        2.6.4
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        GNUstep makefile package
 
 Group:          Development/Tools
@@ -34,7 +34,6 @@ the user to easily create cross-compiled binaries.
 Summary:        The basic directory layout for GNUstep packages
 Group:          System Environment/Base
 License:        Public Domain
-BuildArch:      noarch
 
 %description -n gnustep-filesystem
 The gnustep-filesystem package contains the basic directory layout for
@@ -111,18 +110,12 @@ fi
 %files -n gnustep-filesystem
 %defattr(-,root,root,-)
 %dir %{_sysconfdir}/GNUstep
-%dir %{_prefix}/lib/GNUstep
-%dir %{_prefix}/lib64/GNUstep
-%dir %{_prefix}/lib/GNUstep/Applications
-%dir %{_prefix}/lib64/GNUstep/Applications
-%dir %{_prefix}/lib/GNUstep/WebApplications
-%dir %{_prefix}/lib64/GNUstep/WebApplications
-%dir %{_prefix}/local/lib/GNUstep
-%dir %{_prefix}/local/lib/GNUstep/Applications
-%dir %{_prefix}/local/lib/GNUstep/WebApplications
-%dir %{_prefix}/local/lib64/GNUstep
-%dir %{_prefix}/local/lib64/GNUstep/Applications
-%dir %{_prefix}/local/lib64/GNUstep/WebApplications
+%dir %{_libdir}/GNUstep
+%dir %{_libdir}/GNUstep/Applications
+%dir %{_libdir}/GNUstep/WebApplications
+%dir %{_prefix}/local/%{_lib}/GNUstep
+%dir %{_prefix}/local/%{_lib}/GNUstep/Applications
+%dir %{_prefix}/local/%{_lib}/GNUstep/WebApplications
 %dir %{_datadir}/GNUstep
 %dir %{_datadir}/GNUstep/Documentation
 %dir %{_datadir}/GNUstep/Documentation/Developer
@@ -138,6 +131,9 @@ fi
 
 
 %changelog
+* Thu Apr  4 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.6.4-8
+- Make gnustep-filesystem acht dependent
+
 * Mon Apr  1 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.6.4-7
 - Remove GNUSTEP_MAKFILES assignment from %%gnustep_make macro
 
diff --git a/macros.gnustep b/macros.gnustep
index 555769c..ac2b1de 100644
--- a/macros.gnustep
+++ b/macros.gnustep
@@ -4,21 +4,23 @@
 %gnustep_appsupdir %{gnustep_libdir}ApplicationSupport/
 %gnustep_bundledir %{gnustep_libdir}Bundles/
 %gnustep_cpickdir %{gnustep_libdir}ColorPickers/
-%gnustep_docdir %{_datadir}/GNUstep/Documentation/
-%gnustep_dtddir %{gnustep_libdir}/DTDs/
-%gnustep_kbdir %{gnustep_libdir}KeyBindings/
-%gnustep_userdocdir %{gnustep_docdir}User/
-%gnustep_devdocdic %{gnustep_docdir}Development/
-%gnustep_fontdir %{gnustep_libdir}Fonts/
-%gnustep_imagedir %{gnustep_libdir}Images/
-%gnustep_psdir %{gnustep_libdir}PostScript/
-%gnustep_sounddir %{gnustep_libdir}Sounds/
 %gnustep_srvdir %{gnustep_libdir}Services/
 
 %gnustep_makefiles %{gnustep_libdir}Makefiles/
 %gnustep_additional %{gnustep_libdir}Makefiles/Additional
 %gnustep_libraries %{gnustep_libdir}/Libraries/
 
+%gnustep_datadir %{_datadir}/GNUstep/
+%gnustep_docdir %{gnustep_datadir}/Documentation/
+%gnustep_devdocdic %{gnustep_docdir}Development/
+%gnustep_userdocdir %{gnustep_docdir}User/
+%gnustep_dtddir %{gnustep_datadir}/DTDs/
+%gnustep_fontdir %{gnustep_datadir}Fonts/
+%gnustep_imagedir %{gnustep_datadir}Images/
+%gnustep_kbdir %{gnustep_datadir}KeyBindings/
+%gnustep_psdir %{gnustep_datadir}PostScript/
+%gnustep_sounddir %{gnustep_datadir}Sounds/
+
 %gnustep_configure\
 %configure --with-installation-domain=SYSTEM
 
@@ -47,3 +49,13 @@ make -C Documentation install messages=yes \\\
     DESTDIR=%{buildroot} \\\
     GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \\\
     GNUSTEP_MAKEFILES=%{gnustep_makefiles} 
+
+%gnustep_movefiles() \
+DEST=%{buildroot}%{gnustep_libdir}%(basename %1) \
+mv -f $DEST %{buildroot}%1 \
+ln -sf %1 $DEST \
+%{nil}
+
+%gnustep_bothfiles() \
+%1 \
+%gnustep_libdir/%(basename %1)/
\ No newline at end of file