[gorm] Usage of gnustep rpm macros

Jochen Schmitt s4504kr at fedoraproject.org
Wed Apr 3 08:51:19 UTC 2013


commit 51c6c58217e3b1bb12b91f608af1f31e0c483001
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Wed Apr 3 10:51:13 2013 +0200

    Usage of gnustep rpm macros

 gorm.spec |   44 +++++++++++++++-----------------------------
 1 files changed, 15 insertions(+), 29 deletions(-)
---
diff --git a/gorm.spec b/gorm.spec
index 4cb6d70..0a349cd 100644
--- a/gorm.spec
+++ b/gorm.spec
@@ -1,6 +1,6 @@
 Name:           gorm
 Version:        1.2.18
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The GNUstep graphical interface builder
 
 Group:          Development/Tools
@@ -10,7 +10,8 @@ Source0:        ftp://ftp.gnustep.org/pub/gnustep/dev-apps/%{name}-%{version}.ta
 # svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@34763 
 
 BuildRequires:  gcc-objc texinfo-tex
-BuildRequires:  gnustep-make gnustep-base-devel gnustep-gui-devel
+BuildRequires:  gnustep-make >= 2.6.4-7 
+BuildRequires:  gnustep-base-devel gnustep-gui-devel
 
 Requires:       gnustep-gui
 
@@ -52,33 +53,23 @@ This package contains the documentation for Gorm
 %setup -q
 
 %build
-make %{?_smp_mflags} messages=yes \
-  GNUSTEP_MAKEFILES=%{_libdir}/GNUstep/Makefiles
+%gnustep_make
 
 cd Documentation
-make messages=yes \
-  GNUSTEP_MAKEFILES=%{_libdir}/GNUstep/Makefiles
+%gnustep_make
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT \
-  GNUSTEP_MAKEFILES=%{_libdir}/GNUstep/Makefiles \
-  GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
+%gnustep_install
 
 cd Documentation
-make install messages=yes DESTDIR=$RPM_BUILD_ROOT \
-  GNUSTEP_MAKEFILES=%{_libdir}/GNUstep/Makefiles \
-  GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
+%gnustep_install
 
-cd $RPM_BUILD_ROOT/%{_datadir}/GNUstep/Documentation
+cd $RPM_BUILD_ROOT/%{gnustep_docdir}
 rm ANNOUNCE
 rm INSTALL
 rm NEWS
 rm README
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig 
 
 %post doc
@@ -94,24 +85,16 @@ fi
 %files
 %defattr(-,root,root,-)
 %{_bindir}/Gorm
-%{_libdir}/GNUstep/Applications/Gorm.app
-%{_libdir}/libGorm.so.*
-%{_libdir}/libGormCore.so.*
-%{_libdir}/libGormObjCHeaderParser.so.*
-%{_libdir}/libGormPrefs.so.*
+%{gnustep_appdir}/Gorm.app
+%{_libdir}/lib*.so.*
 
 %doc ANNOUNCE COPYING NEWS NOTICE README TODO
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/GormCore/
-%{_includedir}/GormObjCHeaderParser/
-%{_includedir}/GormPrefs/
+%{_includedir}/Gorm*/
 %{_includedir}/InterfaceBuilder/
-%{_libdir}/libGorm.so
-%{_libdir}/libGormCore.so
-%{_libdir}/libGormObjCHeaderParser.so
-%{_libdir}/libGormPrefs.so
+%{_libdir}/lib*.so
 
 %files doc
 %defattr(-,root,root,-)
@@ -119,6 +102,9 @@ fi
 # %{_infodir}/Gorm.info.gz
 
 %changelog
+* Tue Apr  2 2013 Jochen Schmitt <Jochen herr-schmitt de> - 1.2.18-2
+- Usage of gnustep rpm macros
+
 * Sun Feb 24 2013 Jochen Schmitt <Jochen herr-schmitt de> - 1.2.18-1
 - New upstream release
 


More information about the scm-commits mailing list