[gnustep-base/f19: 11/11] Rework for change gnustep macro definitons

[Jochen Schmitt]

commit bd0e8caf7038dc30acd057ece4e281d1be147516
Merge: e63d9eb 688e573
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Sun May 5 19:27:00 2013 +0200

    Rework for change gnustep macro definitons

 .gitignore        |    1 +
 gnustep-base.spec |   47 ++++++++++++++++++++++++++++++++---------------
 2 files changed, 33 insertions(+), 15 deletions(-)
---
diff --cc gnustep-base.spec
index e2e8f6b,0c0bfe2..6264073
--- a/gnustep-base.spec
+++ b/gnustep-base.spec
@@@ -3,7 -2,7 +3,8 @@@
  
  Name:		gnustep-base
  Version:	%{gsb_vers}
- Release:	1%{?dist}
+ Release:	5%{?dist}
++
  License:	LGPLv2+ and GPLv2+ and GPLv3+
  Group:		Development/Libraries
  Summary:	GNUstep Base library package
@@@ -76,15 -76,12 +78,16 @@@ mv ChangeLog.2.utf8 ChangeLog.
  
  %build
  ffi_include=$(pkg-config --cflags-only-I libffi | sed -e 's/^\-\I//')
- %configure --disable-ffcall --with-ffi-include=$ffi_include \
- 	   --with-installation-domain=SYSTEM
+ %gnustep_configure --disable-ffcall --with-ffi-include=$ffi_include
  
++<<<<<<< HEAD
 +make # %{?_smp_mflags}
++=======
+ %gnustep_make -n
++>>>>>>> master
  
  %install
- # mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/GNUstep/DTDs/
- 
- make install DESTDIR=${RPM_BUILD_ROOT} GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
+ %gnustep_install -n
  
  # Rename pl to pllist to fix naming conflict
  mv ${RPM_BUILD_ROOT}%{_bindir}/pl ${RPM_BUILD_ROOT}%{_bindir}/pllist