[gnustep-base] Usage of gnustep rpm macros

Jochen Schmitt s4504kr at fedoraproject.org
Wed Apr 3 08:49:54 UTC 2013


commit 72a691a097020990c23b02ec957950d3d78a291b
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Wed Apr 3 10:49:44 2013 +0200

    Usage of gnustep rpm macros

 gnustep-base.spec |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/gnustep-base.spec b/gnustep-base.spec
index 6d3149f..3d6aca7 100644
--- a/gnustep-base.spec
+++ b/gnustep-base.spec
@@ -2,7 +2,7 @@
 
 Name:		gnustep-base
 Version:	%{gsb_vers}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	LGPLv2+ and GPLv2+ and GPLv3+
 Group:		Development/Libraries
 Summary:	GNUstep Base library package
@@ -16,7 +16,7 @@ BuildRequires:	libxml2-devel libxslt-devel
 BuildRequires:	pkgconfig
 # To avoid issues with x86_64 architectures
 # 2.6.4-4 is required for rpm macros
-BuildRequires:	gnustep-make >= 2.6.4-6
+BuildRequires:	gnustep-make >= 2.6.4-7
 BuildRequires:	avahi-compat-libdns_sd-devel
 BuildRequires:	gmp-devel
 BuildRequires:	texi2html texinfo-tex
@@ -41,7 +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-6
+Requires:	gnustep-make >= 2.6.4-7
 Requires(post):	/sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -76,13 +76,12 @@ mv ChangeLog.2.utf8 ChangeLog.2
 
 %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
 
-make %{?_smp_mflags}
+%gnustep_make -n
 
 %install
-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
@@ -160,6 +159,9 @@ fi
 %{_datadir}/GNUstep/Documentation/*
 
 %changelog
+* Mon Apr  1 2013 Jochen Schmitt <Jochen herr-schmitt de> - 1.24.4-3
+- Usage of gnustep rpm macros
+
 * 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


More information about the scm-commits mailing list