[gnustep-make] Remove / at the end of the gnustep macro definitions
Jochen Schmitt
s4504kr at fedoraproject.org
Fri Apr 5 11:10:48 UTC 2013
commit b2dd9a4f601fd57df4a62b69a6c6af1be2e8f7cb
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Fri Apr 5 13:10:40 2013 +0200
Remove / at the end of the gnustep macro definitions
gnustep-make.spec | 5 ++++-
macros.gnustep | 46 +++++++++++++++++++++++-----------------------
2 files changed, 27 insertions(+), 24 deletions(-)
---
diff --git a/gnustep-make.spec b/gnustep-make.spec
index bfb5895..3910c59 100644
--- a/gnustep-make.spec
+++ b/gnustep-make.spec
@@ -2,7 +2,7 @@
Name: gnustep-make
Version: 2.6.4
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: GNUstep makefile package
Group: Development/Tools
@@ -131,6 +131,9 @@ fi
%changelog
+* Fri Apr 5 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.6.4-9
+- Remove / at the end of the gnustep macro definitions
+
* Thu Apr 4 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.6.4-8
- Make gnustep-filesystem acht dependent
diff --git a/macros.gnustep b/macros.gnustep
index ac2b1de..0c40ca0 100644
--- a/macros.gnustep
+++ b/macros.gnustep
@@ -1,25 +1,25 @@
-%gnustep_libdir %{_libdir}/GNUstep/
-
-%gnustep_appdir %{gnustep_libdir}Applications/
-%gnustep_appsupdir %{gnustep_libdir}ApplicationSupport/
-%gnustep_bundledir %{gnustep_libdir}Bundles/
-%gnustep_cpickdir %{gnustep_libdir}ColorPickers/
-%gnustep_srvdir %{gnustep_libdir}Services/
-
-%gnustep_makefiles %{gnustep_libdir}Makefiles/
-%gnustep_additional %{gnustep_libdir}Makefiles/Additional
-%gnustep_libraries %{gnustep_libdir}/Libraries/
-
-%gnustep_datadir %{_datadir}/GNUstep/
-%gnustep_docdir %{gnustep_datadir}/Documentation/
-%gnustep_devdocdic %{gnustep_docdir}Development/
-%gnustep_userdocdir %{gnustep_docdir}User/
-%gnustep_dtddir %{gnustep_datadir}/DTDs/
-%gnustep_fontdir %{gnustep_datadir}Fonts/
-%gnustep_imagedir %{gnustep_datadir}Images/
-%gnustep_kbdir %{gnustep_datadir}KeyBindings/
-%gnustep_psdir %{gnustep_datadir}PostScript/
-%gnustep_sounddir %{gnustep_datadir}Sounds/
+%gnustep_libdir %{_libdir}/GNUstep
+
+%gnustep_appdir %{gnustep_libdir}/Applications
+%gnustep_appsupdir %{gnustep_libdir}/ApplicationSupport
+%gnustep_bundledir %{gnustep_libdir}/Bundles
+%gnustep_cpickdir %{gnustep_libdir}/ColorPickers
+%gnustep_srvdir %{gnustep_libdir}/Services
+
+%gnustep_makefiles %{gnustep_libdir}/Makefiles
+%gnustep_additional %{gnustep_libdir}/Makefiles/Additional
+%gnustep_libraries %{gnustep_libdir}/Libraries
+
+%gnustep_datadir %{_datadir}/GNUstep
+%gnustep_docdir %{gnustep_datadir}/Documentation
+%gnustep_devdocdic %{gnustep_docdir}/Development
+%gnustep_userdocdir %{gnustep_docdir}/User
+%gnustep_dtddir %{gnustep_datadir}/DTDs
+%gnustep_fontdir %{gnustep_datadir}/Fonts
+%gnustep_imagedir %{gnustep_datadir}/Images
+%gnustep_kbdir %{gnustep_datadir}/KeyBindings
+%gnustep_psdir %{gnustep_datadir}/PostScript
+%gnustep_sounddir %{gnustep_datadir}/Sounds
%gnustep_configure\
%configure --with-installation-domain=SYSTEM
@@ -51,7 +51,7 @@ make -C Documentation install messages=yes \\\
GNUSTEP_MAKEFILES=%{gnustep_makefiles}
%gnustep_movefiles() \
-DEST=%{buildroot}%{gnustep_libdir}%(basename %1) \
+DEST=%{buildroot}%{gnustep_libdir}/%(basename %1) \
mv -f $DEST %{buildroot}%1 \
ln -sf %1 $DEST \
%{nil}
More information about the scm-commits
mailing list