[gnustep-base] Usage of gnustep rpm macros

[Jochen Schmitt]

commit 2acd4174b68fce48da3a98cb3b4eee198ccb2546
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Sun Mar 31 18:30:43 2013 +0200

    Usage of gnustep rpm macros
    
    - MOve Req. to gnustep-make to devel sub-package

 gnustep-base.spec |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)
---
diff --git a/gnustep-base.spec b/gnustep-base.spec
index e2e8f6b..82f0601 100644
--- a/gnustep-base.spec
+++ b/gnustep-base.spec
@@ -1,9 +1,8 @@
 %global	gsb_vers 1.24.4
-%global gslibdir %{_libdir}/GNUstep/Libraries
 
 Name:		gnustep-base
 Version:	%{gsb_vers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	LGPLv2+ and GPLv2+ and GPLv3+
 Group:		Development/Libraries
 Summary:	GNUstep Base library package
@@ -16,13 +15,13 @@ BuildRequires:	gnutls-devel
 BuildRequires:	libxml2-devel libxslt-devel
 BuildRequires:	pkgconfig
 # To avoid issues with x86_64 architectures
-BuildRequires:	gnustep-make >= 2.4.0
+# 2.6.4-4 is required for rpm macros
+BuildRequires:	gnustep-make >= 2.6.4-4
 BuildRequires:	avahi-compat-libdns_sd-devel
 BuildRequires:	gmp-devel
 BuildRequires:	texi2html texinfo-tex
 BuildRequires:	libicu-devel
 
-Requires:	gnustep-make
 Conflicts:	libFoundation
 
 %description
@@ -42,6 +41,7 @@ headers too.
 Summary:	Header of the GNUstep Base library packes
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	gnustep-make >= 2.6.4-4
 Requires(post):	/sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -82,9 +82,7 @@ ffi_include=$(pkg-config --cflags-only-I libffi | sed -e 's/^\-\I//')
 make # %{?_smp_mflags}
 
 %install
-# mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/GNUstep/DTDs/
-
-make install DESTDIR=${RPM_BUILD_ROOT} GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
+%gnustep_makeinstall
 
 # Rename pl to pllist to fix naming conflict
 mv ${RPM_BUILD_ROOT}%{_bindir}/pl ${RPM_BUILD_ROOT}%{_bindir}/pllist
@@ -102,10 +100,10 @@ sed -e "s|GNUSTEP_SYSTEM_LIBRARY=|GNUSTEP_SYSTEM_LIBRARY=$RPM_BUILD_ROOT|" \
 export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
 export GNUSTEP_CONFIG_FILE=$(pwd)/GNUstep.conf
 
-make -C Documentation
 
-make -C Documentation install DESTDIR=${RPM_BUILD_ROOT} \
-     GNUSTEP_INSTALLATION_DOMAIN=SYSTEM 
+%gnustep_makedoc
+
+%gnustep_installdoc
 
 %post -p /sbin/ldconfig
 
@@ -142,8 +140,8 @@ fi
 %{_bindir}/xmlparse
 %{_mandir}/man1/*
 %{_mandir}/man8/*
-%{_libdir}/GNUstep/DTDs/
-%{gslibdir}
+%{gnustep_dtddir}
+%{gnustep_libraries}
 %{_libdir}/libgnustep-base.so.*
 
 %doc ANNOUNCE ChangeLog* COPYING* NEWS README
@@ -154,7 +152,7 @@ fi
 %{_includedir}/GNUstepBase/
 %{_includedir}/gnustep/
 %{_libdir}/libgnustep-base.so
-%{_libdir}/GNUstep/Makefiles/Additional/base.make
+%{gnustep_additional}/base.make
 %doc Examples
 
 %files doc
@@ -163,6 +161,10 @@ fi
 %{_datadir}/GNUstep/Documentation/*
 
 %changelog
+* Sun Mar 31 2013 Jochen Schmitt <Jochen herr-schmitt de> - 1.24.4-2
+- Usage of gnustep rpm macros
+- MOve Req. to gnustep-make to devel sub-package
+
 * Sat Mar 30 2013 Jochen Schmitt <Jochen herr-schmitt de> - 1.24.4-1
 - New upstream release
 - Remove xml patch