[gorm] work around issue with gnustep_docdir definitions to fix FTBFS

Peter Robinson pbrobinson at fedoraproject.org
Sat Oct 25 12:49:14 UTC 2014


commit 88674edf773592103f8dadfd3cf0c7a7c1909723
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Oct 25 13:49:11 2014 +0100

    work around issue with gnustep_docdir definitions to fix FTBFS

 gorm.spec |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/gorm.spec b/gorm.spec
index 3d34261..513ceea 100644
--- a/gorm.spec
+++ b/gorm.spec
@@ -9,7 +9,7 @@ URL:            http://www.gnustep.org
 Source0:        ftp://ftp.gnustep.org/pub/gnustep/dev-apps/%{name}-%{version}.tar.gz
 # svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@34763 
 
-BuildRequires:  gcc-objc texinfo-tex
+BuildRequires:  gcc-objc texinfo-tex texinfo
 BuildRequires:  gnustep-make >= 2.6.4-9
 BuildRequires:  gnustep-base-devel gnustep-base gnustep-gui-devel
 BuildRequires:  avahi-devel gmp-devel libffi-devel
@@ -68,7 +68,7 @@ cd Documentation
 cd Documentation
 %gnustep_install
 
-cd $RPM_BUILD_ROOT/%{gnustep_docdir}
+cd $RPM_BUILD_ROOT/%{_datadir}/GNUstep/Documentation/
 rm ANNOUNCE
 rm INSTALL
 rm NEWS
@@ -87,23 +87,18 @@ fi
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
+%doc ANNOUNCE COPYING NEWS NOTICE README TODO
 %{_bindir}/Gorm
 %{gnustep_appdir}/Gorm.app
 %{_libdir}/lib*.so.*
 
-%doc ANNOUNCE COPYING NEWS NOTICE README TODO
-
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/Gorm*/
 %{_includedir}/InterfaceBuilder/
 %{_libdir}/lib*.so
 
 %files doc
-%defattr(-,root,root,-)
-# %{_datadir}/GNUstep/Documentation/Gorm*
-# %{_infodir}/Gorm.info.gz
+%{_datadir}/GNUstep/Documentation/Gorm*
 
 %changelog
 * Tue Oct  7 2014 Jochen Schmitt <Jochen herr-schmitt de> - 1.2.20-1


More information about the scm-commits mailing list